From 581b61bef182dab1b67dc92270da5fbe8c440d60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 22 Jan 2017 14:55:41 +0100
Subject: [PATCH] CSS and look

---
 htdocs/contrat/card.php                |  40 +++++++++++++++----------
 htdocs/theme/eldy/img/play.png         | Bin 653 -> 272 bytes
 htdocs/theme/eldy/img/playdisabled.png | Bin 828 -> 474 bytes
 htdocs/theme/eldy/img/playstop.png     | Bin 0 -> 250 bytes
 htdocs/theme/md/img/play.png           | Bin 131 -> 272 bytes
 htdocs/theme/md/img/playdisabled.png   | Bin 828 -> 474 bytes
 htdocs/theme/md/img/playstop.png       | Bin 0 -> 250 bytes
 7 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/playstop.png
 create mode 100644 htdocs/theme/md/img/playstop.png

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index a27dbfbc71a..872dbc07784 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1470,11 +1470,11 @@ else
 
                 $objp = $db->fetch_object($result);
 
-                $var=!$var;
+                //$var=!$var;
 
                 if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
                 {
-                    print '<tr '.$bc[$var].' valign="top">';
+                    print '<tr '.$bcnd[$var].' valign="top">';
                     // Libelle
                     if ($objp->fk_product > 0)
                     {
@@ -1563,7 +1563,7 @@ else
 		                    $colspan = 7;
 	                    }
 
-                        print '<tr '.$bc[$var].'>';
+                        print '<tr '.$bcnd[$var].'>';
                         print '<td colspan="'.$colspan.'">';
 
                         // Date planned
@@ -1599,10 +1599,10 @@ else
 
                     // Display lines extrafields
                     if (is_array($extralabelslines) && count($extralabelslines)>0) {
-                    	print '<tr '.$bc[$var].'>';
+                    	print '<tr '.$bcnd[$var].'>';
                     	$line = new ContratLigne($db);
                     	$line->fetch_optionals($objp->rowid,$extralabelslines);
-                    	print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan));
+                    	print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bcnd[$var], 'colspan'=>$colspan));
                     	print '</tr>';
                     }
                 }
@@ -1610,7 +1610,7 @@ else
                 else
                 {
                     // Ligne carac
-                    print "<tr ".$bc[$var].">";
+                    print "<tr ".$bcnd[$var].">";
                     print '<td>';
                     if ($objp->fk_product)
                     {
@@ -1664,7 +1664,7 @@ else
 	                if($conf->global->PRODUCT_USE_UNITS) $colspan++;
 
                     // Ligne dates prevues
-                    print "<tr ".$bc[$var].">";
+                    print "<tr ".$bcnd[$var].">";
                     print '<td colspan="'.$colspan.'">';
                     print $langs->trans("DateStartPlanned").' ';
                     $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
@@ -1673,10 +1673,10 @@ else
                     print '</td>';
 
                     if (is_array($extralabelslines) && count($extralabelslines)>0) {
-                    	print '<tr '.$bc[$var].'>';
+                    	print '<tr '.$bcnd[$var].'>';
                     	$line = new ContratLigne($db);
                     	$line->fetch_optionals($objp->rowid,$extralabelslines);
-                    	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan));
+                    	print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$colspan));
                     	print '</tr>';
                     }
 
@@ -1692,7 +1692,7 @@ else
 
             if ($object->statut > 0)
             {
-                print '<tr '.$bc[$var].'>';
+                print '<tr '.$bcnd[$var].'>';
                 print '<td colspan="'.($conf->margin->enabled?7:6).'"><hr class="opacitymedium"></td>';
                 print "</tr>\n";
             }
