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 ''; + print ''; // Libelle if ($objp->fk_product > 0) { @@ -1563,7 +1563,7 @@ else $colspan = 7; } - print ''; + print ''; print ''; // Date planned @@ -1599,10 +1599,10 @@ else // Display lines extrafields if (is_array($extralabelslines) && count($extralabelslines)>0) { - print ''; + print ''; $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 ''; } } @@ -1610,7 +1610,7 @@ else else { // Ligne carac - print ""; + print ""; print ''; if ($objp->fk_product) { @@ -1664,7 +1664,7 @@ else if($conf->global->PRODUCT_USE_UNITS) $colspan++; // Ligne dates prevues - print ""; + print ""; print ''; 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 ''; if (is_array($extralabelslines) && count($extralabelslines)>0) { - print ''; + print ''; $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 ''; } @@ -1692,7 +1692,7 @@ else if ($object->statut > 0) { - print ''; + print ''; print '
'; print "\n"; } @@ -1761,7 +1761,7 @@ else { print ''; - print ''; + print ''; print ''; print ''; print "\n"; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/theme/eldy/img/play.png b/htdocs/theme/eldy/img/play.png index 4922ea1ec12..b506d9eb9b9 100644 Binary files a/htdocs/theme/eldy/img/play.png and b/htdocs/theme/eldy/img/play.png differ diff --git a/htdocs/theme/eldy/img/playdisabled.png b/htdocs/theme/eldy/img/playdisabled.png index 1cf122679e2..08116b68f93 100644 Binary files a/htdocs/theme/eldy/img/playdisabled.png and b/htdocs/theme/eldy/img/playdisabled.png differ diff --git a/htdocs/theme/eldy/img/playstop.png b/htdocs/theme/eldy/img/playstop.png new file mode 100644 index 00000000000..72031b31b5d Binary files /dev/null and b/htdocs/theme/eldy/img/playstop.png differ diff --git a/htdocs/theme/md/img/play.png b/htdocs/theme/md/img/play.png index 96021dc5081..b506d9eb9b9 100644 Binary files a/htdocs/theme/md/img/play.png and b/htdocs/theme/md/img/play.png differ diff --git a/htdocs/theme/md/img/playdisabled.png b/htdocs/theme/md/img/playdisabled.png index 1cf122679e2..08116b68f93 100644 Binary files a/htdocs/theme/md/img/playdisabled.png and b/htdocs/theme/md/img/playdisabled.png differ diff --git a/htdocs/theme/md/img/playstop.png b/htdocs/theme/md/img/playstop.png new file mode 100644 index 00000000000..72031b31b5d Binary files /dev/null and b/htdocs/theme/md/img/playstop.png differ
'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).''; 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 ''; - print img_edit(); + print img_picto($tmpactiontext, $tmpactionpicto); print ''; } } @@ -1780,7 +1788,7 @@ else print '
'; // Si pas encore active @@ -1903,7 +1911,7 @@ else print ''; - print '
'; + print '
'; print ''; print '