Changes for orbit bar, login
This commit is contained in:
1 parent
0b71714d44
commit
44a346ffe9
34 files changed
+724
-648
No files matched your search
@@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
include ParserFrontEnd, ParserBackEnd
|
||||
|
||||
layout :layout_by_resource
|
||||
|
||||
helper :all
|
||||
before_filter :set_locale, :set_site
|
||||
|
||||
@@ -104,6 +106,12 @@ class ApplicationController < ActionController::Base
|
||||
Item.first(:conditions => {:parent_id => nil})
|
||||
end
|
||||
|
||||
|
||||
def layout_by_resource
|
||||
if devise_controller?
|
||||
"devise"
|
||||
else
|
||||
"application"
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user