@@ -1761,7 +1761,7 @@ else
             {
                 print '<table class="notopnoleftnoright tableforservicepart2" width="100%">';
 
-                print '<tr '.$bc[$var].'>';
+                print '<tr '.$bcnd[$var].'>';
                 print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
                 print '<td width="30" align="right">';
                 if ($user->societe_id == 0)
@@ -1769,10 +1769,18 @@ else
                     if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
                     {
                         $tmpaction='activateline';
-                        if ($objp->statut == 4) $tmpaction='unactivateline';
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) {
+                        $tmpactionpicto='play';
+                        $tmpactiontext=$langs->trans("Activate");
+                        if ($objp->statut == 4) 
+                        {
+                            $tmpaction='unactivateline';
+                            $tmpactionpicto='playstop';
+                            $tmpactiontext=$langs->trans("Unactivate");
+                        }
+						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) 
+						{
 							print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
-							print img_edit();
+							print img_picto($tmpactiontext, $tmpactionpicto);
 							print '</a>';
 						}
                     }
@@ -1780,7 +1788,7 @@ else
                 print '</td>';
                 print "</tr>\n";
 
-                print '<tr '.$bc[$var].'>';
+                print '<tr '.$bcnd[$var].'>';
 
                 print '<td>';
                 // Si pas encore active
@@ -1903,7 +1911,7 @@ else
                 print '</td>';
 
                 print '<td align="right" rowspan="2" class="nohover">';
-                print '<input type="submit" class="button" name="close" value="'.$langs->trans("Close").'"><br>';
+                print '<input type="submit" class="button" name="close" value="'.$langs->trans("Unactivate").'"><br>';
                 print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                 print '</td></tr>';
 
