From be52ccf01fd65b96c3bcdd258103f1886d9f156e Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sat, 24 Jul 2010 00:23:50 +0000
Subject: [PATCH] Merged r3859 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3862 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/_menu.rhtml              |   2 +-
 app/views/settings/_authentication.rhtml |   2 +-
 public/images/server_key.png             | Bin 0 -> 746 bytes
 public/stylesheets/application.css       |   2 ++
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 public/images/server_key.png

diff --git a/app/views/admin/_menu.rhtml b/app/views/admin/_menu.rhtml
index 9b3bc66b..4fc08d88 100644
--- 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 7e8e693d..da29bb70 100644
--- 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
index 0000000000000000000000000000000000000000..ecd517425f0cf0a573f091656a0c69e294b6197f
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!d`Uz>R5;6}
zlS@n!Q51&%dDs?eX$!L{YO$aaAT<O8cftm$A#q{4P=h;SVoWq{T)3$&bYTo(2Z>^%
z8wrtxVNvT!(-=&NwM9+Zn#dzTR2m+|($3p^r?x7Vm6P0@nLFqI&VSCGVRT)`|6Kge
zjaV!eR1{@UmSvtqkZ3GPl4zXp`~BxC0uqUYod_N{91g$PTn&+kplLAt5tmM<1L1J!
zEP47D5Rb=CQn4Ti`>a+g<`<Sht81DLP1guWhe}|gC{}KPB!}E?x3Q7W7a$Yy`@~xU
z(8{Z?|CG^2MF8#5WHKR}%@!-GDq7pxjq3WZ>U7w<I-q2gh-eZ$6ly&YpCwT>s?&F_
zfzvp|MzQqNH!H3#j~%}BVf-%##aZb_G6l4GJB;cj7tG=`j&}>Nw_Z7xnHjztyK`i@
z<3{><*+B_lKuBdOqW7yc^Z1f_jE;l*VQ=n3ZZU*Cw&q%gTbv4AZ5(1tfU;QqJva(_
zn7WS!r2xBk0P6N9ScH1;)qty~y}GH@J!&|h!zq1{)G}>Brx3Dtt?nj-%`oKk1+ZKO
z44Z?gCIb|<@nc2g$}P}S;5e?>w@Rn3!6Yu>fc6sRS^`$SgVi<w)&^ackeo;rKBlr4
zOAexuNTl22@xW%Y!BVveKJyxN`8R0j^+A_jfKj(FH@yXOZsi-tFi3ySUcT^Teu^ns
z9~l`LAg6K5<#Kg;8k<nRHjetv6Ob~a;CVZeuVhR{tI(T$S7Whq=y|lXMRm;1zcCO9
z^b^p%Gc8H)QC}C7jTy{^*70o4fv=j73<iTOf95m0{m#+huG@QSokQDexqLdkdj0%Z
cda_d9PbR*Ptz~QfWB>pF07*qoM6N<$f~LGuF8}}l

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2067bf3d..60c50d2b 100644
--- 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); }