From ffcbe0263d022d9b1ff130b970f93c9ac7da5fb3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Mar 2026 16:11:26 +0100 Subject: [PATCH] Look and feel v24 --- htdocs/core/class/html.form.class.php | 6 ++++-- htdocs/expedition/tpl/linkedobjectblock.tpl.php | 3 +++ htdocs/theme/eldy/global.inc.php | 4 +++- htdocs/ticket/card.php | 14 ++++++++------ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d5413efcf83..4dc15466ea5 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -10629,9 +10629,11 @@ class Form $htmltoenteralink .= ''; $htmltoenteralink .= ''; //print ''; - $htmltoenteralink .= ''; + $htmltoenteralink .= ''; + $htmltoenteralink .= ''; $htmltoenteralink .= ''; $htmltoenteralink .= '
' . $langs->trans("Ref") . ' '; + $htmltoenteralink .= ''; + $htmltoenteralink .= '
'; $htmltoenteralink .= ' '; - $htmltoenteralink .= '
'; $htmltoenteralink .= ''; diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index 0a8644ef90a..d7618e96ab2 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -18,6 +18,9 @@ * along with this program. If not, see . */ +/** + * @var ?Conf $conf Object config + */ // Protection to avoid direct call of template if (empty($conf) || !is_object($conf)) { print "Error, template page can't be called as URL"; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index b308ad5812d..46680226b42 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1350,6 +1350,8 @@ td.wordbreak img, td.wordbreakimp img { max-width: 100%; overflow-y: auto; word-break: break-word; + padding-top: 5px; + padding-bottom: 5px; } div.urllink { padding: 5px; @@ -5153,7 +5155,7 @@ tr.liste_titre_topborder td { border-top-color: var(--colortopbordertitle1); border-top-style: solid; } -.liste_titre td a:not(.button), .liste_titre td a:not(.button) span { +.liste_titre td a:not(.button):not(.editfielda), .liste_titre td a:not(.button):not(.editfielda) span { text-shadow: none !important; color: var(--colortexttitle) !important; } diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index b9f0b8c7ce6..0b96ae9d110 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -163,7 +163,6 @@ if (GETPOST('attribute', 'aZ09') && isset($extrafields->attributes[$object->tabl $upload_dir = $conf->ticket->dir_output; - /* * Actions */ @@ -645,6 +644,12 @@ if (empty($reshook)) { $error++; setEventMessages($object->error, $object->errors, 'errors'); } + } else { + $sql = "UPDATE ".MAIN_DB_PREFIX."ticket SET date_read = null WHERE rowid = ".((int) $object->id); + $resql = $db->query($sql); + if (!$resql) { + dol_print_error($db); + } } $url = 'card.php?track_id=' . $object->track_id; header("Location: " . $url); @@ -728,9 +733,6 @@ $userstat = new User($db); $form = new Form($db); $formfile = new FormFile($db); $formticket = new FormTicket($db); -if (isModEnabled('project')) { - $formproject = new FormProjets($db); -} $help_url = 'EN:Module_Ticket|FR:DocumentationModuleTicket'; @@ -956,7 +958,7 @@ if ($action == 'create' || $action == 'presend') { $morehtmlref = '
'; if ($user->hasRight('ticket', 'write') && !$user->socid) { - $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetTitle'), 0).' '; + $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetTitle'), 0).' '; } if ($action != 'editsubject') { $morehtmlref .= ''.dolPrintLabel($object->subject).''; @@ -1033,7 +1035,7 @@ if ($action == 'create' || $action == 'presend') { } $morehtmlref .= $form->form_thirdparty($url_page_current.'?track_id='.$object->track_id, (string) $object->socid, $action == 'editcustomer' ? 'editcustomer' : 'none', '', 1, 0, 0, array(), 1); if (!empty($object->socid)) { - $morehtmlref .= ' - '.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth"').' '.$langs->trans("TicketHistory").''; + $morehtmlref .= ' - '.img_picto($langs->trans("Tickets"), 'ticket', 'class="pictofixedwidth paddingright"').$langs->trans("TicketHistory").''; } }