From 65e0f18449735f2766ef653ce2826bf5039bec05 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 8 Jul 2012 15:50:27 +0200 Subject: [PATCH] Fix: view image object --- htdocs/admin/workflow.php | 43 ++++++++++-------- htdocs/theme/amarok/img/object_invoice.png | Bin 0 -> 3256 bytes htdocs/theme/auguria/img/object_invoice.png | Bin 0 -> 394 bytes .../theme/bureau2crea/img/object_invoice.png | Bin 0 -> 1591 bytes htdocs/theme/cameleo/img/object_invoice.png | Bin 0 -> 1591 bytes htdocs/theme/eldy/img/object_invoice.png | Bin 0 -> 394 bytes 6 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 htdocs/theme/amarok/img/object_invoice.png create mode 100755 htdocs/theme/auguria/img/object_invoice.png create mode 100644 htdocs/theme/bureau2crea/img/object_invoice.png create mode 100644 htdocs/theme/cameleo/img/object_invoice.png create mode 100644 htdocs/theme/eldy/img/object_invoice.png diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 412eff9395b..3a660ee7f08 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -106,7 +106,7 @@ foreach($workflow as $child => $parents) { foreach($actions as $action) { - $workflowcodes[$action] = $action; + $workflowcodes[$child][] = $action; } } } @@ -115,33 +115,36 @@ foreach($workflow as $child => $parents) if (count($workflowcodes) > 0) { - foreach($workflowcodes as $code) + foreach($workflowcodes as $key => $actions) { - $var = !$var; - print "\n"; - print "".$langs->trans('desc'.$code)."\n"; - print ''; - if ($conf->use_javascript_ajax) + foreach($actions as $action) { - print ajax_constantonoff($code); - } - else - { - if (! empty($conf->global->$code)) + $var = !$var; + print "\n"; + print "".img_object('', $key).$langs->trans('desc'.$action)."\n"; + print ''; + if ($conf->use_javascript_ajax) { - print ''; - print img_picto($langs->trans("Activated"),'switch_on'); - print ''; + print ajax_constantonoff($action); } else { - print ''; - print img_picto($langs->trans("Disabled"),'switch_off'); - print ''; + if (! empty($conf->global->$action)) + { + print ''; + print img_picto($langs->trans("Activated"),'switch_on'); + print ''; + } + else + { + print ''; + print img_picto($langs->trans("Disabled"),'switch_off'); + print ''; + } } + print ''; + print ''; } - print ''; - print ''; } } else diff --git a/htdocs/theme/amarok/img/object_invoice.png b/htdocs/theme/amarok/img/object_invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..a9095ae91da010b3cbc91e813f46fa300cda39ee GIT binary patch literal 3256 zcmV;p3`g^cP)4Tx07!}LnP*T_X%~Rcy*E7}p@bTU0fKZ0MQMU`kRmQk0*HhV5TwKa3W_LV z0c;4C1slk&1y->Giqb3yE{h_H9kDI8wHHMBE-=o{eDm$E{rTn0oO_;m?|sXCe?2n? zfU{pDm8PHokeZe$3-)p6MF=B#6_${d# zfP*IhR{i%_oEAVmzMdxa?=k*909FLR$>o2Kz3U&pPehH9kzivzK7`Qg0f<{iN8il` zAR7aGyD>WYwSIK;+g^N+TL3K|#aXh26Y~jU4j9!&)eTEl>fw;TJdnhu|pGLld;Z1?Ykv=!07@0FU7ryoL|( z6+sX(!a$S}4TOsrAf|{FVvo2WUWh*uj0llfBmqf9vXES)04YXFk#eL8*^eAX8ju#G z1L;BfkpW}~d4mk2C`w1!s5WYVTA+5QE9!@apwVaoDn)b90(3pP4Xr|J(GzGh+KFC6 z@1xJq_vk1_!&EUIW{TNi?pPou#3Yy$%f$+@%~&P&8`g-O$F5@cu;C*%@}2|p9|5{?tv2v-RA39kqvL^@H6XhgIl`Vhm35@IHCC9#ZHO*}?y zC-xE_65o+95}U*)O(A)a!bypwY*G=af>cX7L+U0CklvCpvMSk->_846$B?Du0`gY! ze)4H@H~9hiJ%vKyP%J6#lyFKiC67`{*-JS^>83oSe4;X_y40yue`+i>i&{*rq@JL5 zQ3t3WX$+bk&4Cs~lhAT$rL+UI7TOKkD>{*`L${^-)5Y{9^fG!ay`6rW{*J+5@EOjG za7G$q4Wo*2iqXq>sX$WTDL5*GDx@hCD(q2cQn;b;hRI+WGToVTnAyxSW*xJW`GkeC zxGYCjI7`Obz^Y|+upTKQid;n}#R$cPie-vN6uT8)DAAORl)RPVl?s%qlvmgYx;XE&IoclDDcYO0&uBl< zVd~iF#Of659MieWC2H&KkWo)-w(>USr&7{K90CNwCQ(lLnLL zrd-ot)77S@OkbJlnT4Abn>CxgH#atqF)uUkF#l#@W07RB%i@|P-O|l+k>w%FM*@x@ zSWqNr6@0c5SS4ERwz^@>vi7xJZrx!0#>T`(Y_r3r&z5EDYrDd>$@b$E!Ib1FzfQS7 zRcmV4)RL)Pb|gD@yF9x_yASqO_Nn$Y_D>x29bz4JI^1$pcMNqbb^OCg!O7pL$m!xV z(lpO$1=HG`5ocHDWzNmc-(6f>@?6fke4jpj`m*UQuHfqCy2ACG8_~_jtuy#GoTVUuSvE z+BoaxPyCU#xABP=GI)Zxp{MY zV)bG(V=sy{MJb}@IORA=T%(vFjujt|r^H9cACV9xk&?OuLV_@%E|HKJnRs{}XOXvrV&$vY+O7T#h3lQ*=}>y7W$T~EdyKqww~C=+qQPw zr=R0~?k;yM-&>(vkyr72`|R!Kc3AD$y_2ysXXn#hVY}LQTkWo_WK}M$d{Gru)wRcQ zPffK}b#e9ZFUh~${x#s&ro9$>ckff&w_@M>{gVCt2mB5+)mYZ-sa35lto{01`fm>p zh9B%YH2u)AI-|Oshm{VmIXrS?!I7s&=N#=lHse_H@u|lTp5UL@ep2~lQ9V+hQ~#zR zso_CmWaHIS{-@5Jb~#<&BxtHR!#}g@tmfIWW@d9y3!!CM%W&($);DdbZA0w|?Stp$ zp1X5ic>el@kPBBX&b)ZJ!>{AgC7(+dI=wp2b$N8PU3S0R`n%ijt=;b3ZGU+D(ca_P zbK#25m5!@^S1VExz%fR^u0S|fyBL@c`CO>@pXz^q8@!BUUPj);tcv|# zb)Pw(YrZ&qxil;s{_|`02xX-FoAI|(-~GSe8BLSBfZPS-E+BUSxeLf$K<)x^7m&Mv z+y&$=Aa?<|3&>qS?gIb6E+7@jMB^%e;fW?B0KDA?pdbWL=>ec)|MvYvA7!FrG0_tm zC-^6x=(UW80HC@BAaprE0A9=SIvG!vE5Ix~LtO#2vH6h`eVOr~hvcM*14S8`650Q1 zFa5hnP09MP&sd9$AxR4h!7Ce2qXe0E@DGL%$bmH6ngT%t8ITDQkWKW6#v;HRpU(Al zvlg^ErR)Cp9+{Ht@jLTKm*&Wl66a;|+@#VJi5YK3n%KgOXDzT2z<&S^sy4pLf#qZX z00J0EL_t(Ijg68!PgGG9g};5dIy^#4U{DkcQ9uoi1Z$kspAG2?cgi z7%hyIEro?4{s9GfI0KlOAuynZ#EHNK=AN^+1#?Hppz%~YJL|0Tt(7BY2Eg6%@f)E? z8~-?NZ*S_w$jH~jyD%BlTl(39`xCKxoGMNgZw3ecWEQi$p89a_&e)i|8XjIw?ghzU z>O@UZ=TPT}%VqX=_lR~QcA_1kDB|U#hZC4xyEQu6U1Q+PM1W7344<=E*1!K?wYWx| z1c(TwQi(T{lU(oZeLg+6aI+?Yi{l^=;Ywd0YKEENRM~e999$h7#LQ@FY+`a|=4Xw8 z_g+MV+qo2G;Jio8a6UxUaO&}DyuEm!tu=5?0G>1#>27O1=+0naWsUP49e5SKWq zs@kIwRD-0DrHu{LdsK~vREkVt1+N}}IuV>|P-_s!L1KF$oyGt&W4=(}Qs-F=m|0#X z4C-)kTx$?lIsnM7uU82gQ}xW{3sr(J5aQ!HuyVQT+SA?+W*9J=&vUt}69cA~mIy?S zX#Ws67bFCkVzElll&WVom#-2?MSFY%pr<{JRbE$MKA)%mTo(p>TwElOzeI?(w?lx0 z0y6^O@vl?pbh+{mPV@ed79bRn2B5ihXegB|MFd2^jCcJfj}VCn-!?Z>BGLkEg+K$) qvbnliIx#Ttl>a$fTP2_caK8Z)uQp=4>Df;J0000t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0CP!1K~xCWP0HI6f-nq4(NJtPHeM#9MnJ`Q2ekkHc|Jf3`)$oR0Dy=n5MT&Z z_1tNgP}`q|Y-H1R-;vMPTRw@#(xa3}q?=si9_dMZU0nw*nVD^Mn$jJMbmpC}_lLN8 oqSbn{?P*Ltv(C*IJ+lc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Op^1~Bxw)mev$>_Ap^KZ7ql=NVqlKlDk)^YR zp|LqkuSMv>2~2MaLa!rEy`ZF!TL84#CABECEH%ZgC_h&L>}9J=Y;G|yH*s+` zH^XTjRBsAyw^-oRs}FRHJ}6?5A{r(HOg$hbJlO&{@Pwb52Tbinz+`=5+t$+z3{0y% zT^vIyZj}VbdjuDX{Cj8i-CSbHjH_+YS+n0JTE2g#cS%Uvl3Vb%`vvFo6Zvf=J^jCm zsJvM@ormq)h1vXjJNX^GG=z38Ej}yx=svHy-t(`!s<)S>o!PUwu3*QV;=1S7&ujL- zH#nLkDA&(^ysxWfe$mdDV7vM8>fTx+U8TKllS5X9$ZOa|@3XMA|{mHH(1j#>)>24m|%X`%`Hm2U8=1)4~a< zIXQ274<_sg@6*&`T=BKx_S=+$dwg#&nOWQp4r^TOJv0rDL`3n~=ED&c| z_?U%ZYyI7qCI3{n1h^>j^Yq)hC6$ZZ-ksTDDJU&1tzdL`Dg)2iYX>VWQ}~TM-sdL^#p>0qr!O%FiXZ*_JvM=7b%xQmLqX+& zhYs3_iHSKJ(h9wA$CsemkiBNM?VrjUKbe*nnNDv$p=mttS=cCI!S_=81c-anq)zr%zKgrk>KADWn{zk)-r>6&OwATQzm)yvll6t{FB4P*KUT<8S69!rnwuBK=Fq}&(rxj@jC>23chZuQ znVX|@XO*2}5BJutOEor->Wzqs(wg|UIcUkLScSTelS3qQBxAFBj*IVp{(Nz5NUw5X zX5_S^ckak&{Cm5jY)1W>;-_VC3bl6>cDtU`oAsY>=ke3lpQ0NW8Ln9>o!dFvXAh_- N_jL7hS?83{1OUJmUn~Fs literal 0 HcmV?d00001 diff --git a/htdocs/theme/cameleo/img/object_invoice.png b/htdocs/theme/cameleo/img/object_invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..e1cb50de2e6939512f9c66f78db7c6f4b6848a63 GIT binary patch literal 1591 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Op^1~Bxw)mev$>_Ap^KZ7ql=NVqlKlDk)^YR zp|LqkuSMv>2~2MaLa!rEy`ZF!TL84#CABECEH%ZgC_h&L>}9J=Y;G|yH*s+` zH^XTjRBsAyw^-oRs}FRHJ}6?5A{r(HOg$hbJlO&{@Pwb52Tbinz+`=5+t$+z3{0y% zT^vIyZj}VbdjuDX{Cj8i-CSbHjH_+YS+n0JTE2g#cS%Uvl3Vb%`vvFo6Zvf=J^jCm zsJvM@ormq)h1vXjJNX^GG=z38Ej}yx=svHy-t(`!s<)S>o!PUwu3*QV;=1S7&ujL- zH#nLkDA&(^ysxWfe$mdDV7vM8>fTx+U8TKllS5X9$ZOa|@3XMA|{mHH(1j#>)>24m|%X`%`Hm2U8=1)4~a< zIXQ274<_sg@6*&`T=BKx_S=+$dwg#&nOWQp4r^TOJv0rDL`3n~=ED&c| z_?U%ZYyI7qCI3{n1h^>j^Yq)hC6$ZZ-ksTDDJU&1tzdL`Dg)2iYX>VWQ}~TM-sdL^#p>0qr!O%FiXZ*_JvM=7b%xQmLqX+& zhYs3_iHSKJ(h9wA$CsemkiBNM?VrjUKbe*nnNDv$p=mttS=cCI!S_=81c-anq)zr%zKgrk>KADWn{zk)-r>6&OwATQzm)yvll6t{FB4P*KUT<8S69!rnwuBK=Fq}&(rxj@jC>23chZuQ znVX|@XO*2}5BJutOEor->Wzqs(wg|UIcUkLScSTelS3qQBxAFBj*IVp{(Nz5NUw5X zX5_S^ckak&{Cm5jY)1W>;-_VC3bl6>cDtU`oAsY>=ke3lpQ0NW8Ln9>o!dFvXAh_- N_jL7hS?83{1OUJmUn~Fs literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/object_invoice.png b/htdocs/theme/eldy/img/object_invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..b4022e77740bb96770f8fee065c58284e3518c45 GIT binary patch literal 394 zcmV;50d@X~P)t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0CP!1K~xCWP0HI6f-nq4(NJtPHeM#9MnJ`Q2ekkHc|Jf3`)$oR0Dy=n5MT&Z z_1tNgP}`q|Y-H1R-;vMPTRw@#(xa3}q?=si9_dMZU0nw*nVD^Mn$jJMbmpC}_lLN8 oqSbn{?P*Ltv(C*IJ+l