From 0dc0490ba02ebc695f7efd027f2b2af6f55ef1e1 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Tue, 13 Jan 2015 16:44:52 +0100
Subject: [PATCH] Render subscription table header icons using CSS (#4175);
 revert commit 99567e9b

---
 plugins/kolab_activesync/kolab_activesync_ui.php |   6 ++++--
 .../skins/chameleon/alarm-clock.png              | Bin 1117 -> 0 bytes
 .../skins/chameleon/synchronize.png              | Bin 1286 -> 0 bytes
 plugins/kolab_activesync/skins/larry/config.css  |  15 +++++++++++++++
 .../skins/larry/templates/configedit.html        |   2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)
 delete mode 100644 plugins/kolab_activesync/skins/chameleon/alarm-clock.png
 delete mode 100644 plugins/kolab_activesync/skins/chameleon/synchronize.png

diff --git a/plugins/kolab_activesync/kolab_activesync_ui.php b/plugins/kolab_activesync/kolab_activesync_ui.php
index 4ede94d6..257ec2ab 100644
--- a/plugins/kolab_activesync/kolab_activesync_ui.php
+++ b/plugins/kolab_activesync/kolab_activesync_ui.php
@@ -146,10 +146,12 @@ class kolab_activesync_ui
 
         $table = new html_table(array('cellspacing' => 0));
         $table->add_header(array('class' => 'subscription', 'title' => $this->plugin->gettext('synchronize'), 'tabindex' => 0),
-            $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'])) : '');
+            $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'])) :
+                $this->plugin->gettext('synchronize'));
         if ($alarms) {
             $table->add_header(array('class' => 'alarm', 'title' => $this->plugin->gettext('withalarms'), 'tabindex' => 0),
-                $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'])) : '');
+                $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'])) :
+                    $this->plugin->gettext('withalarms'));
         }
         $table->add_header('foldername', $this->plugin->gettext('folder'));
 
diff --git a/plugins/kolab_activesync/skins/chameleon/alarm-clock.png b/plugins/kolab_activesync/skins/chameleon/alarm-clock.png
deleted file mode 100644
index b54c1c3f8c9499805bf2ae2275951eaa367cffbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1117
zcmaJ=O-K|`9G`L1!qE0olvuqcLLztP!(G=Mc6HsIwYD0Ob+HW$oSk{<p!3np(;dAu
zM29tlI@Za8&Os3cbuheCL}YX*f<g>}@DN*vphMdmbG1X;z?=8}kKgb2|9o=;{l}Xc
zTN(+1Xv&-rvUvA<YexhAAN*dC@U{=7^Jvf*MMcSiM6Y5LAjoLa7|cRRnK}O)#t6bk
zskuDLi>G<n(1MbO2|AjI*#r^maZE{`fCv=en5xIAua6fgpek|dOju+@GX=-h6SEc^
zobAuavlDVup?bPO%;B+s29X3DZBn;+Cr+*F^7!ms(-c^Tpouv3C#bwQ08)kpK{&_+
zWTuk=ootZp2t^{1cEB+#Lo*!Basf8NcW^wzfQ^sB-YjL5&kB7TzOWUi#t|}knl2WL
z!D2_yu*PUM8jX4y92dZdfIXul$qDH8;i`fFZP`*yq#8Q#6s3YOh2j*B^iK+!xhbpL
z8)d=;qaDel*&ySkR0WFS|Dl?;iMCM|ZpHggVLLZtLOKg=W6F|o<3<mAu1r2<K?xaF
z&M+pcRU8;MkYSG-CP)p2fhftU?%C^jQRFkajU-)$86i$#g`lb`d^E)M2_Y^W<su=L
zO^1?fXJ;}JNhZTlhT*t$l`9zXlm>NF<tkg;zM5Qb6f_fi7NDh0L#59$G_amBuhxzw
zRa0++tJID~sL7>qFtpd$zZzY=!qej&H^&wmn}ZK^Jna@9>k%g*<0tVtBlPB+_l5iS
z?iHTYop!r?r4R1)-K8I7IR-w?-??^nXlT#5cB1sK?(RPScOSdUzgBm?)xSutzIk@}
z#&T$$EF<uF<Vo{SH@|a%1Z}67m4?Yg>!nvjxM3+#zd&A?V^-*HUss87_b-rHVeie-
z3ql7Ejw}%=Ftjw9h(7w#MYQ?f-fX+w2=oFt;0_<!cJfwxq7d;vX0A1VbKkWp?lE7z
zTYq&Jgy663t80najhyd5@42T<FNgEwr%I)Av`qREE=ep;xAYGQSIXXl&!qc>JIRrY
FzX3-*Waj_?

