t#29693:test layout flag move to magic number

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index afacb4a..aab67cb 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -1,5 +1,5 @@
 class ArtistsController < ApplicationController
-layout 'test'
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :new, :create, :edit, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 

diff --git a/app/controllers/authors_controller.rb b/app/controllers/authors_controller.rb
index da74488..7e2055b 100644 (file)
--- a/app/controllers/authors_controller.rb
+++ b/app/controllers/authors_controller.rb
@@ -1,4 +1,5 @@
 class AuthorsController < ApplicationController
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :edit, :update]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index 4d2bd33..8b58880 100644 (file)
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -1,4 +1,5 @@
 class BalloonsController < ApplicationController
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
   
   def list

diff --git a/app/controllers/colors_controller.rb b/app/controllers/colors_controller.rb
index d125dbb..ea99428 100644 (file)
--- a/app/controllers/colors_controller.rb
+++ b/app/controllers/colors_controller.rb
@@ -1,5 +1,5 @@
 class ColorsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   
   # GET /colors
   # GET /colors.json

diff --git a/app/controllers/comics_controller.rb b/app/controllers/comics_controller.rb
index 4107325..bac6ee0 100644 (file)
--- a/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@ -1,5 +1,5 @@
 class ComicsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
     before_filter :authenticate_user!, :only => [:new, :create, :edit, :update, :destroy]
   else

diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb
index 459f0b3..4879790 100644 (file)
--- a/app/controllers/ground_colors_controller.rb
+++ b/app/controllers/ground_colors_controller.rb
@@ -1,5 +1,5 @@
 class GroundColorsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index]
 
   # GET /ground_colors

diff --git a/app/controllers/ground_pictures_controller.rb b/app/controllers/ground_pictures_controller.rb
index 755c419..6415264 100644 (file)
--- a/app/controllers/ground_pictures_controller.rb
+++ b/app/controllers/ground_pictures_controller.rb
@@ -1,5 +1,5 @@
 class GroundPicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index]
 
   # GET /ground_pictures

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index af11ec4..fdc3fe3 100644 (file)
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,5 +1,5 @@
 class HomeController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [
     :index, :show, :profile, :configure, :create_token, :delete_token, :step2, :save_step2, :step3, :save_step3, 
     :comic, :panel, :picture, :panel_picture, :panel_color, :ground_picture, :ground_color

diff --git a/app/controllers/license_groups_controller.rb b/app/controllers/license_groups_controller.rb
index df576d8..4433053 100644 (file)
--- a/app/controllers/license_groups_controller.rb
+++ b/app/controllers/license_groups_controller.rb
@@ -1,5 +1,5 @@
 class LicenseGroupsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
   
   # GET /license_groups

diff --git a/app/controllers/licenses_controller.rb b/app/controllers/licenses_controller.rb
index 72c9933..59e24e2 100644 (file)
--- a/app/controllers/licenses_controller.rb
+++ b/app/controllers/licenses_controller.rb
@@ -1,5 +1,5 @@
 class LicensesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   # GET /licenses

diff --git a/app/controllers/original_picture_license_groups_controller.rb b/app/controllers/original_picture_license_groups_controller.rb
index 296e3b2..fd85cea 100644 (file)
--- a/app/controllers/original_picture_license_groups_controller.rb
+++ b/app/controllers/original_picture_license_groups_controller.rb
@@ -1,5 +1,5 @@
 class OriginalPictureLicenseGroupsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:new, :create]
   before_filter :authenticate_artist, :only => [:new, :create]
   

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 3e5d906..e322b6c 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,6 +1,6 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   before_filter :authenticate_artist, :only => [:index, :show, :history, :new, :edit, :create, :update, :destroy]

