From: yasushiito <yas@pen-chan.jp>
Date: Tue, 30 Jul 2013 01:37:02 +0000 (+0900)
Subject: merge
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=3d26243a296405e409d8ae5292efcff436c1d4ab

merge
---

3d26243a296405e409d8ae5292efcff436c1d4ab
diff --cc .gitignore
index 8944f92f,574645ec..003cd7ac
--- a/.gitignore
+++ b/.gitignore
@@@ -11,7 -11,7 +11,8 @@@ config/aws.yam
  config/picture_io.yml
  config/license.yml
  config/speech_balloon.yml
 +config/writing_format.yml
+ config/element.yml
  config/profile.json
  config/test_layout
  lib/test/temp/
diff --cc config/application.rb
index 8c5b6e90,22807c11..2f2960f5
--- a/config/application.rb
+++ b/config/application.rb
@@@ -71,20 -71,20 +71,29 @@@ config.assets.initialize_on_precompile 
      def self.speech_balloons
        @@speech_balloons || {}
      end
 +     
 +    def self.writing_formats=(ary)
 +      @@writing_formats = ary
 +    end
 +    
 +    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'
diff --cc config/environment.rb
index 423ce88e,83559c3d..abd093e9
--- a/config/environment.rb
+++ b/config/environment.rb
@@@ -11,5 -11,5 +11,4 @@@ require 'pettan_imager
  require 'ar_helper'
  require 'import_result'
  require 'common'
- require 'inspire'
- 
+ require 'element'
 -