app/views/layouts/application.html.haml in trusty-cms-2.0.7.pre.beta vs app/views/layouts/application.html.haml in trusty-cms-2.0.8.pre.beta
- old
+ new
@@ -29,25 +29,27 @@
%body{:class=>body_classes.join(" ")}
#page
#header
- if logged_in?
- #site_links
- = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path} (#{link_to t('log_out'), logout_path})}.html_safe
-
- = link_to t('view_site'), root_path, :id=>"view_site"
- %ul#navigation
- - nav_tabs.each do |tab|
- - if tab.visible?(current_user)
- %li{:class=>('current ' if current_tab?(tab)).to_s}
- = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
- #toolbar
- - if @current_tab and @current_tab.size > 1
- %ul#secondary_navigation
- - @current_tab.each do |sub_item|
- - if sub_item.visible?(current_user)
- %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
- = yield :toolbar
+ = render_region :before_nav
+ - render_region :navigation do |navigation|
+ #site_links
+ = %{#{t('logged_in_as')} #{link_to h(current_user.name), edit_admin_preferences_path} (#{link_to t('log_out'), logout_path})}.html_safe
+
+ = link_to t('view_site'), root_path, :id=>"view_site"
+ %ul#navigation
+ - nav_tabs.each do |tab|
+ - if tab.visible?(current_user)
+ %li{:class=>('current ' if current_tab?(tab)).to_s}
+ = link_to translate_with_default(tab.name), (tab.first.relative_url if tab.first)
+ #toolbar
+ - if @current_tab and @current_tab.size > 1
+ %ul#secondary_navigation
+ - @current_tab.each do |sub_item|
+ - if sub_item.visible?(current_user)
+ %li= link_to translate_with_default(sub_item.name), sub_item.relative_url, :class=>('current' if current_item?(sub_item))
+ = yield :toolbar
#main
- if flash[:notice]
#notice
%p= flash[:notice]
- if flash[:error]