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 eca273e..91fb1d8 100644 (file)
--- a/app/controllers/top_controller.rb
+++ b/app/controllers/top_controller.rb
@@ -3,21 +3,20 @@ class TopController < ApplicationController
     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: 'yasapp' }
     end
   end
   
-  def metro
+  def ap
     respond_to do |format|
-      format.html 
-      #format.html { render layout: 'metro' }
+      format.html { render layout: 'ap' }
     end
   end