diff --git a/app/controllers/panel_colors_controller.rb b/app/controllers/panel_colors_controller.rb
index 2d43bef..1134379 100644 (file)
--- a/app/controllers/panel_colors_controller.rb
+++ b/app/controllers/panel_colors_controller.rb
@@ -1,5 +1,5 @@
 class PanelColorsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index]
 
   # GET /ground_pictures

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index d7695a6..dc5cd21 100644 (file)
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -1,5 +1,5 @@
 class PanelPicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 4065e12..544ecc0 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,5 +1,5 @@
 class PanelsController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 

diff --git a/app/controllers/pictures_controller.rb b/app/controllers/pictures_controller.rb
index 850ef31..30dd929 100644 (file)
--- a/app/controllers/pictures_controller.rb
+++ b/app/controllers/pictures_controller.rb
@@ -1,5 +1,5 @@
 class PicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:show, :credit, :md5]
   before_filter :authenticate_artist, :only => [:md5]
   

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index 5be77b5..7054277 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -1,5 +1,5 @@
 class ResourcePicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show, :credit, :new, :create, :update]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   before_filter :authenticate_artist, :only => [:new, :create]

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index 9f5bbd9..77a808d 100644 (file)
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -1,5 +1,5 @@
 class SpeechBalloonTemplatesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show]
   before_filter :authenticate_admin!, :only => [:list, :browse, :destroy]
 

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 85a39e2..2152cd1 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -1,4 +1,5 @@
 class SpeechBalloonsController < ApplicationController
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
   def list

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 7e53b73..b9a3c7b 100644 (file)
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -1,4 +1,5 @@
 class SpeechesController < ApplicationController
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show]
   before_filter :authenticate_admin!, :only => [:list, :browse]
 

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index c8b710c..bcb470e 100644 (file)
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -1,5 +1,5 @@
 class StoriesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
     before_filter :authenticate_user!, :only => [:new, :create, :edit, :update, :destroy]
   else

diff --git a/app/controllers/system_controller.rb b/app/controllers/system_controller.rb
index 20ac6e4..d8cbb0b 100644 (file)
--- a/app/controllers/system_controller.rb
+++ b/app/controllers/system_controller.rb
@@ -58,14 +58,14 @@ class SystemController < ApplicationController
   end
   
   def production_layout
-    Pettanr::Application.test_layout = false
+    MagicNumber['test_layout'] = false
     respond_to do |format|
       format.html { render text: 'production', status: 200 }
     end
   end
   
   def test_layout
-    Pettanr::Application.test_layout = 'test'
+    MagicNumber['test_layout'] = 'test'
     respond_to do |format|
       format.html { render text: 'test', status: 200 }
     end

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index 4d341f7..ec7d4cb 100644 (file)
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,5 +1,5 @@
 class SystemPicturesController < ApplicationController
-  layout 'test' if Pettanr::Application.test_layout
+  layout 'test' if MagicNumber['test_layout']
   before_filter :authenticate_user!, :only => [:index, :show]
   before_filter :authenticate_admin!, :only => [:list, :browse, :new, :create]
 

diff --git a/app/views/layouts/test.html.erb b/app/views/layouts/test.html.erb
index 45a8b70..cb151c1 100644 (file)
--- a/app/views/layouts/test.html.erb
+++ b/app/views/layouts/test.html.erb
@@ -3,6 +3,7 @@
 <head>\r
   <title>Pettanr</title>\r
   <%= stylesheet_link_tag    "application" %>\r
+  <%= stylesheet_link_tag "test.css" %>\r
   <%= javascript_include_tag "application" %>\r
   <%= csrf_meta_tags %>\r
 </head>\r

diff --git a/config/application.rb b/config/application.rb
index 683056d..66efbcc 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -63,24 +63,16 @@ config.assets.initialize_on_precompile = false
     def self.licenses
       @@licenses
     end
-    
-    def self.test_layout=(arg)
-      @@test_layout = arg
-    end
-    
-    def self.test_layout
-      @@test_layout
-    end
   end
 end
   
-if File.exist? Rails.root + 'config/test_layout'
-  Pettanr::Application.test_layout = 'test'
-else
-  Pettanr::Application.test_layout = false
-end
 Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.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'
+else
+  false
+end
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]