@@ -31,7 +31,7 | |||||
31 | <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %> |
|
31 | <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %> | |
32 | <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> |
|
32 | <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> | |
33 | </div> |
|
33 | </div> | |
34 |
|
34 | |||
35 | <div id="header"> |
|
35 | <div id="header"> | |
36 | <% if User.current.logged? || !Setting.login_required? %> |
|
36 | <% if User.current.logged? || !Setting.login_required? %> | |
37 | <div id="quick-search"> |
|
37 | <div id="quick-search"> | |
@@ -43,9 +43,9 | |||||
43 | <%= render_project_jump_box %> |
|
43 | <%= render_project_jump_box %> | |
44 | </div> |
|
44 | </div> | |
45 | <% end %> |
|
45 | <% end %> | |
46 |
|
46 | |||
47 | <h1><%= page_header_title %></h1> |
|
47 | <h1><%= page_header_title %></h1> | |
48 |
|
48 | |||
49 | <% if display_main_menu?(@project) %> |
|
49 | <% if display_main_menu?(@project) %> | |
50 | <div id="main-menu"> |
|
50 | <div id="main-menu"> | |
51 | <%= render_main_menu(@project) %> |
|
51 | <%= render_main_menu(@project) %> | |
@@ -54,11 +54,11 | |||||
54 | </div> |
|
54 | </div> | |
55 |
|
55 | |||
56 | <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %> |
|
56 | <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %> | |
57 |
<div id="sidebar"> |
|
57 | <div id="sidebar"> | |
58 | <%= yield :sidebar %> |
|
58 | <%= yield :sidebar %> | |
59 | <%= call_hook :view_layouts_base_sidebar %> |
|
59 | <%= call_hook :view_layouts_base_sidebar %> | |
60 | </div> |
|
60 | </div> | |
61 |
|
61 | |||
62 | <div id="content"> |
|
62 | <div id="content"> | |
63 | <%= render_flash_messages %> |
|
63 | <%= render_flash_messages %> | |
64 | <%= yield %> |
|
64 | <%= yield %> |
General Comments 0
You need to be logged in to leave comments.
Login now