| @@ -29,10 +29,11 | |||
|
|
29 | 29 | <%= render_menu :account_menu -%> |
|
|
30 | 30 | </div> |
|
|
31 | 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 -%> | |
|
|
32 | <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> | |
|
|
33 | 33 | </div> |
|
|
34 | 34 | |
|
|
35 | 35 | <div id="header"> |
|
|
36 | <% if User.current.logged? || !Setting.login_required? %> | |
|
|
36 | 37 | <div id="quick-search"> |
|
|
37 | 38 | <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %> |
|
|
38 | 39 | <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %> |
| @@ -41,6 +42,7 | |||
|
|
41 | 42 | <% end %> |
|
|
42 | 43 | <%= render_project_jump_box %> |
|
|
43 | 44 | </div> |
|
|
45 | <% end %> | |
|
|
44 | 46 | |
|
|
45 | 47 | <h1><%= page_header_title %></h1> |
|
|
46 | 48 | |
| @@ -21,4 +21,20 class LayoutTest < ActionController::IntegrationTest | |||
|
|
21 | 21 | assert_response :forbidden |
|
|
22 | 22 | assert_select "#admin-menu", :count => 0 |
|
|
23 | 23 | end |
|
|
24 | ||
|
|
25 | def test_top_menu_and_search_not_visible_when_login_required | |
|
|
26 | with_settings :login_required => '1' do | |
|
|
27 | get '/' | |
|
|
28 | assert_select "#top-menu > ul", 0 | |
|
|
29 | assert_select "#quick-search", 0 | |
|
|
30 | end | |
|
|
31 | end | |
|
|
32 | ||
|
|
33 | def test_top_menu_and_search_visible_when_login_not_required | |
|
|
34 | with_settings :login_required => '0' do | |
|
|
35 | get '/' | |
|
|
36 | assert_select "#top-menu > ul" | |
|
|
37 | assert_select "#quick-search" | |
|
|
38 | end | |
|
|
39 | end | |
|
|
24 | 40 | end |
General Comments 0
You need to be logged in to leave comments.
Login now