merge

[pettanr/pettanr.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 8c5b6e9..2f2960f 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,7 +63,7 @@ config.assets.initialize_on_precompile = false
     def self.licenses
       @@licenses || {}
     end
-     
+    
     def self.speech_balloons=(ary)
       @@speech_balloons = ary
     end
@@ -79,12 +79,21 @@ config.assets.initialize_on_precompile = false
     def self.writing_formats
       @@writing_formats || {}
     end
- end
+    
+    def self.elements=(ary)
+      @@elements = ary
+    end
+    
+    def self.elements
+      @@elements || {}
+    end
+  end
 end
   
 Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
 Pettanr::Application.speech_balloons = YAML.load(open(Rails.root + 'config/speech_balloon.yml').read)
 Pettanr::Application.writing_formats = YAML.load(open(Rails.root + 'config/writing_format.yml').read)
+Pettanr::Application.elements = YAML.load(open(Rails.root + 'config/element.yml').read)
 MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
 MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
   'test'