Reorganizing Admin layouts, and deleting home controller and views
This commit is contained in:
parent
0f8a1731d3
commit
48c917982c
|
@ -3,7 +3,7 @@ module Admin
|
|||
|
||||
include Locomotive::Routing::SiteDispatcher
|
||||
|
||||
layout 'admin/application'
|
||||
layout '/admin/layouts/application'
|
||||
|
||||
before_filter :authenticate_admin!
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
module Admin
|
||||
class CrossDomainSessionsController < BaseController
|
||||
|
||||
layout 'admin/box'
|
||||
layout '/admin/layouts/box'
|
||||
|
||||
skip_before_filter :verify_authenticity_token
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ module Admin
|
|||
|
||||
include Locomotive::Routing::SiteDispatcher
|
||||
|
||||
layout 'admin/box'
|
||||
layout '/admin/layouts/box'
|
||||
|
||||
before_filter :require_site
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ module Admin
|
|||
|
||||
include Locomotive::Routing::SiteDispatcher
|
||||
|
||||
layout 'admin/box'
|
||||
layout '/admin/layouts/box'
|
||||
|
||||
before_filter :require_site
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
class HomeController < ApplicationController
|
||||
|
||||
def show; end
|
||||
|
||||
def unknown; end
|
||||
|
||||
end
|
|
@ -1,4 +0,0 @@
|
|||
%h2 Locomotive rocks !!!
|
||||
|
||||
%p
|
||||
= flash[:error]
|
|
@ -1,7 +0,0 @@
|
|||
!!! XML
|
||||
!!!
|
||||
%html{ :xmlns => 'http://www.w3.org/1999/xhtml' }
|
||||
%head
|
||||
%body
|
||||
%h1 Welcome to Locomotive
|
||||
= yield
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue