From 3e5d6745597ab3a6a75e87a17c1f57cb444f9c83 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 29 Sep 2016 12:06:40 +0200 Subject: [PATCH] Implement fav_filter icon base on template --- api/js/etemplate/et2_widget_favorites.js | 2 +- api/templates/default/etemplate2.css | 12 ++++++------ api/templates/default/images/fav_filter.png | Bin 1640 -> 616 bytes pixelegg/css/mobile.css | 2 +- pixelegg/css/pixelegg.css | 2 +- pixelegg/images/fav_filter.png | Bin 0 -> 1640 bytes pixelegg/less/etemplate2.less | 2 +- pixelegg/mobile/fw_mobile.css | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) mode change 100755 => 100644 api/templates/default/images/fav_filter.png create mode 100644 pixelegg/images/fav_filter.png diff --git a/api/js/etemplate/et2_widget_favorites.js b/api/js/etemplate/et2_widget_favorites.js index e59cd274c3..8609145b93 100644 --- a/api/js/etemplate/et2_widget_favorites.js +++ b/api/js/etemplate/et2_widget_favorites.js @@ -71,7 +71,7 @@ var et2_favorites = (function(){ "use strict"; return et2_dropdown_button.extend id: {"default": "favorite"}, label: {"default": ""}, label_updates: { "default": false}, - image: {"default": "api/fav_filter"}, + image: {"default": this.egw().image('fav_filter')}, statustext: {"default": "Favorite queries", "type": "string"} }, diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css index 739cc2c744..85993c600c 100644 --- a/api/templates/default/etemplate2.css +++ b/api/templates/default/etemplate2.css @@ -1521,12 +1521,12 @@ div.message.floating { display: inline-block; } .favorites .sideboxstar { - height: 9px; - display: inline-block; - padding: 0px 4px; - margin: -2px 5px; - /* TODO: This is template specific */ - background-image: url(images/bullet.png); + height: 9px; + display: inline-block; + padding: 0px 4px; + margin: -2px 5px; + background-image: url(images/fav_filter.png); + background-size: 9px 9px; } .sidebox-favorites ul.favorites { width: 99%; diff --git a/api/templates/default/images/fav_filter.png b/api/templates/default/images/fav_filter.png old mode 100755 new mode 100644 index 3f3ecbefad330cf841868937a2b9527ff8d5a397..9cd1bf62fc3bb8e3fd3f776df4b05a7b0a81474c GIT binary patch delta 591 zcmV-V0CPl5v0dV zLj^*V^nex>47G66HV6V+g{#O2daY^^7*PRi3wzf{OW>fHiiU8d26ZeMH%@QpyE8Q0GpD~plr zU{b0{g`biJ7=MbRl=P5cd#pif4?(B|p&+Wh8S36FO61}dPg0ruf-`GkXTcgBV75P5 zi6#gr=`ps71U{*b6OH&&p!|zOA0U7NT)+cQ(5Z@y-~F63OKP{FC8N9tAij`amr4Uw zXIuBEO)iL9ey9>C2XK-$<4?v$Y_0YiTCB*+CChIA%zybVUg>vRL`IsH$7qvSy-o7* zJg)(U&#e$KcomA*!71_Bn>Ww+HdKC7Tjw>}=Gjmj_P$usquZiDz++>GBkR6$l|k$Gen<^6 zRGg!wgnF$SPD6Z;Yzm`HMZI*s|h doi_d}`~Wd*;8>ZOTyp>b002ovPDHLkV1jo55)c3Y literal 1640 zcmaJ>Yfuws6kUs=fjVX#*1 zFw#0x?3e&Wt1?bU9zLp2K~sx}(H37-P{Ba0qHS%&2mz9?-5_9plsk*pKTi1BUzHz$zzlUz7N43Su3I+luLV@3#t0ig;}z@S76<-jr+ zQWfOe;aC6&Agkr+Sh{p0Pl;$LkRL-aY4rpf0Ad9uJ*3QoF;D^LsC9g@v)M)l)ha$Y zjV+}~^&&V|y{-_2Qwx*j%ECM)S49@Yfw3kYA)tjZ2sCLmIs?zdCy(p$h`E28N(RRv zSRSAJI;nJN3MfKQ7-UnJF-jVp4stjYI*ZNW(4#>Hjn1Ibh?f&XXYtq^9%B_a@sNpV zs4AN$6DLi?B368IE{5rORI1Tvq!^hL1kIt+xm>PagTaU)5HW@V9R`_VbcQ993S!ux zMAdpsjp#tXBBVgJVSF-?>FXnC^;5Ds!$g^gf>BM7o=T_C{70GuN~Qk~)oQ2E222LO z$@f2n4e|m#OqIa~WE-j^8kfDqA4<;?p)iCYs2o8wlT}Q~MKHvWi|9d7DhFJVrq-zt zqhaMZUMl5DbOsF4DPf72PbL&7YPE`&z-BQ-!US;=N0>yXC$fb}G$EHOUQK6n7(ymp zJjoR!%57R$hfQ)-Z@7uma{X4&>WRo=7*&4)tCCPe3yvR|r=C8SglY9AxT@)M5lzdb z63I~gjr~`nC$|Xq_@`60B^Fc0hjoP8QNq^iXPrC>0B?0m#6r30zG4{11pyqd+nKp% z&)u`zts}d`1jWNw_H9_SARtsfI2uy9#^~g>;4g%KciGGPntttLW%XC{+e&bsQUya$ zm$5hN;`K~hdMT%O?6cVwY4uxOPk!$mws&-ljo44;R2=K58feS=QE;fl>>aj;VyCWr z*;8~iu4L?|k2SeXT|I3-^tqjmc|}8uR+wEwb(b0u$7*3;KtNekXKmf=(L29Aa68HI z5(tcW_56Wx%u!-yvgBzCH%QiXQ=%J+16fs{@7?Q)3SZt|l$_kLDkCEUsi|2?Wu8V+ zlF9evi>v+D57vx%eb;c@Ay{_kw8K&v(SRBAt#eiQsH^`vzIIb}E+G2G<8H|GlH$z! z3w=-OZarUPjE?xULz;0;ai^*TA7fZ6E27JS!lK|DC4RBB)faiMA@hRyap1yBr}D4e z?dE&JSU!*Ez|9A(=SvF)4(|@PSS*5!3uv3G?RaOQMx!Ck8yp-uJp0`gulr>Au>=m% z^Dy+)2hB&$_k6$0@>FKpnckS6TA)GyaNc;@guBA2&k{D#;y)^HRXoDmm)3X>G7NXi zGHvE>mmQ54IFf^zw`UPOfKB+=XR+sk`%-(m z=g;dd+joqfvzqmG{0`#iY+j;j}@0{5z77yR7T!lQYjw`9JKYSFM(YB+}`S7aQ zH~L|j)jEQI^-fe8pjFHdUr-cM=4lLD9CvH$3De3Ov);4quvhlobA?+1TZ#wQ&#*kS z#;Zw|#SyhX|B@!&wMYKal%2`vdcbWW&}`orsl?@IL3Vc-7iT@7S|_a G?feJJNUmi7 diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index 69f648c16c..d2c668c1de 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -790,7 +790,7 @@ height: 12px; margin-left: 5px; margin-right: 10px; - background-image: url(../../api/templates/default/images/fav_filter.png); + background-image: url(../images/fav_filter.png); background-size: 12px 12px; background-position: 0 0; background-repeat: no-repeat; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index f5dc61de05..82ef8c7601 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -779,7 +779,7 @@ height: 12px; margin-left: 5px; margin-right: 10px; - background-image: url(../../api/templates/default/images/fav_filter.png); + background-image: url(../images/fav_filter.png); background-size: 12px 12px; background-position: 0 0; background-repeat: no-repeat; diff --git a/pixelegg/images/fav_filter.png b/pixelegg/images/fav_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..3f3ecbefad330cf841868937a2b9527ff8d5a397 GIT binary patch literal 1640 zcmaJ>Yfuws6kUs=fjVX#*1 zFw#0x?3e&Wt1?bU9zLp2K~sx}(H37-P{Ba0qHS%&2mz9?-5_9plsk*pKTi1BUzHz$zzlUz7N43Su3I+luLV@3#t0ig;}z@S76<-jr+ zQWfOe;aC6&Agkr+Sh{p0Pl;$LkRL-aY4rpf0Ad9uJ*3QoF;D^LsC9g@v)M)l)ha$Y zjV+}~^&&V|y{-_2Qwx*j%ECM)S49@Yfw3kYA)tjZ2sCLmIs?zdCy(p$h`E28N(RRv zSRSAJI;nJN3MfKQ7-UnJF-jVp4stjYI*ZNW(4#>Hjn1Ibh?f&XXYtq^9%B_a@sNpV zs4AN$6DLi?B368IE{5rORI1Tvq!^hL1kIt+xm>PagTaU)5HW@V9R`_VbcQ993S!ux zMAdpsjp#tXBBVgJVSF-?>FXnC^;5Ds!$g^gf>BM7o=T_C{70GuN~Qk~)oQ2E222LO z$@f2n4e|m#OqIa~WE-j^8kfDqA4<;?p)iCYs2o8wlT}Q~MKHvWi|9d7DhFJVrq-zt zqhaMZUMl5DbOsF4DPf72PbL&7YPE`&z-BQ-!US;=N0>yXC$fb}G$EHOUQK6n7(ymp zJjoR!%57R$hfQ)-Z@7uma{X4&>WRo=7*&4)tCCPe3yvR|r=C8SglY9AxT@)M5lzdb z63I~gjr~`nC$|Xq_@`60B^Fc0hjoP8QNq^iXPrC>0B?0m#6r30zG4{11pyqd+nKp% z&)u`zts}d`1jWNw_H9_SARtsfI2uy9#^~g>;4g%KciGGPntttLW%XC{+e&bsQUya$ zm$5hN;`K~hdMT%O?6cVwY4uxOPk!$mws&-ljo44;R2=K58feS=QE;fl>>aj;VyCWr z*;8~iu4L?|k2SeXT|I3-^tqjmc|}8uR+wEwb(b0u$7*3;KtNekXKmf=(L29Aa68HI z5(tcW_56Wx%u!-yvgBzCH%QiXQ=%J+16fs{@7?Q)3SZt|l$_kLDkCEUsi|2?Wu8V+ zlF9evi>v+D57vx%eb;c@Ay{_kw8K&v(SRBAt#eiQsH^`vzIIb}E+G2G<8H|GlH$z! z3w=-OZarUPjE?xULz;0;ai^*TA7fZ6E27JS!lK|DC4RBB)faiMA@hRyap1yBr}D4e z?dE&JSU!*Ez|9A(=SvF)4(|@PSS*5!3uv3G?RaOQMx!Ck8yp-uJp0`gulr>Au>=m% z^Dy+)2hB&$_k6$0@>FKpnckS6TA)GyaNc;@guBA2&k{D#;y)^HRXoDmm)3X>G7NXi zGHvE>mmQ54IFf^zw`UPOfKB+=XR+sk`%-(m z=g;dd+joqfvzqmG{0`#iY+j;j}@0{5z77yR7T!lQYjw`9JKYSFM(YB+}`S7aQ zH~L|j)jEQI^-fe8pjFHdUr-cM=4lLD9CvH$3De3Ov);4quvhlobA?+1TZ#wQ&#*kS z#;Zw|#SyhX|B@!&wMYKal%2`vdcbWW&}`orsl?@IL3Vc-7iT@7S|_a G?feJJNUmi7 literal 0 HcmV?d00001 diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 23214b7037..b0a5cd5179 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -740,7 +740,7 @@ div.header_row_right{ height: 12px; margin-left: 5px; margin-right: 10px; - background-image: url(../../api/templates/default/images/fav_filter.png); + background-image: url(../images/fav_filter.png); background-size: 12px 12px; background-position: 0 0; background-repeat: no-repeat; diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index ecbcb16650..a1835dac82 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -801,7 +801,7 @@ height: 12px; margin-left: 5px; margin-right: 10px; - background-image: url(../../api/templates/default/images/fav_filter.png); + background-image: url(../images/fav_filter.png); background-size: 12px 12px; background-position: 0 0; background-repeat: no-repeat;