From c59442a576c646c8a344d722f5c6361e45852e04 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 29 Feb 2016 13:45:44 +0000 Subject: [PATCH] detect which type (gif, png or svg) of tree images are available by template --- mail/inc/class.mail_tree.inc.php | 37 ++++++++++++++++++++-------- pixelegg/images/dhtmlxtree/leaf.gif | Bin 1636 -> 0 bytes pixelegg/images/dhtmlxtree/leaf.png | Bin 0 -> 667 bytes 3 files changed, 27 insertions(+), 10 deletions(-) delete mode 100755 pixelegg/images/dhtmlxtree/leaf.gif create mode 100644 pixelegg/images/dhtmlxtree/leaf.png diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php index 37b0e6ab94..e81b04f5bc 100644 --- a/mail/inc/class.mail_tree.inc.php +++ b/mail/inc/class.mail_tree.inc.php @@ -38,13 +38,13 @@ class mail_tree * @var array */ static $leafImages = array( - 'folderNoSelectClosed' => "folderNoSelectClosed.png", - 'folderNoSelectOpen' => "folderNoSelectOpen.png", - 'folderOpen' => "folderOpen.png", - 'folderClosed' => "MailFolderClosed.png", - 'folderLeaf' => "MailFolderPlain.png", - 'folderHome' => "kfm_home.png", - 'folderAccount' => "thunderbird.png", + 'folderNoSelectClosed' => "folderNoSelectClosed", + 'folderNoSelectOpen' => "folderNoSelectOpen", + 'folderOpen' => "folderOpen", + 'folderClosed' => "MailFolderClosed", + 'folderLeaf' => "MailFolderPlain", + 'folderHome' => "kfm_home", + 'folderAccount' => "thunderbird", ); /** @@ -52,8 +52,18 @@ class mail_tree * * @param object $mail_ui */ - function __construct($mail_ui) { + function __construct($mail_ui) + { $this->ui = $mail_ui; + + // check images available in png or svg + foreach(self::$leafImages as &$image) + { + if (strpos($image, '.') === false) + { + $image = basename($img=common::image('mail', 'dhtmlxtree/'.$image)); + } + } } /** @@ -73,7 +83,7 @@ class mail_tree 'text' => $_err, 'tooltip' => $_err, 'im0' => self::$leafImages["folderNoSelectClosed"], - 'im1' => self::$leafImages["folderNoSelectOpen.gif"], + 'im1' => self::$leafImages["folderNoSelectOpen"], 'im2' => self::$leafImages["folderNoSelectClosed"], 'path'=> $_path, 'parent' => $_parent @@ -371,7 +381,14 @@ class mail_tree if ($createMissingParents) { unset($item); - $item = array('id' => $parent.$component, 'text' => $component, 'im0' => "folderNoSelectClosed.gif",'im1' => "folderNoSelectOpen.gif",'im2' => "folderNoSelectClosed.gif",'tooltip' => lang('no access')); + $item = array( + 'id' => $parent.$component, + 'text' => $component, + 'im0' => self::$leafImages["folderNoSelectClosed"], + 'im1' => self::$leafImages["folderNoSelectOpen"], + 'im2' => self::$leafImages["folderNoSelectClosed"], + 'tooltip' => lang('no access') + ); $insert['item'][] =& $item; $insert =& $item; } diff --git a/pixelegg/images/dhtmlxtree/leaf.gif b/pixelegg/images/dhtmlxtree/leaf.gif deleted file mode 100755 index 8561388bdf912b2ff36b63095b55faccc6c0a11e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1636 zcmbVMd0dla9Dfy52u)Pf#FUp&DlqmQ+urScVYuVn*an-EjhldX+pA32-nVVQq%alI zqysU$k`j+ZMWGB&%9HYzv?$G^GSAegyu0ijg7t^_N6+W|ywCOh-QVAnq|-=o3Isr) z69bx?o72+La&vRDva&1|OLlg4Mn*cgKW@e_Rr_1H?{QP{W zRH{;`38*=&xDjg`q{iHV8H$;n2eQ7jfmM@P4}w<{D1yTt<;U2VH~pu;ZXWrz*1fmP9k4sE%cHkTVMw(=qy zZs$!*1QUFO&&fJzF9rIX#V!xwlkq4!W2Fgh?LUTiU^m2DB;zUk7ogv!igDARSRjnE z!3Y9km;e!pF%02@D2$*G%zaoKA|k{Xfl9!h!Q-sC?Nf+UQqyCL+sSx^UN1{PP+3`- zpiC%W+*2V0$8o<76piB$ah~ZeFXfAKd7^qXkhI6PqKmr@%gnSeWAp#h3I{k5VqdneK`X4tQi}qNivow@SdzccpjppD{y~14X zo@~euOBQuoJLQ%4Ja^f+Z-7NfAT}ONDA2!IctH zsKHT5ua3vbDlra^qL@Y~)gXu(#g&*?N~$Fyl+>s>CiTkdTplmwveCVE9h_YWhT>uc z0&9d4@;_w>m7Au#jN8I6#k~wL6*6ANQ^>HO%8Y>%43y2`@*hO|3-mBvl6E^vX}iYF zIKl1=6OPAtppb}!xB^!rNKfP_svt=*tii;HQjIHlJ+k)ylQoEQ2J+M6Uv%j`;yCDE zJ|aK2dDK3%i|ZLT*BpHw{PpJ_zyEgs-rYO5Z{7U$m!G?Sx^ey5k5{i;zI5@z59h!C z?%Q)`&z%0|)XA^E>iqJH6URUAICk{N;X?-x?Emc3_I-Qz?B2EWlaJeWY~QwZ%jVXP zHhuU(OY_DJP3zaKZCvyI>QyUOG%SDb-TGzkEM2mA(Zag77u3$LdF#zLUay|_+T1y> zR#ncPHS?7j6)(S3KHXPVTH^J%Ut}4Vv$$xQqj2gJ+HSK_1^Ia|px09~%=rVf?t~pNrx}f)QiKJUcpk z)H5ST3=bPNbV%snrw0uTc`7()K>vP$0e$-bK;->E?vDX{|2yP=HG%#Q|D8jz$AEISxJK8Unccd+VkctwIKnXquA4Af)f%BS()N8?&E0*wNW}ydiqv=`&}~or^tT7~b#VrOQ{Y zj5}|>aJB2|wT9sVx9{A&cQ5KX2Hd(2+`JJWUNvh^Wzev333~?1g9AdN^!3tOa^KuA zVQOoTeokc#sHzS-wQ@xjFu}Y&cl*#v-6ELU5mP@>!eUQLTlO c2M<#7GY_?{GdF5$msG27TNXCyX9Ga|-}L)Ip#T5? diff --git a/pixelegg/images/dhtmlxtree/leaf.png b/pixelegg/images/dhtmlxtree/leaf.png new file mode 100644 index 0000000000000000000000000000000000000000..821f0f241eca73728692b4e066d228097ea38b0b GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^2|!%R!3HEZHa`&nQk(@Ik;M!QddeWoSh3W;3@9jB z;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$HzlhJk@e!_&nvq~g|_yYYU)jxq;6 zUj2}l&tQH)x@0e-`GObS^>JU=Dwrz`>;zwN9uN-5-*C?%|H3?n`q@`joE3Sw%Q$=2 z{Cp$L5^u%NoW^g1F0uR1-~T7Bck}k?^7rQd|MTQ#cX(;c9ksmeU4h4QXUo_hIqX&c zI(2kO56uM5CHc>I&Xn=! zocM3E--el|W%obH?uqP~&2lI7PW)B&Ce;^xNlno$WhZ}5vbdvkhT(~O#4{I$3;c&< z94uS>I}b096=ZnRA@Eqm?#~TzriMI$&HDrxo;YSC`7lgz+~FZ(6=$D4kKsiB2P?gE zyObDSuqWOVWpt2iNxMBWgrQO(OuC(KweIrGj87a_2y>j=ugP$t`NAD>#sdW$>I`kJ zJMzviVbW+W2w4iETQ+BbwVLto1{ES&^eUp37{aa+ZpOKlJ;lPf~?0;6(?)b6f z!}l1bAD;tH9TH06pJ2PdXY;=Jmv>U{OBx?|SQXLqhH(?SNQT{!!)JPL*``~0HSGJh z_-TBX@BbR%13(Q73JeS^3=IqnzzAnzaA08IU|?XROpsw2FquHiNGMr)&+~nK#q8^~ vYxnUVSXsG=g)v~K?Ssvk5^J8dGcYr}