Fixes admin menu display.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8679 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d32bdef91f32cae7630409b2c1bd59f63c96b86a..5aecd5f6d4108e0a9438906a96115c442daa1228 100644 (file)
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,6 +17,10 @@
 
 class AdminController < ApplicationController
   layout 'admin'
+  menu_item :projects, :only => :projects
+  menu_item :plugins, :only => :plugins
+  menu_item :info, :only => :info
+
   before_filter :require_admin
   helper :sort
   include SortHelper   

diff --git a/app/controllers/ldap_auth_sources_controller.rb b/app/controllers/ldap_auth_sources_controller.rb
index 74c8e31497915d41dbc2711b29be01b6fc5f17c1..29f1bc3d7eae3006f016103b48bb5dac2c6624d4 100644 (file)
--- a/app/controllers/ldap_auth_sources_controller.rb
+++ b/app/controllers/ldap_auth_sources_controller.rb
@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class LdapAuthSourcesController < AuthSourcesController
+  menu_item :ldap_authentication
 
   protected
 

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 257b903218d1a893b6331cd97ce9e35932700710..0658a8f341e153b22982aaa92363994c6cc605b6 100644 (file)
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -17,6 +17,7 @@
 
 class SettingsController < ApplicationController
   layout 'admin'
+  menu_item :plugins, :only => :plugin
 
   before_filter :require_admin
 

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f387287b0cdf8db73265fe5fd420c842fb819638..b9b6da6bb140957847f5be327b7a40b21c7a0a4c 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -50,7 +50,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
 
 #admin-menu ul {margin: 0;  padding: 0;}
-#admin-menu li {margin: 0;  padding: 0 0 12px 0; list-style-type:none;}
+#admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
 
 #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
 #admin-menu a.projects { background-image: url(../images/projects.png); }
@@ -111,6 +111,8 @@ a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-
 
 #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px; -moz-border-radius:2px;}
 #sidebar a.selected:hover {text-decoration:none;}
+#admin-menu a {line-height:1.7em;}
+#admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
 
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }