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

app/views/admin/_menu.rhtml

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

app/views/layouts/base.rhtml

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

public/stylesheets/application.css

@@ -2473,7 +2473,6 @@ a.has-thumb img {
 }
 
 /* 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; }
 

test/integration/layout_test.rb

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