diff --git a/plugins/kolab_activesync/skins/chameleon/synchronize.png b/plugins/kolab_activesync/skins/chameleon/synchronize.png
deleted file mode 100644
index 6f0038e9de683ca0ff3d2136df788eac4ff8d6d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1286
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|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$OmImpPA<wUD9OyvQvjKmn3P{y
zVygsnDZ~r81#n~YilM;-3^4tQ!~%UoJp+)JU<!SG@hi>Eg{v+u2}(t{7puX=A(aKG
z`a!A1`K3k4z=%sz23b{L<y@4SSdw29lAoUg3&ntp{F40QjQj!x=U`I>-^Aq1JP;qO
z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=iiIJO&iLsHTk-3SXp{t3Lp_!SJxw(^*silE|
zk&!D*uS<S%X>Mv>2~2MaLa#ASy`ZF!TL84#CABECEH%ZgC_h&L>}9J=+-@<zX&zK>
z3U0R;;?%1Tbc{YIVv!;mCIn19ASOK70y*%6pPC0u?M1+3y^>`KFpn`-dAc};RNR^p
zv~g7vgNSb7L=GpN2@?t?DjialVygThtR(cFc}>1R=d`v1C+iN_{%Yvx*fy<g+60F?
zOBA^#PODfhRDJ&X<BPI-RePV$d%aV=dS{H$dlxg-8}Gk&A64RLdi^zOWr$1Qn(MFo
z{Z|OEd}L`!w2<n3_PH`^iHhgmxb-1grB-tv7I>)Ly_<La^PU>J^%`9Y9IZ}?yYKof
zzx=d_^H$yddaJn+(|RS@nh)lf9cEgVxyW>;kn6<977d93Ys0!F4J7VrNVZKZQNH$i
zYii`qm_C)0pMS=z4GY}E=+L!hm6q@2``iETXn+6v$HuE!p*mv83|=R0{9f88bG-K6
z<Bwh`_j;rk#ONu%FWbF;mf7rHozp+&OEkDnRG-Xg^7C$QwWEg3mfLS78oHAXJS=Ef
zcKop+>xNwEBGcJt!&ZOY;#OpFVpXOT%L0v4rLh;3lAnL9;JI60!Rd8a${?tV@yV`r
y#yp>I)y!z$Y;)%L=bFVAJ<fcW`jB74X~3X={LrbmHo+`V$>izk=d#Wzp$Pys4bM&h

diff --git a/plugins/kolab_activesync/skins/larry/config.css b/plugins/kolab_activesync/skins/larry/config.css
index b61885b7..fa2f9130 100644
--- a/plugins/kolab_activesync/skins/larry/config.css
+++ b/plugins/kolab_activesync/skins/larry/config.css
@@ -71,6 +71,16 @@ div.subscriptionblock h3.note {
 #foldersubscriptions thead th.alarm,
 #foldersubscriptions thead th.subscription {
 	cursor: pointer;
+	overflow: hidden;
+	text-indent: -5000px;
+	background-image: url(synchronize.png);
+	background-position: center center;
+	background-repeat: no-repeat;
+	height: 16px;
+}
+
+#foldersubscriptions thead th.alarm {
+	background-image: url(alarm-clock.png);
 }
 
 #foldersubscriptions tbody td {
@@ -79,6 +89,11 @@ div.subscriptionblock h3.note {
 	border-bottom: 2px solid #fff;
 }
 
+#foldersubscriptions tbody td.alarm,
+#foldersubscriptions tbody td.subscription {
+	text-align: center;
+}
+
 #foldersubscriptions td label {
 	display: block;
 }
diff --git a/plugins/kolab_activesync/skins/larry/templates/configedit.html b/plugins/kolab_activesync/skins/larry/templates/configedit.html
index 88f56cf2..ac7b2b46 100644
--- a/plugins/kolab_activesync/skins/larry/templates/configedit.html
+++ b/plugins/kolab_activesync/skins/larry/templates/configedit.html
@@ -16,7 +16,7 @@
 		</fieldset>
 		<fieldset>
 			<legend><roundcube:label name="kolab_activesync.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
+			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" />
 		</fieldset>
 	</form>
 </div>