diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index a27dbfbc71a7dc20b9430a13e9a992fd921666eb..872dbc07784e5a8520954ef8dfa515656eaaa2ec 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 . '&ligne=' . $object->lines[$cursorline - 1]->id . '&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 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 1cf122679e2a16d094cd798642c4c060ad685813..08116b68f93b980baf992de5e809763b954bfb30 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 0000000000000000000000000000000000000000..72031b31b5df5076f3cfc3474a46e7d855adf292 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 96021dc5081e1daa4d37cd649d720e676c27ecec..b506d9eb9b98478758a3d46127a0d455d9ca911b 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 1cf122679e2a16d094cd798642c4c060ad685813..08116b68f93b980baf992de5e809763b954bfb30 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 0000000000000000000000000000000000000000..72031b31b5df5076f3cfc3474a46e7d855adf292 Binary files /dev/null and b/htdocs/theme/md/img/playstop.png differ