Use the regular "icon icon-*" for admin menu links (#24313).

Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@15972 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine.rb b/lib/redmine.rb
index fe53a6d3bf9d70e43a8ef0e150bef18498225cdd..193d5d1a3009635ede6382df578d5a2fb804b9fb 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -207,22 +207,32 @@ Redmine::MenuManager.map :application_menu do |menu|
 end
 
 Redmine::MenuManager.map :admin_menu do |menu|
-  menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
-  menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
-  menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
-  menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
-  menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
+  menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural,
+            :html => {:class => 'icon icon-projects'}
+  menu.push :users, {:controller => 'users'}, :caption => :label_user_plural,
+            :html => {:class => 'icon icon-user'}
+  menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural,
+            :html => {:class => 'icon icon-group'}
+  menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions,
+            :html => {:class => 'icon icon-roles'}
+  menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural,
+            :html => {:class => 'icon icon-issue'}
   menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
-            :html => {:class => 'issue_statuses'}
-  menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
+            :html => {:class => 'icon icon-issue-edit'}
+  menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow,
+            :html => {:class => 'icon icon-workflows'}
   menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
-            :html => {:class => 'custom_fields'}
-  menu.push :enumerations, {:controller => 'enumerations'}
-  menu.push :settings, {:controller => 'settings'}
+            :html => {:class => 'icon icon-custom-fields'}
+  menu.push :enumerations, {:controller => 'enumerations'},
+            :html => {:class => 'icon icon-list'}
+  menu.push :settings, {:controller => 'settings'},
+            :html => {:class => 'icon icon-settings'}
   menu.push :ldap_authentication, {:controller => 'auth_sources', :action => 'index'},
-            :html => {:class => 'server_authentication'}
-  menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
-  menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
+            :html => {:class => 'icon icon-server-authentication'}
+  menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true,
+            :html => {:class => 'icon icon-plugins'}
+  menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true,
+            :html => {:class => 'icon icon-help'}
 end
 
 Redmine::MenuManager.map :project_menu do |menu|

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9d1fb81b102bdee6d6083eef959742603e54cc82..0d7553ffc3a7da8a76f14dddd975c99489d62198 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -78,21 +78,6 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;}
 #admin-menu ul {margin: 0;  padding: 0;}
 #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); }
-#admin-menu a.users { background-image: url(../images/user.png); }
-#admin-menu a.groups { background-image: url(../images/group.png); }
-#admin-menu a.roles { background-image: url(../images/database_key.png); }
-#admin-menu a.trackers { background-image: url(../images/ticket.png); }
-#admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
-#admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
-#admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
-#admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
-#admin-menu a.settings { background-image: url(../images/changeset.png); }
-#admin-menu a.plugins { background-image: url(../images/plugin.png); }
-#admin-menu a.info { background-image: url(../images/help.png); }
-#admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
-
 #main {background-color:#EEEEEE;}
 
 #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
@@ -1219,6 +1204,12 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .icon-close { background-image: url(../images/close.png); }
 .icon-close:hover { background-image: url(../images/close_hl.png); }
 .icon-settings { background-image: url(../images/changeset.png); }
+.icon-group { background-image: url(../images/group.png); }
+.icon-roles { background-image: url(../images/database_key.png); }
+.icon-issue-edit { background-image: url(../images/ticket_edit.png); }
+.icon-workflows { background-image: url(../images/ticket_go.png); }
+.icon-custom-fields { background-image: url(../images/textfield.png); }
+.icon-plugins { background-image: url(../images/plugin.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }