diff options
Diffstat (limited to 'app/views/layouts/base.html.erb')
| -rw-r--r-- | app/views/layouts/base.html.erb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 1a7c3c816..68b175848 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -29,17 +29,14 @@ <div id="account"> <%= render_menu :account_menu -%> </div> - <%= content_tag( - 'div', - "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, - :id => 'loggedas') if User.current.logged? %> + <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> </div> <div id="header"> <% if User.current.logged? || !Setting.login_required? %> <div id="quick-search"> - <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %> + <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %> <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %> <label for='q'> <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>: @@ -59,10 +56,13 @@ <% end %> </div> +<% content_for :sidebar do %> + <%= call_hook :view_layouts_base_sidebar %> +<% end %> + <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %> <div id="sidebar"> <%= yield :sidebar %> - <%= call_hook :view_layouts_base_sidebar %> </div> <div id="content"> |