pages_controller.rb in caboose-cms-0.9.194

- old
+ new

@@ -56,16 +56,15 @@
       
       if !page
         asset
         return
       end
-      
 
       user = logged_in_user      
       if !user.is_allowed(page, 'view')                
         if user.id == User.logged_out_user_id(@site.id)
-          redirect_to "/modal/login?return_url=" + URI.encode(request.fullpath)		  		
+          redirect_to "/login?return_url=" + URI.encode(request.fullpath)		  		
           return
         else
           # go to 404 page
           render :file => "caboose/extras/error404", :layout => "caboose/application", :formats => [:html]
         end
@@ -79,14 +78,10 @@
       page = Caboose.plugin_hook('page_content', page)      
       @page = page
       @user = user
       @editing = false
       @preview = false
-   #   @editmode = !params['edit'].nil? && user.is_allowed('pages', 'edit') ? true : false
-   #   @crumb_trail = Caboose::Page.crumb_trail(@page)
-   #   @subnav = Caboose::Page.subnav(@page, session['use_redirect_urls'], @user)
-      #@subnav.links = @tasks.collect {|href, task| {'href' => href, 'text' => task, 'is_current' => uri == href}}
-  
+
     end
     
     def asset   
       uri = uri.to_s.gsub(/^(.*?)\?.*?$/, '\1')
       uri.chop! if uri.end_with?('/')