From 2abf1e593d5470309d439a96edb10f53b51a11da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@opensides.be>
Date: Mon, 8 Jun 2015 12:48:47 +0200
Subject: [PATCH] Fixes #3839 Removing last icons images
---
html/images/dtree.png | Bin 694 -> 0 bytes
html/images/launch.png | Bin 1263 -> 0 bytes
html/images/lists/action.png | Bin 814 -> 0 bytes
html/images/rightarrow.png | Bin 863 -> 0 bytes
.../default/icons/16/actions}/submit.png | Bin
.../default/icons/16/apps/ldap.png} | Bin
.../default/icons/16/types/action.png} | Bin
ihtml/themes/default/simple-filter.tpl | 2 +-
include/class_IconTheme.inc | 45 ++++++++++--------
include/class_baseSelector.inc | 2 +-
include/select/groupSelect/group-filter.tpl | 2 +-
plugins/admin/ogroups/ogroup-filter.tpl | 2 +-
plugins/admin/users/user-filter.tpl | 2 +-
plugins/personal/generic/class_user.inc | 2 +-
14 files changed, 30 insertions(+), 27 deletions(-)
delete mode 100644 html/images/dtree.png
delete mode 100644 html/images/launch.png
delete mode 100644 html/images/lists/action.png
delete mode 100644 html/images/rightarrow.png
rename html/{images/lists => themes/default/icons/16/actions}/submit.png (100%)
rename html/{images/lists/search-subtree.png => themes/default/icons/16/apps/ldap.png} (100%)
rename html/{images/rocket.png => themes/default/icons/16/types/action.png} (100%)
diff --git a/html/images/dtree.png b/html/images/dtree.png
deleted file mode 100644
index 7eb7909962febca801ae5ff4a82e8ffa16badd09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!NJ&INRCwBA
z{Qv(y11$hR0I^t2dp4h&gE@hnnTg@g@4pOxe*FXDzYM>jG>HG301Z<2_xC@Be}94W
z&(941etlX15I`&-L*0$U8Gim^VEFlif#JtbApQZx-x(Ob1L^PIp%|GB#Q&HW7=8gg
z3^bSFKNG~IjEtXv0=p6b0*Hx|jfLSS(6C=13^e>V2>*uSKMV|ifEefy2u5Q6L&7Mb
z$;`^Y$iT(`5I`(^tp6FTB@r4x2K|8=@&^h3MrQv;(7%8G2kQgH7080WKrbv_$HV{-
zKrH<13=9r(2n%P=p3RV&no2NoK!$(}`}YqRw*UTvF^K=`=YNKMN0=A@0*Hy6RDsJ-
z7#pMjAb?mH{t;*JkEwE~$tnE-Rzo3t1_potV*3A&ymSn6EwZ5?_Ftelhz1BC7HmNQ
z3TI@1EzA+Y@gEv-Fbg0C0|XEYHWw2UdDvWx925Wn#6nEuffU2S6gko`!xljU1Q5Yg
zflVVmLqV1T1Bn43fbd2hE{(ViMFa&v0O1S@WKCc^M+ul!fjJhI{GxB5MH*Bc)S&<Y
z#Dpy!V@>oJsRD<qp$-KIAQo&6o;!CA3O_0;9_~_N!X5+w0tlGg{-G#NOiae=8e)6}
z2?~fjKmf7)`}-eQLj8d#_zQ`gzyBa%g<KZ=3%LZQA#y<RZ$H4^{txv&%+Oz;vKI&d
z0*KMH{>pzPA!c9=04)9g{Dsg!i{NY^{SR3VO8@)&4`*t+_2fGPKmak)s?GxlASMPH
c0e}Dl0I565QA{BqJOBUy07*qoM6N<$f;X}fV*mgE
diff --git a/html/images/launch.png b/html/images/launch.png
deleted file mode 100644
index da97aef509bd6411185eb093c79581b870c21161..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$fk{L`RCwBA
zV4wncz`#)On4RJNb8&|MFJu}1KW1b24-h~U8F-C>LEr`h!~UlR-2cDL%=rKN)T;k~
zZXNmmSefBJKmf6jYv@^^p}&BJO8Cea2o=>ZF!G5pFtGD5{Qv%$;oBDm27mw}%iyC>
zL*>%k4EQ6%8UAt!GBExA#lXbyh2ih*V+^0(GkgFDAd(H;12l9$1H<{pv*-N({Q2Ae
zw{JiGfByW<|F6f_{{OXa=Kq^EV*d{?Ff;%J5J@iH0(GfoUa*0nCJ)1(i(44}F>^6|
z6Ek4o{_&OJ>!t+^_l~@Jz|6of0U&^I8oY*qApuA!AdCHEVDLAXJ;y*WG@Rknx1S6@
ze*9!$e0`VU%a`vAf48n;xH;|khrbLAfdLE*9{>V~5u2e)85rivs&XX=>FF|vD)2J=
z=M-T0&%w*UaAqk3ueve=BNsn7qV9N3V_<o6m*M)wrwl)93O+D@`{EeEz;FR%20#E|
zxOfi8P(A(x+ZZDT1|eAn20n2H20<Byzn8W%{E^{f`1|E65dULf1}1`!AA#OKa+Kj?
z=Y$VTKtmIuhJpY<05KyQIvHrFnvqz7L!cs%_Ya8wL-3Vd42*Y=G5r1Um*M&Pj|>dF
zj0|kTtPCe!OEEleYyR*bXlN>up&$SdK=7dG1{$hsE|=gQs>#6c>nj7p@9zu@EUdtQ
z1+w2iW%%>?E5n7&KN*<#m>E<&1c8?PVwk`3-v>sZp+#thf&f4Ofemh9U@!nu{m2qP
zcRIMaOEH)k^DzAS^o8NT%9jl6y#E=@>=+nWc?20AN%}J^tDe_b3rt$r;t3#tz+qei
zvC$DG2;}!0nMygB*()&o{PdY&-Rg%7Jc4Wt_AVR@?2N#8w@YSVc*o7~3s2Gn2p}eO
zflDb20%DR32LBnE7=HX^W0<$_9>YIjP6oFC83uN4V9L;N0{e&Y(@Ss+-~s>vgktdd
zB!&V;4*vUL)5{zfG#wdw+m14Di*hrBL})O4|HaDigH4!$;V&>Xe}2Wl@Z~k$%mffX
zaD&gpGxQ5+DfeqOZ4ltMieh+i;Q|APxD<ngBtOHu5C0ja&bY<!{3)<>`T8Dc@N0%2
z_pjhJ7$AVa2A_ywaNv^UEKo?SU|?qZ#qj>#6$S-6V}|1EhZvqcz0ELx#<>qae*D=0
zlw@G|^NZofvj+_8SKs^q)Vcwe!2kgSHuΟhrA2?hp6U=sWLmO)ZSl)<YjhvDb#
zl?>{73>&_G`)vqRc9DUVgW<;?R)+bD?|=CI<DX*-mShG4009Is_%DNjke&>X@dk?D
z0@Lp!hKF0{fGpkE0<I(&fQB+L%$s|S;o0-=iTDf!0e}Ev*&D(jz{<zsz`!XCHS`BC
zVoozW-m!z>*}2yj99J_efGJ+L^a8_=@4rEYZXi?=0t67tzkdt`@=p8=e_rfm`26rQ
z!{_G=49|h_^5qTKz(VAz4Ql8DVv1OR0Ak$k&+wj+5$sh^WLyAd#fP9sao+&(KDhuO
ZzyPZjou<%|e$xN|002ovPDHLkV1l1lPALEY
diff --git a/html/images/lists/action.png b/html/images/lists/action.png
deleted file mode 100644
index 120f2ff738b49341bb51cd91e639a2730187adad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 814
zcmV+}1JV46P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00006VoOIv00000
z008+zyMF)x010qNS#tmY3lIPR3lIUVBfWJ1000McNliru(gGU-EHa#!dO83A0=r2>
zK~#90mC=7_%yAsY@#mf0?e^n)92UzCV`${ZT3l$DA6xQk%^zl=73$<y5)*&WB)>*}
z&5!+|r1(chn24;!YA6#sY{~Ltel0U=?rwLxmp^tBHk#MJ?@y0jpZD9ue`GbphhR+d
zNXL0oq{Z>3rjdOu0SD0BZDcbTMGKadUR^OkdOky{nWiH{>;e`5y}E_ugOP8Jx~jDU
zrO-1;l9HlSXt8_;mH~ab(<J^7l!o5lkm~oeBPBO=XIQdQ;5d-oWuts>AGAg5a7>JH
z;oOe#8FzxG-O{Z|3Q3ZCiRwT*7iD|;!3JP75cv~0W{q&|HDc7TWt2~4Q>23~6=0UO
zCrNtH-Xt37(q-jEMpfHkJunN11Iz#vz|_LthLn{mxt!9PG#%?1EB}gQ1@6w)^NR&i
z$pw9!F-LCjgpmxOKM(=HYDhf*bw@zEKzX2Twg~yx4UxPnH6Iilj2b{2Gcs%9As@*6
z4GG5_u9xnFRnx$u6LY1<3zZGh#6(qrwi=O|2ls(2!1*WA5er~XgURFIX|Q6svOr2n
zP&H_OtW7#IQ#nu>-iz@k(4huY)ywXEZyIWKH6|RLevOi01895nma{#r>~@caL@R;z
zw;@1XLaHJ)ROv6VWqO?^2dujLwPkFq?@M3sCN{MW=XMjHBbtLgcnP%q6$;jo8}j*_
zmO&<XCr<4%UucBdukdLW6q8_Z>afRq4Q>NpfM6#mc#^56AZ`{z;3)W7&5gxZyj5?Y
z0{9RG6qdi>`gdP(7^w$ZJ3;Er(jF<6=(e(ezr2}y=N_uE`W1D+YoNi1GdT0Pd1nPY
z0jhzfuD*ufgKCSovMG~2z!D%07z9`Wa$pLO4vYY7oq%vmfE{p!>(&Dw0Pin*umBF=
s8{qpF)B}j2{j7fIxbkl?hv$FI57^T_`K<xMWB>pF07*qoM6N<$g7?U0J^%m!
diff --git a/html/images/rightarrow.png b/html/images/rightarrow.png
deleted file mode 100644
index dfac4c15d262b5c5367196be35796c0b9e391a45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3k(1N3k(52KqANh000McNliru(+Ua}4?9y!7R>+v0_;gd
zK~#9!eUr^k9CaASKfmA1?9Sq_+uc&SlnSIpS8K4ArqR$Qnx2euvh5i?5L*)y4~CP6
zUi=4)@v^bTL`jWC54MLIO$hPQ78aYPLWNaWHY}8`yF0MsypM;G^(E>zc@EFZ=Q%vz
zJc57G=%qV4gr|tYVTc5TWi{BjeVnUSu~_`utoR3LfOrQ*yC@Us%%fS4F3sou1D()m
zwnSikrUs37pXQ6o-XifAIFFDs2YdGyCeCI!^Q1z$O98;~B1$V3SH9b2dG*1=RIqvB
zSoGCQu~>{3j9&V|K*+h#V}}ZFjq7x$Q~+)+`v5%qSe$!7$cHx?+_<$>H=M<hf-+N!
zJ4BZc_VyHBeL=%<!Es~o!s$l<n4WF(L|;7l%2=AU?Qs83W$Q8_Zz`h~=X8|h^tm$`
zJ>3PC6LcbLsB|S2Mg|jnbH_mn56ce8q<rSfQ6X@5KT&~G3EjwKQvoX*5v||;yz6|~
z<lN~rg?^2Rv)z1fy~(w^DNHAeOh$(39vxGG;hZ7aHhspQJ3ygd<G=LA%llY-2n(wq
zH60<<VF?H~P^i?E|Ajkl4S^7`eS%1;5SCk3#8SP7w?7RT84w+J!w{Ysf)j%=ys!oz
z&4Mby_8k(TRaMns=eF-OTT<jR_o@;1su2LTuP|~LUVA=<@2*EoO^2j3kbr47+PPq9
zK_2I-B?9Y;bT%1Co1J((*WkU07+$V<ynn69k$omZ858MjqWRlj_o{0fN~u(0;Kcb`
zyLNbfut&)qNJkh+A0z2=B%h?!4*2-ndZ*^v7WaSIs`h!aQ-*A=C;%^=OxcaF|9a(D
zW!%tZ_Ha*<R6?>?v01Fx=$as@!fLI}{8GKz=Y9WrUM|l8mI6>Jm3Z-_(P(+ypRYI6
z?w>c^g6+5o+Y4##x~$fAxcOtNy;0lxGVje!{Q;YuU)a;+<Rn01-GAzksT>^>QXLjV
pQiN7D7c4FGs%slS9dP%)@ps6DN>%|<K;ZxY002ovPDHLkV1kpHk<9=A
diff --git a/html/images/lists/submit.png b/html/themes/default/icons/16/actions/submit.png
similarity index 100%
rename from html/images/lists/submit.png
rename to html/themes/default/icons/16/actions/submit.png
diff --git a/html/images/lists/search-subtree.png b/html/themes/default/icons/16/apps/ldap.png
similarity index 100%
rename from html/images/lists/search-subtree.png
rename to html/themes/default/icons/16/apps/ldap.png
diff --git a/html/images/rocket.png b/html/themes/default/icons/16/types/action.png
similarity index 100%
rename from html/images/rocket.png
rename to html/themes/default/icons/16/types/action.png
diff --git a/ihtml/themes/default/simple-filter.tpl b/ihtml/themes/default/simple-filter.tpl
index 20f991908..643f1cd20 100644
--- a/ihtml/themes/default/simple-filter.tpl
+++ b/ihtml/themes/default/simple-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" class="center" alt="[F]"> {t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/include/class_IconTheme.inc b/include/class_IconTheme.inc
index 7879e58da..2c78a1cc4 100644
--- a/include/class_IconTheme.inc
+++ b/include/class_IconTheme.inc
@@ -240,13 +240,13 @@ class IconTheme
'applications/office-calendar' => array(
array('mimetypes','x-office-calendar'),
),
- 'applications/os-linux' => array(
+ 'applications/os-linux' => array(
array('applications','linux'),
),
- 'applications/os-windows' => array(
+ 'applications/os-windows' => array(
array('applications','windows'),
),
- 'applications/samba' => array(
+ 'applications/samba' => array(
array('applications','os-windows'),
array('applications','windows'),
),
@@ -264,79 +264,82 @@ class IconTheme
'actions/application-exit' => array(
array('actions','system-log-out'),
),
- 'actions/document-export' => array(
+ 'actions/document-export' => array(
array('actions','document-send'),
),
- 'actions/download' => array(
+ 'actions/download' => array(
array('actions','document-save'),
),
'actions/document-restore' => array(
array('actions','document-import'),
array('actions','document-open'),
),
- 'actions/document-edit' => array(
+ 'actions/document-edit' => array(
array('actions','edit'),
array('applications','text-editor'),
array('applications','accessories-text-editor'),
array('actions','document-open'),
),
- 'actions/snapshot' => array(
+ 'actions/snapshot' => array(
array('actions','document-save'),
),
- 'actions/system-reboot' => array(
+ 'actions/system-reboot' => array(
array('actions','view-refresh'),
),
- 'actions/system-update' => array(
+ 'actions/system-update' => array(
array('applications','system-software-update'),
),
- 'actions/system-reinstall' => array(
+ 'actions/system-reinstall' => array(
array('applications','system-installer'),
),
- 'actions/up' => array(
+ 'actions/up' => array(
array('actions','go-up'),
array('actions','arrow-up'),
),
- 'actions/down' => array(
+ 'actions/down' => array(
array('actions','go-down'),
array('actions','arrow-down'),
),
- 'actions/previous' => array(
+ 'actions/previous' => array(
array('actions','go-previous'),
array('actions','arrow-left'),
),
- 'actions/next' => array(
+ 'actions/next' => array(
array('actions','go-next'),
array('actions','arrow-right'),
),
- 'categories/settings' => array(
+ 'actions/submit' => array(
+ array('actions','go-jump'),
+ ),
+ 'categories/settings' => array(
array('categories','gnome-settings'),
array('categories','preferences-other'),
array('categories','preferences-system'),
),
- 'categories/checks' => array(
+ 'categories/checks' => array(
array('actions','view-task'),
array('actions','view-calendar-tasks'),
array('actions','checkbox'),
array('status','task-complete'),
),
- 'devices/server' => array(
+ 'devices/server' => array(
array('places','server'),
array('places','network-server'),
),
- 'devices/media-cdrom' => array(
+ 'devices/media-cdrom' => array(
array('devices','media-optical'),
),
- 'devices/terminal' => array(
+ 'devices/terminal' => array(
array('applications','utilities-terminal'),
),
'devices/computer-windows' => array(
array('applications','os-windows'),
array('applications','windows'),
),
- 'status/object-locked' => array(
+ 'status/object-locked' => array(
array('status','changes-prevent'),
),
- 'status/object-unlocked' => array(
+ 'status/object-unlocked' => array(
array('status','changes-allow'),
),
);
diff --git a/include/class_baseSelector.inc b/include/class_baseSelector.inc
index d3e779cc3..c2e8ed3e8 100644
--- a/include/class_baseSelector.inc
+++ b/include/class_baseSelector.inc
@@ -254,7 +254,7 @@ class baseSelector {
// Draw submitter if required
if ($this->submitButton) {
- $this->tree .= " <input class='center' type='image' src='images/lists/submit.png' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
+ $this->tree .= " <input class='center' type='image' src='geticon.php?context=actions&icon=submit&size=16' title='"._("Submit")."' name='submit_base_".$this->pid."' id='submit_base_".$this->pid."' alt='"._("Submit")."'>";
}
$this->tree .= "<input type='submit' style='display:none' name='submit_tree_base_".$this->pid."' id='submit_tree_base_".$this->pid."'>";
$this->tree .= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";
diff --git a/include/select/groupSelect/group-filter.tpl b/include/select/groupSelect/group-filter.tpl
index af5fdd80b..3b17067c9 100644
--- a/include/select/groupSelect/group-filter.tpl
+++ b/include/select/groupSelect/group-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/admin/ogroups/ogroup-filter.tpl b/plugins/admin/ogroups/ogroup-filter.tpl
index 33fcea420..85ca566bc 100644
--- a/plugins/admin/ogroups/ogroup-filter.tpl
+++ b/plugins/admin/ogroups/ogroup-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" alt="[F]"/>{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index 308323e48..172871e14 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -1,6 +1,6 @@
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" alt="[F]"/>{t}Filter{/t}
+ {t}Filter{/t}
</p>
</div>
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c6fad35e4..c9ed07d35 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -262,7 +262,7 @@ class user extends simplePlugin
),
'account' => array(
'name' => _('Account information'),
- 'icon' => 'images/lists/search-subtree.png',
+ 'icon' => 'geticon.php?context=applications&icon=ldap&size=16',
'attrs' => array(
new BaseSelectorAttribute (get_ou("userRDN")),
new UidAttribute (
--
GitLab