From ea04a556caee93ab6628d269d69cf9e96151dfcb Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 6 Mar 2014 18:33:27 +0000 Subject: [PATCH] added a couple more default icons similar to et2_button, and fixed actions with just a caption string where not working with toolbar --- phpgwapi/js/egw_action/egw_action.js | 17 ++++++++++++++--- phpgwapi/templates/idots/images/back.png | Bin 0 -> 862 bytes phpgwapi/templates/idots/images/continue.png | Bin 0 -> 835 bytes 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100755 phpgwapi/templates/idots/images/back.png create mode 100755 phpgwapi/templates/idots/images/continue.png diff --git a/phpgwapi/js/egw_action/egw_action.js b/phpgwapi/js/egw_action/egw_action.js index c8159e5dc2..90f1f08c24 100644 --- a/phpgwapi/js/egw_action/egw_action.js +++ b/phpgwapi/js/egw_action/egw_action.js @@ -344,7 +344,16 @@ egwAction.prototype.defaultIcons = { copy: 'copy', move: 'move', cut: 'cut', - paste: 'editpaste' + paste: 'editpaste', + save: 'save', + apply: 'apply', + cancel: 'cancel', + 'continue': 'continue', + next: 'continue', + finish: 'finish', + back: 'back', + previous: 'back', + close: 'close' }; /** @@ -368,8 +377,10 @@ egwAction.prototype.updateActions = function(_actions, _app) { var elem = _actions[i]; - if (typeof elem == "string") elem = { caption: elem }; - + if (typeof elem == "string") + { + _actions[i] = elem = { caption: elem }; + } if (typeof elem == "object") { // use attr name as id, if none given diff --git a/phpgwapi/templates/idots/images/back.png b/phpgwapi/templates/idots/images/back.png new file mode 100755 index 0000000000000000000000000000000000000000..f258c112f9ce54bfc898fa5e4a48b19a64f93a29 GIT binary patch literal 862 zcmV-k1EKthP)UmE}b0_#ac zK~#9!g_BKaTxA%ApYOYOX6}r4W;&BLGYO;#&0u1swVe{7wPaxzLe!OY;SW@V&}N~y zbm2k}3*C3+#emY53gV_NY*nlhp-tK(MQKOUke{Y@GR^d6?j)D_X6}!R(1ElCUwAh! z=bXhk?-4v>ietA72!;rQ0)zsBdEKv1OEfNure<}un zTCWM;{Z9AoFRxp#Ek7kt9J`fA$g8=|j)4=eraAh8Mk=8Jpjsi*cU{JR-C%C9vKIHt zZ~yt#$knz$actH^$Q#AI-20C-eyu~u*4Dt~Jm0qMBM&G~S^Z*H8^fuX2jrZaJ$ zhwA}GM7GIgyU8!pwYJI5rpJ%Bvp6b)jD@Dt>_4Idg{&!g=y>$*inYlA`An4ekL}tP z+u{B2(KjF?214ou35cezv0T+iB@O;>4)%c%TkZ=&sY5Vdb3;nios@opTsGvT-mP?J z7GY*-yTI%c=n@*9A{w|Wy6)GfJhfhvBA-UUrxydxyd&AaTX3)s#(#fI3emLyDZtRd zY1o@tzci!WpZ>PhedvSEWLzBX$p)ljimAB<&v)zWOlgc9fa|wyIuZ>shGK`Is5>^Q zcJGHha^ialp!@b0l}dR&8aU*W4f4qb7k*n~p{!UatM)CQY!D3`Dyt7xa^AJGK(+nK zuZ&*mZ$`SV94Mss4DL1&Vp~lJ!;sSQ2D5YaO1?F5GB55-SeE5%Lk)j;zRQjDex67? z_ikS4UU oUCH{TnNEG_U!ZDPR`W6bKd~t^+_O;n=Kufz07*qoM6N<$f)k{b)&Kwi literal 0 HcmV?d00001 diff --git a/phpgwapi/templates/idots/images/continue.png b/phpgwapi/templates/idots/images/continue.png new file mode 100755 index 0000000000000000000000000000000000000000..a9300537e9a2c2859d8e20b6dddbc040bfde0018 GIT binary patch literal 835 zcmV-J1HAl+P)*f?(pck8C7Y-5Tj~n$yVS*604wU@? zyBLVO+s)XO$5llgcqzTwWKdtEEd*vot5!Su0?sRawdNusa}k$|wSbobVreawBjS3D(5fjEm{o|3VF%t&^Nq#5u>(<1aX zIzqeOE8YI=SNrwlXACM+3nhe{Ef$`i`0&*XNA?>GBn<$(t%%?6yG&p2vAERyJE0rz z{qp(o*}g$#>P`wFZ&zLzo;dTSMLMAXC=8ka{B*a&{*feGI^^=zHdp7?S}E_|OFvJ4 z@X!Dlnml>FSS-Bt$#DyT#Pvd4FJz<;M;U_RV2t^C4?{@yjl{XXW+WRO(r;9ZYewbN zZ3`oQ<((rLYaj`(r~7==4cL{B6E`Kfv|@4f3GQY{CK2#kJ(|#d?^^{-#;jB(o6txM zidl2VmK$xKQZ_~|ZSvxtB-Jm#@v_Kxlydy>!wM+pQj&Ei;KXYM{tLVEao#-y)3YE= z3n5im0>ak@%PoWYL!bY{{1OPUy?sF>6@>MU8&PZJIsFxYCIZ4p;02P4C*a`dw)o?( zVPP4Rgw4Ps7P>1^>FzD)Z?4@JU-+TRlimhngASt^2kA91gY}t$da$Yhlx~08Y|6LC^7-*xCf1+# z%O6_+I9;Dodb{?hFTyxL4Wb(Q9M~ku4U^))KM%QDh;Xn4=_DnIjd8ugp zdDpgW=b1DDRIAn4U%`Q4#~42>q$&#{DMEK8r)%>C^