From 2dd6ccd2d9cdc2c088b7f7dfd92692620762a679 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Mon, 5 May 2025 15:24:04 +0200 Subject: [PATCH] Debug v22 --- htdocs/core/lib/functions.lib.php | 7 +++++-- htdocs/theme/eldy/global.inc.php | 1 + htdocs/theme/md/style.css.php | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 405cc80ca89..a6f667581bb 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -15469,7 +15469,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null, // Title $out .= '
'; - //$out .= $actionstatic->getTypePicto(); + //$out .= $actionstatic->getTypePicto(); // The type of event is already into the timeline on left. if (empty($conf->dol_optimize_smallscreen) && $actionstatic->type_code != 'AC_OTH_AUTO') { $out .= $labeltype.' - '; } @@ -15485,7 +15485,9 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null, $libelle = ($transcode != "Action".$histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']); $libelle = $histo[$key]['note']; $actionstatic->id = $histo[$key]['id']; - $out .= dol_escape_htmltag(dol_trunc($libelle, 120)); + if ($libelle != $labeltype) { + $out .= dol_escape_htmltag(dol_trunc($libelle, 120)); + } } elseif ($histo[$key]['type'] == 'mailing') { $out .= ''.img_object($langs->trans("ShowEMailing"), "email").' '; $transcode = $langs->transnoentitiesnoconv("Action".$histo[$key]['acode']); @@ -15496,6 +15498,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = null, $out .= dol_escape_htmltag(dol_trunc($libelle, 120)); } } + $out = preg_replace('/ - $/', '', $out); // Remove ending ' - ' if (isset($histo[$key]['elementtype']) && !empty($histo[$key]['fk_element'])) { if (isset($conf->cache['elementlinkcache'][$histo[$key]['elementtype']]) && isset($conf->cache['elementlinkcache'][$histo[$key]['elementtype']][$histo[$key]['fk_element']])) { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 73df5603cd2..56b40938403 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -5388,6 +5388,7 @@ img.boxhandle, img.boxclose { font-size: 1rem; cursor: pointer; display: inline-block; + white-spacing: nowrap; } .star { color: #ccc; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index a9155c780dc..afe56b47d5f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -5373,6 +5373,7 @@ img.boxhandle, img.boxclose { font-size: 1rem; cursor: pointer; display: inline-block; + white-spacing: nowrap; } .star { color: #ccc;