diff --git a/htdocs/theme/eldy/img/play.png b/htdocs/theme/eldy/img/play.png
index 4922ea1ec12a8606851317be0927fa7c83132889..b506d9eb9b98478758a3d46127a0d455d9ca911b 100644
GIT binary patch
literal 272
zcmV+r0q_2aP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002jNkl<Zcmb8s
zJ!%4B5P;#Q6Vtk@p20uFpPML_$t~0_7ZAl##CWLW0&(>QL0yY4P1p~_6h70wFazUx
zsfoF{iNr%SdpF^4aywOb+D^_EdP++AmM)H3L^UVhnuyvmnN(r#tO@F(j;k#|>Sh6W
zxAy{IC6@pbL9d8{FAcyzFb3v=Qj7#Y-auI}`#*XuqG?>$kC9Iez)&y(61im&eZ<49
z<thL>7i~}%bzN-~s*W-pL|sP*2~kVtVr8JLY-sK3py5txD;FQUk$5OEHZwI+@vL9=
Wa87Y#wAdy90000<MNUMnLSTZ|e`{a>

literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00071Nkl<ZILmcY
zJ!lj`6dpqm;SkO4%<OIM637{irPv8#5fH2d6+}VMCSB5qKL|!kMUzW*XJ+pjQ42c}
zEG#W-1i?mAsD;Xb#~Jssx4X0c<<48*{@h=F28K5?Z{GL5Z{8b((jkQwThCO6q#y?Z
zj!y;x&x5@wEqxmN`#X1?@+8`FG|Gix$<>c8BOlfbI$K#7JzXv8rz9tLeSw=&&{vy+
zAX{t$K@Lf#{_!}zfVLSPBSp#ZPhZe{kj5nrPIvhn+m1mpDd=0ET!`0}hHN9-z3X#w
z7G!;n*58dhLbt*&%D&>7_*|D2$6uwuApkw_teg^^HRmB%(3CZP*<kc)LcOFPv<+Gt
zki~HYKtp)M5VD27rCst$`Qe^ydIaRSXk>Z^3b=Z)x~N@?91mxwIso5d08ZM#q761;
zv*L^F@xCPOAIsVVlI8K+a>K(x=32s_H=z>kh!NOF2>|&AZ#Eg}zwVfHZV-UjG5t*-
z_-Vj!K7Gu;^<}aT`IdgnW%NZH$kh&j+YbPN?|i17hyxjci8FB4suneh?D7<a&3eGp
ziJm?p6S}ws<vk-!I+W^8{pyW1gS_cduCviA;C$T&(1bl}Frp-MalgDhuy0iE(WH}B
zja+P@eV;&mpT&(OvU_9S+=i~@L;+w4cV`A1bwfkHgu2r)i4~O)KF>_ORLJz|u8)DF
z5@@$wlblat=pcG+DQVX)_j5;q;(O4!4jEff`2h4cG|qFMD<jdJPj|GfKg;9Ghr8?5
nC8|0G9fQDekEy%2`(Xb8F)&cKztrmb00000NkvXXu0mjf5FIa;

diff --git a/htdocs/theme/eldy/img/playdisabled.png b/htdocs/theme/eldy/img/playdisabled.png
index 1cf122679e2a16d094cd798642c4c060ad685813..08116b68f93b980baf992de5e809763b954bfb30 100644
GIT binary patch
delta 438
zcmV;n0ZIP62HFE5iBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtwf8hZZ
z4Kfs_tWYZe00C!7L_t(I%e9ofN<%>qg+E0>?1TiZwF`+T{`A_2zJOpfW2cW0@&b}p
z@COUYf%pg#n~(>v2q@Q1Yl+$`3ffFyUGJ3?I<Un(v-dDF=gh(%#ZXp4QXW_ZrX6|!
z+Gh4V5Rs%wpbnIQktqERG=Zv_fAzw|a70o9y1*uI2rK|&einfvU<>F<DyCNCm2`m*
zVBO4;jFwA4%RlGM>?y9O4ork3lBQxJGrI*gfIM*Utu-HP890tA*_YIiG#-)N04G32
zQZB4$)dzc#(v1Pvk_r*t1V(|Ckf<+llHrDelkEmr|L)8W)dq;qENnP1e;YtCgCGHx
z%uE5+zk44NwcTvnDI^VG+05=De8>Ok#Qr#!^y)q#OMb`aB)v&GOLKM=cmZ0HW?kmT
zG!ozv=mE9VU31%C0Xg8*B~F5w>;QXCvKF>Gl(F>(K*fC$FKq*;#jn6`&q&VAHsccC
g106Ga;XmUG1b={v<F!Ke3;+NC07*qoM6N<$g89j}T>t<8

delta 794
zcmV+#1LgeM1H1+yiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy)f8YrU
z5icZ*#wN@F00PNLL_t(I%Wad-Yg|<n$3N%3NeFEcZGKi%h_sNP3vD-DR1gZq7OE}`
zMUw|j%nTMMnR!|iY@^Up=ti1(<4jOyCXFy}T7-1fMadt~7SsyjqNP6&8ft#kf@5fE
z-n+*|CU&CzZtmsW^F8<6bH87qe}-zlo0jAP<wC}Yk)0@gz^i~7W3H&`y@8R`Er371
z*-6{c+W-i4xG+5#3)lYs6;L3*7Do3)L>pqx9z~BCF;@mgQg76Aq?+%fCAmbUlzq)w
zdkrD(#=SC6LAj7QD<U5v^uDutdagOSwBA8b^qUmDhtlIFyp^Ej|0u}ee}R$I-RfjF
zt7}4MdY)SDVc^VQJiTMye*yEQDkAa&%9xw*Rsc}i6}=Ob{L-bS@wU$NJZoRTpZP8Z
z<LU1aek&I;pKedjVP2lj_eD19a1-8zx^9gipnPDheNdUo4$bVy#afe#wZX|aaAMz^
z{bHgh+7pI$0^r<e??wR!e?UYOK~c^{QS@`Al-&<7Fp|0|BCW&k?(H#7tf8l|A$A{N
zICpbX0YC(i+Ou9!)!CrvPuI>=L>yzIa8*^eZTcFKn5y!hm;f`tcr6sFsu~fw3LF6V
zE7!h}-%w9h)nBZ&2M6Qn{<j{To+}qJTLCAuwra$2ZivYKpy<EUe?0nNgW%NG$g1rZ
zkzH=WyIjq6&^opRkh0ePG<@{fqIvJgM~kX@90=+zZ31$NcDZqH=Fp>47NBKxnMx`9
z48mt&7#;#(!GC^3WkFE#F9K9b*=GS3#x^T4DEe(d(XW;ZnZ&=d0a*6CnQcDNXsykN
z$lJ!4lNeKZe<-;EaBzO=>ldxH$5pi-NVy5`{IcIgM|$yznSP(x&T}8nGd20u>y3@E
zNt8YjF@OOctLiMmkQ?_N-aOMy@8=8ucjI@T?B>YX>+Ab(C)yn&Th@igLpSbKpJuRs
Y013z|y6m7?)&Kwi07*qoM6N<$g22;$Q2+n{

diff --git a/htdocs/theme/eldy/img/playstop.png b/htdocs/theme/eldy/img/playstop.png
new file mode 100644
index 0000000000000000000000000000000000000000..72031b31b5df5076f3cfc3474a46e7d855adf292
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002NNkl<Zcmb8s
zJ&FQB5P;E_iLpI;hh3G$pWH(z9!2L6q8N&ZXIp2yf;tAhi6Ar`tgoP=ujrtCuCP=p
zEd^OUXHW4pjgzj#z}3yhNK4Du)?KX+06kZ~zLT>`r2ydUmLxFra0DnkZNN-4du`Zh
z1Yju|Wuu8`0hFRvHfoF3|A|)b=f>G+Dw+d9W1Efk8XbU>yMfe?hXVjzwaPF_Y8L?j
z`YLxj6K!o%dk+_15{0A2`-2aHtYBenWv=5>f1Te^LLh`H;Q#;t07*qoM6N<$f><|X
A(EtDd

literal 0
HcmV?d00001

diff --git a/htdocs/theme/md/img/play.png b/htdocs/theme/md/img/play.png
index 96021dc5081e1daa4d37cd649d720e676c27ecec..b506d9eb9b98478758a3d46127a0d455d9ca911b 100644
GIT binary patch
delta 244
zcmV<Q01N+v0gwWaB!AaQL_t(|0hQ4`Y64*pfZ?YT)4Hpk!9T>Gn<$paEz~X-5XDl&
zc&Ow8arFj4U5hVG*bl@MKGVK11LJwAiMhFn#6vZEH{ow`J5_huPR<s3N=o{cE{<A6
zH7DPih}trlRAKL|3F@Mbt1Uq4W&wD&_X1!gmjDw%uZV&#4Q;?cFb3v=Qj7#Y-auI}
z`#*XuqG?>$kC9Iez)&y(61im&eZ<49<thL>7i~}%bzN-~s*W-pL|sP*2~kVtVr8JL
uY-sK3py5txD;FQUk$5OEHZwI+@vL9=a87Y#wAdy90000<MNUMnLSTY~t!N|w

delta 102
zcmV-s0Ga=g0)qjNBwtENL_t(|0b>|Qz(b6phYa3?75xXol?>tp6oKJ8hGe{o;BY^K
zDsDvx_?@AOft9eLN<xbEF{l!9coHFpuV4@-6qsJ*MGO4_03YZpB3Jgsxc~qF07*qo
IM6N<$f<BrkhyVZp

diff --git a/htdocs/theme/md/img/playdisabled.png b/htdocs/theme/md/img/playdisabled.png
index 1cf122679e2a16d094cd798642c4c060ad685813..08116b68f93b980baf992de5e809763b954bfb30 100644
GIT binary patch
delta 438
zcmV;n0ZIP62HFE5iBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtwf8hZZ
z4Kfs_tWYZe00C!7L_t(I%e9ofN<%>qg+E0>?1TiZwF`+T{`A_2zJOpfW2cW0@&b}p
z@COUYf%pg#n~(>v2q@Q1Yl+$`3ffFyUGJ3?I<Un(v-dDF=gh(%#ZXp4QXW_ZrX6|!
z+Gh4V5Rs%wpbnIQktqERG=Zv_fAzw|a70o9y1*uI2rK|&einfvU<>F<DyCNCm2`m*
zVBO4;jFwA4%RlGM>?y9O4ork3lBQxJGrI*gfIM*Utu-HP890tA*_YIiG#-)N04G32
zQZB4$)dzc#(v1Pvk_r*t1V(|Ckf<+llHrDelkEmr|L)8W)dq;qENnP1e;YtCgCGHx
z%uE5+zk44NwcTvnDI^VG+05=De8>Ok#Qr#!^y)q#OMb`aB)v&GOLKM=cmZ0HW?kmT
zG!ozv=mE9VU31%C0Xg8*B~F5w>;QXCvKF>Gl(F>(K*fC$FKq*;#jn6`&q&VAHsccC
g106Ga;XmUG1b={v<F!Ke3;+NC07*qoM6N<$g89j}T>t<8

delta 794
zcmV+#1LgeM1H1+yiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy)f8YrU
z5icZ*#wN@F00PNLL_t(I%Wad-Yg|<n$3N%3NeFEcZGKi%h_sNP3vD-DR1gZq7OE}`
zMUw|j%nTMMnR!|iY@^Up=ti1(<4jOyCXFy}T7-1fMadt~7SsyjqNP6&8ft#kf@5fE
z-n+*|CU&CzZtmsW^F8<6bH87qe}-zlo0jAP<wC}Yk)0@gz^i~7W3H&`y@8R`Er371
z*-6{c+W-i4xG+5#3)lYs6;L3*7Do3)L>pqx9z~BCF;@mgQg76Aq?+%fCAmbUlzq)w
zdkrD(#=SC6LAj7QD<U5v^uDutdagOSwBA8b^qUmDhtlIFyp^Ej|0u}ee}R$I-RfjF
zt7}4MdY)SDVc^VQJiTMye*yEQDkAa&%9xw*Rsc}i6}=Ob{L-bS@wU$NJZoRTpZP8Z
z<LU1aek&I;pKedjVP2lj_eD19a1-8zx^9gipnPDheNdUo4$bVy#afe#wZX|aaAMz^
z{bHgh+7pI$0^r<e??wR!e?UYOK~c^{QS@`Al-&<7Fp|0|BCW&k?(H#7tf8l|A$A{N
zICpbX0YC(i+Ou9!)!CrvPuI>=L>yzIa8*^eZTcFKn5y!hm;f`tcr6sFsu~fw3LF6V
zE7!h}-%w9h)nBZ&2M6Qn{<j{To+}qJTLCAuwra$2ZivYKpy<EUe?0nNgW%NG$g1rZ
zkzH=WyIjq6&^opRkh0ePG<@{fqIvJgM~kX@90=+zZ31$NcDZqH=Fp>47NBKxnMx`9
z48mt&7#;#(!GC^3WkFE#F9K9b*=GS3#x^T4DEe(d(XW;ZnZ&=d0a*6CnQcDNXsykN
z$lJ!4lNeKZe<-;EaBzO=>ldxH$5pi-NVy5`{IcIgM|$yznSP(x&T}8nGd20u>y3@E
zNt8YjF@OOctLiMmkQ?_N-aOMy@8=8ucjI@T?B>YX>+Ab(C)yn&Th@igLpSbKpJuRs
Y013z|y6m7?)&Kwi07*qoM6N<$g22;$Q2+n{

diff --git a/htdocs/theme/md/img/playstop.png b/htdocs/theme/md/img/playstop.png
new file mode 100644
index 0000000000000000000000000000000000000000..72031b31b5df5076f3cfc3474a46e7d855adf292
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002NNkl<Zcmb8s
zJ&FQB5P;E_iLpI;hh3G$pWH(z9!2L6q8N&ZXIp2yf;tAhi6Ar`tgoP=ujrtCuCP=p
zEd^OUXHW4pjgzj#z}3yhNK4Du)?KX+06kZ~zLT>`r2ydUmLxFra0DnkZNN-4du`Zh
z1Yju|Wuu8`0hFRvHfoF3|A|)b=f>G+Dw+d9W1Efk8XbU>yMfe?hXVjzwaPF_Y8L?j
z`YLxj6K!o%dk+_15{0A2`-2aHtYBenWv=5>f1Te^LLh`H;Q#;t07*qoM6N<$f><|X
A(EtDd

literal 0
HcmV?d00001