Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / controllers / top_controller.rb

diff --git a/app/controllers/top_controller.rb b/app/controllers/top_controller.rb
index 246004c..2b561a6 100644 (file)
--- a/app/controllers/top_controller.rb
+++ b/app/controllers/top_controller.rb
@@ -1,23 +1,22 @@
 class TopController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :metro]
+    before_filter :authenticate_reader, :only => []#[:index]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   end
   
   def index
     respond_to do |format|
-      format.html 
+      format.html { render layout: 'ap' }
     end
   end
   
-  def metro
+  def ap
     respond_to do |format|
-      format.html { render layout: 'metro' }
+      format.html { render layout: 'ap' }
     end
   end