From 1aa88e4dc3c2eb514caad0ded62d8f0a4e0b336f Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 8 Jul 2009 20:10:57 +1000 Subject: [PATCH] Standardised some naming of the icons to allow for other themes --- htdocs/css/default/style.css | 2 +- htdocs/images/default/address-book.png | Bin 0 -> 1302 bytes .../images/default/{star.png => create.png} | Bin htdocs/images/default/export-big.png | Bin 0 -> 1121 bytes htdocs/images/default/forum-big.png | Bin 0 -> 738 bytes .../default/{import.png => import-big.png} | Bin .../images/default/{go.png => ldap-alias.png} | Bin htdocs/images/default/{dc.png => ldap-dc.png} | Bin .../default/{object.png => ldap-default.png} | Bin htdocs/images/default/{o.png => ldap-o.png} | Bin htdocs/images/default/{ou.png => ldap-ou.png} | Bin .../images/default/{uid.png => ldap-uid.png} | Bin .../{uniquegroup.png => ldap-uniquegroup.png} | Bin .../default/{user.png => ldap-user.png} | Bin htdocs/images/default/login.png | Bin 0 -> 654 bytes .../default/{logout.png => logout-big.png} | Bin htdocs/images/default/monitorserver-big.png | Bin 0 -> 1084 bytes ...st-feature.png => request-feature-big.png} | Bin .../default/{schema.png => schema-big.png} | Bin .../default/{search.png => search-big.png} | Bin htdocs/images/default/switch.png | Bin 0 -> 1302 bytes htdocs/modify_member_form.php | 4 +-- lib/AJAXTree.php | 2 +- lib/HTMLTree.php | 22 +++++++-------- lib/TemplateRender.php | 26 +++++++++--------- lib/functions.php | 26 +++++++++--------- queries/SambaUsers.xml | 2 +- queries/UserList.xml | 2 +- templates/creation/alias.xml | 2 +- templates/creation/dNSDomain.xml | 2 +- templates/creation/example.xml | 2 +- templates/creation/inetOrgPerson.xml | 2 +- templates/creation/kolabPerson.xml | 4 +-- templates/creation/mozillaOrgPerson.xml | 2 +- templates/creation/organizationalRole.xml | 4 +-- templates/creation/ou.xml | 2 +- templates/creation/posixAccount.xml | 2 +- templates/creation/posixGroup.xml | 2 +- templates/creation/sambaDomain.xml | 2 +- templates/creation/sambaGroupMapping.xml | 2 +- templates/creation/sambaSamAccount.xml | 2 +- templates/creation/sendmailMTAAliasObject.xml | 2 +- templates/creation/sendmailMTAClass.xml | 2 +- templates/creation/sendmailMTAMapObject.xml | 2 +- templates/creation/sendmailVirtualDomain.xml | 2 +- templates/creation/sendmailVirtualUser.xml | 2 +- templates/creation/simpleSecurityObject.xml | 2 +- templates/modification/inetOrgPerson.xml | 2 +- templates/modification/posixGroup.xml | 2 +- 49 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 htdocs/images/default/address-book.png rename htdocs/images/default/{star.png => create.png} (100%) create mode 100644 htdocs/images/default/export-big.png create mode 100644 htdocs/images/default/forum-big.png rename htdocs/images/default/{import.png => import-big.png} (100%) rename htdocs/images/default/{go.png => ldap-alias.png} (100%) rename htdocs/images/default/{dc.png => ldap-dc.png} (100%) rename htdocs/images/default/{object.png => ldap-default.png} (100%) rename htdocs/images/default/{o.png => ldap-o.png} (100%) rename htdocs/images/default/{ou.png => ldap-ou.png} (100%) rename htdocs/images/default/{uid.png => ldap-uid.png} (100%) rename htdocs/images/default/{uniquegroup.png => ldap-uniquegroup.png} (100%) rename htdocs/images/default/{user.png => ldap-user.png} (100%) create mode 100644 htdocs/images/default/login.png rename htdocs/images/default/{logout.png => logout-big.png} (100%) create mode 100644 htdocs/images/default/monitorserver-big.png rename htdocs/images/default/{request-feature.png => request-feature-big.png} (100%) rename htdocs/images/default/{schema.png => schema-big.png} (100%) rename htdocs/images/default/{search.png => search-big.png} (100%) create mode 100644 htdocs/images/default/switch.png diff --git a/htdocs/css/default/style.css b/htdocs/css/default/style.css index ea5868d..a5b2d5a 100644 --- a/htdocs/css/default/style.css +++ b/htdocs/css/default/style.css @@ -565,7 +565,7 @@ span.hint { /* Login Box */ #login { - background: url('../../images/default/uid.png') no-repeat 0 1px; + background: url('../../images/default/ldap-uid.png') no-repeat 0 1px; background-color: #FAFAFF; color: #000000; padding-left: 17px; diff --git a/htdocs/images/default/address-book.png b/htdocs/images/default/address-book.png new file mode 100644 index 0000000000000000000000000000000000000000..907d939ad048efcc4ab31795444bccea409d6ac3 GIT binary patch literal 1302 zcmV+x1?l>UP)4pXFCHvZDpV>$L9qlRL?K1g)MO(yP2)ywlQecW|6H^0ZFb-8 zo9UseX#L+?2ZmvIGr#X|zB9k?_rd?YiDz8b1gr$!20j2BAP2k(c+U$eP19W4-rl~u zv9a-}ZQB{sH1m7+?)7_mdIHyV1JCpPiHV76$8pX+_mM)O(81>B=HkA6`-1c5&#Pjw zSW!v^T5Iijp6=`G)9G|t&&hG7^;DM_c( z2qCCcDtMk3D5aiCaVVKgZl9Z*JEfGW357x-fMhaxZ$W*1J?-u796EG}SS-f;{5-i_ z4k@Ju@=v|wEnBuM9yxNv)>+adLYZs?apAPQsHv zZLFGF28V{4J=a~me*JpGaU3x+GSXU8Q}bnOYb)2TUDNjfGMP-pb=}^9fq|*%>FIY8 ziGPLf!9+%C*g9k~c)A)Xw3uk)RSQqE?$PhpbSg6($ z_W>vau%(n|PMkOqcO0kAG)<(G4+K_9aqir?#jdWd8{^~SGaVfru|jrMhBQpf&0rcb zU(q@RgsZGPP=La=?H9x0@K7`wz1h^%l>PqLG51O;rElN9t&7E?zI5qQ(9qD30d`3# zx3smjy}RelZ9O~JC-kQJl{zeqf`GSxRX`)K45$Unf0w!i^hFFa*|DZA5?{H3O|NZM zLjwbgH+~*GDq;9`#rJbTx%A=A-TQw{T}f1wVrX^>L&)!Z6?_9^t8^8Cf_Q{}55Cd7 zZi6j^sPoI7p;VnMq;9h8Akf+?DRpO2E6?gothsvSm#AAVQC0z0=d)T0@rC+_s^5V* zARl^2s}YMEHmn=mzWMdd;X<)~axf(qGFgI3B_x%yOheX1q(I9MrJ#b+no6K(jV@DD zh5XCD4i@e!WokM-=+cs)ZH-ze-OY zD2eCrZdnDZ0qTHAHJ}Fs)$ghbP^ykf{Kp@K`zz6?&Se$oZr1>R126Y5vM0>T^Z)<= M07*qoM6N<$f{EdFd;kCd literal 0 HcmV?d00001 diff --git a/htdocs/images/default/star.png b/htdocs/images/default/create.png similarity index 100% rename from htdocs/images/default/star.png rename to htdocs/images/default/create.png diff --git a/htdocs/images/default/export-big.png b/htdocs/images/default/export-big.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb2ec69c1e167ed6c0a9622e7bc239b482c746c GIT binary patch literal 1121 zcmV-n1fKheP)|{LS`VMK_$j)x-4iy7Ng-WvPE<%216WZO`)ajAk|p@>D8i0LaVB z6CRIeCLWJZ8w`f4Gcz+|z#@B?q%Y2&KW`iw8hT1ml(%YXYOGaNRc4pVC7I1;R8>V) zRnqA+>+9<*EG%fVv$KDCz1~DT9)BGe0@PdpBf!YWh}_%T+voH7F0{3^S?cTSO%8`c zGMP+SaUldk2qa0uYPCvkx7*}&IxW-F(`NuHa2*gi0g*`LiOI>y-hqJuN=r+#qMOCH z`$7mT77G;>6--V}9tVB|W^)1@4#$;q=gt+Em6dG~%49OT0`ysyWt>hYd3kvy(P;GJ z?EnM7)YO#c*s)_fA{0WPY1*E?s;ZQfl;HJxAIWtG1^`XdB%{%|ZUgNd3 zHAY8AQ51!6IEr%xQY6T0C#K!>~$m6S{-iN#{LTrSGW z$_NI7_0QL?cO-62 zu(YcE-A#*%iZ0~m=fB$C-Y!QX5$5OT0dkgTU|@jdXb2Je1b}@-k7cvF9lZ`f?B_4I z`n{mzovCcQcH3;WYjt&X4>UG58m(6At|f{sOkr64eAoV;xHZAb+&6e$TmyJ>^Y?xf zXmdK9O|7l1Qe|c3mREH0XM#ncs z@y6a#b#=AnJY(i5b*a|{viz&fDK@p;)lY?EeSqdF8xKuX>ow^r?;1CFf z(zR|ajxHHoN*y~$Kok)|(xfU$Ufz4TdmVg9W2)lN@ATui?}z*SJNQo$J@Gvt2|T`| zw+4I%8h}w9U^<!n|*(9aPSGJcR;dQt!9$R zQzhr+``n9vO!`$2)nM?+y6vh~|))-^1+*iGjcDvoJl`#fm z45?I#v9U3<)_9(W)*8oga9#IiP_x;*JX8wHvJgU0tJP?=T1-z*<2VkE<6zr1wryjK z`4{AQ-tSVWL?jX+6bf}=OG`^wmPMn{!1KH==;-K(dcE!d2Jkx|Q>)cJtgo*>4~N4~ zrIe!6-o?em@cjHdo12^Z?Ch+iweC!I`SkR3J6MswpklH3qgX7y0v-i>Ct|VKlgY`+ zFO^D#-QC@vp!2P}-<4$@3db%707*qoM6N<$g2Gft=>Px# literal 0 HcmV?d00001 diff --git a/htdocs/images/default/import.png b/htdocs/images/default/import-big.png similarity index 100% rename from htdocs/images/default/import.png rename to htdocs/images/default/import-big.png diff --git a/htdocs/images/default/go.png b/htdocs/images/default/ldap-alias.png similarity index 100% rename from htdocs/images/default/go.png rename to htdocs/images/default/ldap-alias.png diff --git a/htdocs/images/default/dc.png b/htdocs/images/default/ldap-dc.png similarity index 100% rename from htdocs/images/default/dc.png rename to htdocs/images/default/ldap-dc.png diff --git a/htdocs/images/default/object.png b/htdocs/images/default/ldap-default.png similarity index 100% rename from htdocs/images/default/object.png rename to htdocs/images/default/ldap-default.png diff --git a/htdocs/images/default/o.png b/htdocs/images/default/ldap-o.png similarity index 100% rename from htdocs/images/default/o.png rename to htdocs/images/default/ldap-o.png diff --git a/htdocs/images/default/ou.png b/htdocs/images/default/ldap-ou.png similarity index 100% rename from htdocs/images/default/ou.png rename to htdocs/images/default/ldap-ou.png diff --git a/htdocs/images/default/uid.png b/htdocs/images/default/ldap-uid.png similarity index 100% rename from htdocs/images/default/uid.png rename to htdocs/images/default/ldap-uid.png diff --git a/htdocs/images/default/uniquegroup.png b/htdocs/images/default/ldap-uniquegroup.png similarity index 100% rename from htdocs/images/default/uniquegroup.png rename to htdocs/images/default/ldap-uniquegroup.png diff --git a/htdocs/images/default/user.png b/htdocs/images/default/ldap-user.png similarity index 100% rename from htdocs/images/default/user.png rename to htdocs/images/default/ldap-user.png diff --git a/htdocs/images/default/login.png b/htdocs/images/default/login.png new file mode 100644 index 0000000000000000000000000000000000000000..7be48fb8cd09d6adfc48954e1907f38d3bb0c3b1 GIT binary patch literal 654 zcmV;90&)F`P)jL%;Pn)6~ zp+z7;99L)q8&6i(@;pDhvS!nc7x4PcUW2hXn?r(7S4e~~4wNS)&tLR1=iDr~xz%s_ zpCYEMNeNI9QX-`U1SCOHp6#ty*-X@(cLimD^%ZdQkQYW-ZbURRu<80K^-R;In0T@uAMdL%H@{m-*2~J%XyJ%VN zE@#($GnW&I^uH7h;s`cp6e}0&OCWbNaqnkKr2DFgq@H3 zGts7?ud1dvE>`|~(zIvbA{ONS6{SQaYpg6)B3o60TPim(N oN=PK6hSf)_xH~Spv5tS$Z>|sW3LxX?DF6Tf07*qoM6N<$f^GL0UH||9 literal 0 HcmV?d00001 diff --git a/htdocs/images/default/logout.png b/htdocs/images/default/logout-big.png similarity index 100% rename from htdocs/images/default/logout.png rename to htdocs/images/default/logout-big.png diff --git a/htdocs/images/default/monitorserver-big.png b/htdocs/images/default/monitorserver-big.png new file mode 100644 index 0000000000000000000000000000000000000000..d40900d98abae5328e1c2700891e8d7e902097a4 GIT binary patch literal 1084 zcmV-C1jGA@P)WFU8GbZ8({Xk{QrNlj1+3MgYKATls8GayP~Yjt8ECu(VJ zZDC_4AX9W@X>Mh5Co}I@000AjNklFZBx>O9&-t_^ipF8m|jYaF(Ot?Kvbn*dD~bk zMX%kp_uYebRjpQSlN>rQush$*{O3P2-)soKoCXSgHZEU&pBIsP_rAF(^atPH-zS|; z1K>CgSFc{-#`OBZ@z-v-Ri~n#~qxPiGk$9VPR|5`Ub zPXz%0QmGWGss>nia{taPS{i&Gh1+-UcZ?1!FTdUWeqwThCx3{80aR6`*=*uCPS+t4 ziFD6jdj(!j*;JIU&u?vQz5ATWoa9(49t1E=lUOWRyrg z-~R-_vP>>qSnN=7)c{3{2A`m&@_twMzgz_~LJ$TrM|o>bzq40D4Q)+XGo{bL-{}KD)V! zLvXU{Ppbi&qIOt^dgGT$B?LjB(P-c}4yI|cxw%Q9@aRQX#T6gG!NGwqd($-0G>u3k z;$!4E4zXAaQ50ENSm;mGC%zKdw#~-I2BIi3Jv~h}n`LBVq|2yR4-XG%wOaqlBG7|! zxlA^jWqW&@+1XiItrnsv`j|P6Ln4tN6bd~*z|71HTU%SKtgH}^$4MrW3=a2w-h*GZ?-G@DHf z!@x96EX(STWBn6@s0ZK$k4B^Dy3Wzj5td~k%QCvIqpE5*ux;DD7dP~842}cT>vbxX z&JJlb8Yqf_q9|0WRb*MFR;!_D8ufY|S(ba_i~==48C0qSFavz*9zL&r;{MOaykY5; zkgEwG1;pKV!ELUP)4pXFCHvZDpV>$L9qlRL?K1g)MO(yP2)ywlQecW|6H^0ZFb-8 zo9UseX#L+?2ZmvIGr#X|zB9k?_rd?YiDz8b1gr$!20j2BAP2k(c+U$eP19W4-rl~u zv9a-}ZQB{sH1m7+?)7_mdIHyV1JCpPiHV76$8pX+_mM)O(81>B=HkA6`-1c5&#Pjw zSW!v^T5Iijp6=`G)9G|t&&hG7^;DM_c( z2qCCcDtMk3D5aiCaVVKgZl9Z*JEfGW357x-fMhaxZ$W*1J?-u796EG}SS-f;{5-i_ z4k@Ju@=v|wEnBuM9yxNv)>+adLYZs?apAPQsHv zZLFGF28V{4J=a~me*JpGaU3x+GSXU8Q}bnOYb)2TUDNjfGMP-pb=}^9fq|*%>FIY8 ziGPLf!9+%C*g9k~c)A)Xw3uk)RSQqE?$PhpbSg6($ z_W>vau%(n|PMkOqcO0kAG)<(G4+K_9aqir?#jdWd8{^~SGaVfru|jrMhBQpf&0rcb zU(q@RgsZGPP=La=?H9x0@K7`wz1h^%l>PqLG51O;rElN9t&7E?zI5qQ(9qD30d`3# zx3smjy}RelZ9O~JC-kQJl{zeqf`GSxRX`)K45$Unf0w!i^hFFa*|DZA5?{H3O|NZM zLjwbgH+~*GDq;9`#rJbTx%A=A-TQw{T}f1wVrX^>L&)!Z6?_9^t8^8Cf_Q{}55Cd7 zZi6j^sPoI7p;VnMq;9h8Akf+?DRpO2E6?gothsvSm#AAVQC0z0=d)T0@rC+_s^5V* zARl^2s}YMEHmn=mzWMdd;X<)~axf(qGFgI3B_x%yOheX1q(I9MrJ#b+no6K(jV@DD zh5XCD4i@e!WokM-=+cs)ZH-ze-OY zD2eCrZdnDZ0qTHAHJ}Fs)$ghbP^ykf{Kp@K`zz6?&Se$oZr1>R126Y5vM0>T^Z)<= M07*qoM6N<$f{EdFd;kCd literal 0 HcmV?d00001 diff --git a/htdocs/modify_member_form.php b/htdocs/modify_member_form.php index 4511755..29aea39 100644 --- a/htdocs/modify_member_form.php +++ b/htdocs/modify_member_form.php @@ -89,8 +89,8 @@ else echo ''; echo ''; -printf('',IMGDIR,_('Available members')); -printf('',IMGDIR,_('Group members')); +printf('',IMGDIR,_('Available members')); +printf('',IMGDIR,_('Group members')); echo ''; # Generate select box from all possible members diff --git a/lib/AJAXTree.php b/lib/AJAXTree.php index 8d49313..5d72897 100644 --- a/lib/AJAXTree.php +++ b/lib/AJAXTree.php @@ -261,7 +261,7 @@ class AJAXTree extends HTMLTree { $output .= $this->get_indentation($level); $output .= sprintf('--',$img); $output .= sprintf('',htmlspecialchars($href),$entry->getDN()); - $output .= sprintf('->',IMGDIR); + $output .= sprintf('->',IMGDIR); $output .= ''; $output .= ' '; diff --git a/lib/HTMLTree.php b/lib/HTMLTree.php index e40c3f1..7e2be73 100644 --- a/lib/HTMLTree.php +++ b/lib/HTMLTree.php @@ -151,7 +151,7 @@ class HTMLTree extends Tree { if (! is_null($server->inactivityTime())) { $m = sprintf(_('Inactivity will log you off at %s'), strftime('%H:%M',$server->inactivityTime())); - printf(' %s',IMGDIR,$m,$m); + printf(' %s',IMGDIR,$m,'Timeout'); } echo ''; } @@ -193,7 +193,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Schema'); $menu['div'] = 'BODY'; $menu['title'] = _('View schema for'); - $menu['img'] = 'schema.png'; + $menu['img'] = 'schema-big.png'; $menu['name'] = _('schema'); break; @@ -205,7 +205,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Search'); $menu['div'] = 'BODY'; $menu['title'] = _('Search'); - $menu['img'] = 'search.png'; + $menu['img'] = 'search-big.png'; $menu['name'] = _('search'); break; @@ -230,7 +230,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Info'); $menu['div'] = 'BODY'; $menu['title'] = _('Info'); - $menu['img'] = 'info.png'; + $menu['img'] = 'info-big.png'; $menu['name'] = _('info'); break; @@ -257,7 +257,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Monitor Info'); $menu['div'] = 'BODY'; $menu['title'] = _('Monitor'); - $menu['img'] = 'ldap-server.png'; + $menu['img'] = 'monitorserver-big.png'; $menu['name'] = _('monitor'); break; @@ -269,7 +269,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Import'); $menu['div'] = 'BODY'; $menu['title'] = _('Import'); - $menu['img'] = 'import.png'; + $menu['img'] = 'import-big.png'; $menu['name'] = _('import'); break; @@ -281,7 +281,7 @@ class HTMLTree extends Tree { $menu['ajax'] = _('Loading Export'); $menu['div'] = 'BODY'; $menu['title'] = _('Export'); - $menu['img'] = 'export.png'; + $menu['img'] = 'export-big.png'; $menu['name'] = _('export'); break; @@ -292,7 +292,7 @@ class HTMLTree extends Tree { $href = sprintf('cmd.php?cmd=logout&server_id=%s',$server->getIndex()); return sprintf('%s
%s', - htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout.png',_('logout'),_('logout')); + htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout-big.png',_('logout'),_('logout')); default: return false; @@ -465,7 +465,7 @@ class HTMLTree extends Tree { echo ''; printf('',$level+3); - printf('',$href,IMGDIR,_('new')); + printf('',$href,IMGDIR,_('new')); printf('', $this->getDepth()+3-$level,$href,_('Create a new entry in'),$rdn,_('Create new entry here')); echo ''; @@ -486,12 +486,12 @@ class HTMLTree extends Tree { if (isAjaxEnabled()) { printf('', - $href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'uid.png',_('login')); + $href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'login.png',_('login')); printf('', $this->getDepth()+3-2,$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),_('login')); } else { - printf('',$href_parm,IMGDIR,'uid.png',_('login')); + printf('',$href_parm,IMGDIR,'login.png',_('login')); printf('',$this->getDepth()+3-2,$href_parm,_('Login')); } diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php index 8331247..4f58bff 100644 --- a/lib/TemplateRender.php +++ b/lib/TemplateRender.php @@ -623,7 +623,7 @@ class TemplateRender extends PageRender { echo ''; if ($isInValid) - printf('',IMGDIR); + printf('',IMGDIR); else { if (isAjaxEnabled()) @@ -669,7 +669,7 @@ class TemplateRender extends PageRender { else echo ''; - printf('',IMGDIR); + printf('',IMGDIR); printf('',_('Default')); echo ''; } @@ -1114,10 +1114,10 @@ class TemplateRender extends PageRender { $href = sprintf('cmd=template_engine&%s&template=',$this->url_base); if (isAjaxEnabled()) - return sprintf($this->layout['actionajax'],IMGDIR,'catalog.png',_('Switch Template'), + return sprintf($this->layout['actionajax'],IMGDIR,'switch.png',_('Switch Template'), htmlspecialchars($href),_('Change to another template'),htmlspecialchars($href),_('Loading'),_('Switch Template')); else - return sprintf($this->layout['action'],IMGDIR,'catalog.png',_('Switch Template'), + return sprintf($this->layout['action'],IMGDIR,'switch.png',_('Switch Template'), htmlspecialchars($href),_('Change to another template'),_('Switch Template')); } @@ -1127,10 +1127,10 @@ class TemplateRender extends PageRender { $href = sprintf('cmd=export_form&%s&scope=base',$this->url_base); if (isAjaxEnabled()) - return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Export'), + return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Export'), htmlspecialchars($href),_('Save a dump of this object'),htmlspecialchars($href),_('Loading'),_('Export')); else - return sprintf($this->layout['action'],IMGDIR,'save.png',_('Export'), + return sprintf($this->layout['action'],IMGDIR,'export.png',_('Export'), htmlspecialchars($href),_('Save a dump of this object'),_('Export')); } @@ -1213,11 +1213,11 @@ class TemplateRender extends PageRender { $href = sprintf('cmd=template_engine&server_id=%s&container=%s',$this->getServerID(),rawurlencode($this->template->getDN())); if (isAjaxEnabled()) - return sprintf($this->layout['actionajax'],IMGDIR,'star.png',_('Create'), + return sprintf($this->layout['actionajax'],IMGDIR,'create.png',_('Create'), htmlspecialchars($href),_('Create a child entry'), htmlspecialchars($href),_('Loading'),_('Create a child entry')); else - return sprintf($this->layout['action'],IMGDIR,'star.png',_('Create'), + return sprintf($this->layout['action'],IMGDIR,'create.png',_('Create'), htmlspecialchars($href),_('Create a child entry'),_('Create a child entry')); } @@ -1262,11 +1262,11 @@ class TemplateRender extends PageRender { $href = sprintf('cmd=export_form&%s&scope=%s',$this->url_base,'sub'); if (isAjaxEnabled()) - return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Save'), + return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Save'), htmlspecialchars($href),_('Save a dump of this object and all of its children'), htmlspecialchars($href),_('Loading'),_('Export subtree')); else - return sprintf($this->layout['action'],IMGDIR,'save.png',_('Save'), + return sprintf($this->layout['action'],IMGDIR,'export.png',_('Save'), htmlspecialchars($href),_('Save a dump of this object and all of its children'),_('Export subtree')); } @@ -1830,9 +1830,9 @@ function fillRec(id,value) { if (DEBUGTMP) printf('%s
',__METHOD__); if (strlen($val) <= 0) - printf('Go ',IMGDIR); + printf('Go ',IMGDIR); elseif ($this->getServer()->dnExists($val)) - printf('Go ', + printf('Go ', $this->getServerID(),rawurlencode($val),_('Go to'),$val,IMGDIR); else printf('Go ',_('DN not available'),$val,IMGDIR); @@ -1852,7 +1852,7 @@ function fillRec(id,value) { protected function drawUrlValueIconAttribute($attribute,$val) { if (DEBUGTMP) printf('%s
',__METHOD__); - $img = sprintf('%s',IMGDIR,_('URL')); + $img = sprintf('%s',IMGDIR,_('URL')); $url = explode(' +',$val,2); if (strlen($val) <= 0) diff --git a/lib/functions.php b/lib/functions.php index 390da72..b85d268 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -384,12 +384,12 @@ function cmd_control_pane($type) { 'external_links:forum'=>array( 'title'=>_('Forum'), 'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('forum'),_('Forum')), - 'image'=>sprintf('%s',IMGDIR,_('Forum'))), + 'image'=>sprintf('%s',IMGDIR,_('Forum'))), 'external_links:feature'=>array( 'title'=>_('Request feature'), 'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('add_rfe'),_('Request feature')), - 'image'=>sprintf('%s',IMGDIR,_('Request feature'))), + 'image'=>sprintf('%s',IMGDIR,_('Request feature'))), 'external_links:bug'=>array( 'title'=>_('Report a bug'), @@ -1579,26 +1579,26 @@ function get_icon($server_id,$dn,$object_classes=array()) { in_array('account',$object_classes) || in_array('posixaccount',$object_classes)) - return 'user.png'; + return 'ldap-user.png'; elseif (in_array('organization',$object_classes)) - return 'o.png'; + return 'ldap-o.png'; elseif (in_array('organizationalunit',$object_classes)) - return 'ou.png'; + return 'ldap-ou.png'; elseif (in_array('organizationalrole',$object_classes)) - return 'uid.png'; + return 'ldap-uid.png'; elseif (in_array('dcobject',$object_classes) || in_array('domainrelatedobject',$object_classes) || in_array('domain',$object_classes) || in_array('builtindomain',$object_classes)) - return 'dc.png'; + return 'ldap-dc.png'; elseif (in_array('alias',$object_classes)) - return 'go.png'; + return 'ldap-alias.png'; elseif (in_array('room',$object_classes)) return 'door.png'; @@ -1632,13 +1632,13 @@ function get_icon($server_id,$dn,$object_classes=array()) { in_array('groupofnames',$object_classes) || in_array('group',$object_classes)) - return 'ou.png'; + return 'ldap-ou.png'; elseif (in_array('applicationprocess',$object_classes)) return 'process.png'; elseif (in_array('groupofuniquenames',$object_classes)) - return 'uniquegroup.png'; + return 'ldap-uniquegroup.png'; elseif (in_array('iphost',$object_classes)) return 'host.png'; @@ -1671,7 +1671,7 @@ function get_icon($server_id,$dn,$object_classes=array()) { return 'ldap-server.png'; elseif (in_array('rbscollection',$object_classes)) - return 'ou.png'; + return 'ldap-ou.png'; elseif (in_array('dfsconfiguration',$object_classes)) return 'nt_machine.png'; @@ -1713,11 +1713,11 @@ function get_icon($server_id,$dn,$object_classes=array()) { return 'lock.png'; elseif (strcasecmp($rdn_value,'MicrosoftDNS') == 0) - return 'dc.png'; + return 'ldap-dc.png'; # Oh well, I don't know what it is. Use a generic icon. else - return 'object.png'; + return 'ldap-default.png'; } /** diff --git a/queries/SambaUsers.xml b/queries/SambaUsers.xml index 2018a62..7fcb1e4 100644 --- a/queries/SambaUsers.xml +++ b/queries/SambaUsers.xml @@ -7,7 +7,7 @@ Samba Users -user.png +ldap-user.pngsub1 diff --git a/queries/UserList.xml b/queries/UserList.xml index 4b8767e..4d54c1e 100644 --- a/queries/UserList.xml +++ b/queries/UserList.xml @@ -7,7 +7,7 @@ User List -user.png +ldap-user.pngsub1 diff --git a/templates/creation/alias.xml b/templates/creation/alias.xml index c7f83d6..1cc7555 100644 --- a/templates/creation/alias.xml +++ b/templates/creation/alias.xml @@ -5,7 +5,7 @@
Users %sMembers %sUsers %sMembers %s
%s%s%s
%s%s%s%s%s...
ErrorDisabled