Reorganizing Admin layouts, and deleting home controller and views

This commit is contained in:
Jacques Crocker 2010-09-21 04:16:39 -07:00
parent 0f8a1731d3
commit 48c917982c
11 changed files with 6 additions and 24 deletions

View File

@ -3,7 +3,7 @@ module Admin
include Locomotive::Routing::SiteDispatcher
layout 'admin/application'
layout '/admin/layouts/application'
before_filter :authenticate_admin!

View File

@ -1,7 +1,7 @@
module Admin
class CrossDomainSessionsController < BaseController
layout 'admin/box'
layout '/admin/layouts/box'
skip_before_filter :verify_authenticity_token

View File

@ -3,7 +3,7 @@ module Admin
include Locomotive::Routing::SiteDispatcher
layout 'admin/box'
layout '/admin/layouts/box'
before_filter :require_site

View File

@ -3,7 +3,7 @@ module Admin
include Locomotive::Routing::SiteDispatcher
layout 'admin/box'
layout '/admin/layouts/box'
before_filter :require_site

View File

@ -6,6 +6,6 @@ class ApplicationController < ActionController::Base
# rescue_from Exception, :with => :render_error
#
# def render_error
# render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
# render :template => "/admin/errors/500", :layout => '/admin/layouts/box', :status => 500
# end
end

View File

@ -1,7 +0,0 @@
class HomeController < ApplicationController
def show; end
def unknown; end
end

View File

@ -1,4 +0,0 @@
%h2 Locomotive rocks !!!
%p
= flash[:error]

View File

@ -1,7 +0,0 @@
!!! XML
!!!
%html{ :xmlns => 'http://www.w3.org/1999/xhtml' }
%head
%body
%h1 Welcome to Locomotive
= yield

View File

@ -9,7 +9,7 @@ module Locomotive
def render_locomotive_page
if request.fullpath =~ /^\/admin\//
render :template => "/admin/errors/404", :layout => 'admin/box', :status => 404
render :template => "/admin/errors/404", :layout => '/admin/layouts/box', :status => 404
else
@page = locomotive_page