kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#692] removes div#admin-menu - now content of main menu

This commit is contained in:
Romano Licker 2011-10-06 11:40:45 +02:00 committed by Eric Davis
parent 729e801c9f
commit 0eeeb04c31
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/_menu.rhtml
View File

@ -1,3 +1 @@
<div id="admin-menu"> <%= render_menu :admin_menu %>
<%= render_menu :admin_menu %>
</div>

5
app/views/layouts/base.rhtml
View File

@ -112,18 +112,19 @@
<% display_sidebar = false %> <% display_sidebar = false %>
<% end %> <% end %>
<div id="main" class="<%= display_sidebar ? '' : "nosidebar" %>"> <div id="main" class="<%= display_sidebar ? '' : "nosidebar" %>">
<% if display_sidebar %>
<div id="main-menu"> <div id="main-menu">
<%= main_menu %> <%= main_menu %>
<%= yield :main_menu %>
<% if display_sidebar %>
<!-- Sidebar --> <!-- Sidebar -->
<div id="sidebar"> <div id="sidebar">
<%= yield :sidebar %> <%= yield :sidebar %>
<%= call_hook :view_layouts_base_sidebar %> <%= call_hook :view_layouts_base_sidebar %>
</div> </div>
<% end %>
</div> </div>
<%= expand_current_menu %> <%= expand_current_menu %>
<% end %>
<div class="<%= display_sidebar ? '' : "nosidebar" %>" id="content"> <div class="<%= display_sidebar ? '' : "nosidebar" %>" id="content">
<%= render_flash_messages %> <%= render_flash_messages %>

1
public/stylesheets/application.css
View File

@ -2473,7 +2473,6 @@ a.has-thumb img {
} }
/* Make icons non repeating */ /* Make icons non repeating */
#main-menu #admin-menu ul li a, #main-menu #admin-menu a:hover {padding: 0 0 0 24px; background-repeat: no-repeat !important; }
#more-menu.drop-down ul li a.projects { border-top:1px solid #555; } #more-menu.drop-down ul li a.projects { border-top:1px solid #555; }

4
test/integration/layout_test.rb
View File

@ -23,7 +23,7 @@ class LayoutTest < ActionController::IntegrationTest
assert_response :not_found assert_response :not_found
# UsersController uses the admin layout by default # UsersController uses the admin layout by default
assert_select "#admin-menu", :count => 0 assert_select "#main-menu", :count => 0
end end
test "browsing to an unauthorized page should render the base layout" do test "browsing to an unauthorized page should render the base layout" do
@ -33,7 +33,7 @@ class LayoutTest < ActionController::IntegrationTest
get "/admin" get "/admin"
assert_response :forbidden assert_response :forbidden
assert_select "#admin-menu", :count => 0 assert_select "#main-menu", :count => 0
end end
def test_top_menu_navigation_not_visible_when_login_required def test_top_menu_navigation_not_visible_when_login_required