Merged r3859 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3862 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
index 9b3bc66b4dcab5fa1f4aec48d92c7a4b924f8a50..4fc08d888b6de7dcac13ee94af6eecacb076e9ce 100644 (file)
--- a/app/views/admin/_menu.rhtml
+++ b/app/views/admin/_menu.rhtml
@@ -3,7 +3,7 @@
                <li><%= link_to l(:label_project_plural), {:controller => 'admin', :action => 'projects'}, :class => 'projects' %></li>
                <li><%= link_to l(:label_user_plural), {:controller => 'users'}, :class => 'users' %></li>
                <li><%= link_to l(:label_group_plural), {:controller => 'groups'}, :class => 'groups' %></li>
-        <li><%= link_to l(:label_ldap_authentication), :controller => 'ldap_auth_sources', :action => 'index' %></li>
+        <li><%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'server_authentication' %></li>
                <li><%= link_to l(:label_role_and_permissions), {:controller => 'roles'}, :class => 'roles' %></li>
                <li><%= link_to l(:label_tracker_plural), {:controller => 'trackers'}, :class => 'trackers' %></li>
                <li><%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses'}, :class => 'issue_statuses' %></li>

diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index 7e8e693df72b32335231122481a00826a691f3fd..da29bb704fe1dd8e53f66f30076e19b79ebfaa76 100644 (file)
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -20,7 +20,7 @@
 </div>
 
 <div style="float:right;">
-    <%= link_to l(:label_ldap_authentication), :controller => 'ldap_auth_sources', :action => 'index' %>
+    <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-authentication' %>
 </div>
 
 <%= submit_tag l(:button_save) %>

diff --git a/public/images/server_key.png b/public/images/server_key.png
new file mode 100644 (file)
index 0000000..ecd5174
Binary files /dev/null and b/public/images/server_key.png differ

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2067bf3dbd15bf4885f4cd25778bd4dd8cdb6ea2..60c50d2b2768041314e6f6cdb0af6b2a2026144a 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -64,6 +64,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #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;}
 
@@ -837,6 +838,7 @@ padding-bottom: 3px;
 .icon-report  { background-image: url(../images/report.png); }
 .icon-comment  { background-image: url(../images/comment.png); }
 .icon-summary  { background-image: url(../images/lightning.png); }
+.icon-server-authentication { background-image: url(../images/server_key.png); }
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }