From 57a1f05d490a7a80944a8232e9c613e6556d2704 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Mar 2026 05:52:05 +0100 Subject: [PATCH] FIX #37372 FIX #37374 --- htdocs/bookmarks/list.php | 1 - htdocs/contrat/card.php | 6 +++--- htdocs/core/class/commonobject.class.php | 2 +- htdocs/core/class/html.form.class.php | 6 ------ htdocs/core/lib/functions.lib.php | 3 ++- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 6 +++--- htdocs/salaries/payment_salary.php | 2 +- htdocs/takepos/index.php | 2 +- htdocs/takepos/invoice.php | 2 +- htdocs/user/api_token/card.php | 4 ++-- 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index 36183573921..579cc7889a0 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -425,7 +425,6 @@ while ($i < $imaxinloop) { print img_picto('', 'url', 'class="pictofixedwidth"'); print 'target ? ' target="newlink" rel="noopener"' : '').'>'; } else { - //print img_picto('', 'rightarrow', 'class="pictofixedwidth"'); print ''; } print $link; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index a03d1a79eb4..452e841d4ec 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1711,12 +1711,12 @@ if ($action == 'create') { $description = $objp->description; if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) { - print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '') . $text; + print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow.png') : '') . $text; if (!getDolGlobalInt('PRODUIT_DESC_IN_FORM')) { print $form->textwithpicto('', $description); } } else { - print $form->textwithtooltip($text, $description, 3, 0, '', '', 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '')); + print $form->textwithtooltip($text, $description, 3, 0, '', '', 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow.png') : '')); } // Add description in form @@ -2014,7 +2014,7 @@ if ($action == 'create') { $tmpactiontext = $langs->trans("Activate"); if ($objp->statut == 4) { $tmpaction = 'unactivateline'; - $tmpactionpicto = 'playstop'; + $tmpactionpicto = 'playstop.png'; $tmpactiontext = $langs->trans("Disable"); } if (($tmpaction == 'activateline' && $user->hasRight('contrat', 'activer')) || ($tmpaction == 'unactivateline' && $user->hasRight('contrat', 'desactiver'))) { diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 4a425c3ecd4..ccf930a0b9f 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5731,7 +5731,7 @@ abstract class CommonObject $this->tpl['label'] = ''; if (!empty($line->fk_parent_line)) { - $this->tpl['label'] .= img_picto('', 'rightarrow'); + $this->tpl['label'] .= img_picto('', 'rightarrow.png'); } if (((int) $line->info_bits & 2) == 2) { // TODO Not sure this is used for source object diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0c431989f99..e7194666010 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -854,12 +854,6 @@ class Form $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt); } elseif ($type == 'helpclickable') { $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt); - } elseif ($type == 'superadmin') { - // @phan-suppress-next-line PhanPluginSuspiciousParamPosition - $img = img_picto($alt, 'redstar'); - } elseif ($type == 'admin') { - // @phan-suppress-next-line PhanPluginSuspiciousParamPosition - $img = img_picto($alt, 'star'); } elseif ($type == 'warning') { $img = img_warning($alt); } elseif ($type != 'none') { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1f97b3ec6ff..2efad4cce85 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5897,6 +5897,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco 'square' => '#888', 'stop-circle' => '#888', 'stats' => '#444', + 'superadmin' => '#600', 'switch_off' => '#999', 'technic' => '#999', 'tick' => '#282', @@ -6760,7 +6761,7 @@ function img_searchclear($titlealt = 'default', $other = '') $titlealt = $langs->trans('Search'); } - $img = img_picto($titlealt, 'searchclear', $other, 0, 1); + $img = img_picto($titlealt, 'searchclear.png', $other, 0, 1); $input = ''; diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 457e7a6fdc2..2291df4273f 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -134,7 +134,7 @@ $coldisplay++; fk_parent_line > 0) { - echo img_picto('', 'rightarrow'); + echo img_picto('', 'rightarrow.png'); } ?> info_bits & 2) == 2) { if ($line->fk_product > 0) { if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) { - print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '') . $text; + print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow.png') : '') . $text; if (!getDolGlobalInt('PRODUIT_DESC_IN_FORM')) { print $form->textwithpicto('', $description); } } else { - print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '')); + print $form->textwithtooltip($text, $description, 3, 0, '', (string) $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow.png') : '')); } } else { $type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type); @@ -205,7 +205,7 @@ if (($line->info_bits & 2) == 2) { print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, 0, '', (string) $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '')); } else { if (!empty($line->fk_parent_line)) { - print img_picto('', 'rightarrow'); + print img_picto('', 'rightarrow.png'); } if (preg_match('/^\(DEPOSIT\)/', $line->description)) { $newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description); diff --git a/htdocs/salaries/payment_salary.php b/htdocs/salaries/payment_salary.php index 1ae19e8117f..eb31e83635f 100644 --- a/htdocs/salaries/payment_salary.php +++ b/htdocs/salaries/payment_salary.php @@ -294,7 +294,7 @@ if ($action == 'create') { $nameRemain = "remain_".$objp->id; /* Disabled, we autofil the amount with remain to pay by default if (!empty($conf->use_javascript_ajax)) { - print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'"); + print img_picto("Auto fill", 'rightarrow.png', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'"); } */ $valuetoshow = GETPOSTISSET($namef) ? GETPOST($namef) : ((float) $objp->amount - $sumpaid); diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index 2eb3ddf69a1..c054070073d 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -1588,7 +1588,7 @@ if ($reshook == 0) { //add buttons print ''."\n"; print '
'; print ' '; - print ''.img_picto('', 'searchclear').''; + print ''.img_picto('', 'searchclear.png').''; print '
'; } ?> diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index c8a7571dcc7..39c71ffc3a2 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -2018,7 +2018,7 @@ if ($placeid > 0) { } $htmlsupplements[$line->fk_parent_line] .= '>'; $htmlsupplements[$line->fk_parent_line] .= ''; - $htmlsupplements[$line->fk_parent_line] .= img_picto('', 'rightarrow'); + $htmlsupplements[$line->fk_parent_line] .= img_picto('', 'rightarrow.png'); if ($line->product_label) { $htmlsupplements[$line->fk_parent_line] .= $line->product_label; } diff --git a/htdocs/user/api_token/card.php b/htdocs/user/api_token/card.php index 11ade41bcfe..e2c6bb1f01c 100644 --- a/htdocs/user/api_token/card.php +++ b/htdocs/user/api_token/card.php @@ -303,9 +303,9 @@ if ($action == 'create') { print ''; $addadmin = ''; if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) { - $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"'); + $addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"'); } elseif (!empty($object->admin)) { - $addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"'); + $addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"'); } print showValueWithClipboardCPButton($object->login).$addadmin; print '';