This commit is contained in:
Laurent Destailleur 2026-03-02 05:52:05 +01:00
parent 913d732d7f
commit 57a1f05d49
11 changed files with 15 additions and 21 deletions

View file

@ -425,7 +425,6 @@ while ($i < $imaxinloop) {
print img_picto('', 'url', 'class="pictofixedwidth"');
print '<a class="" href="'.$obj->url.'"'.($obj->target ? ' target="newlink" rel="noopener"' : '').'>';
} else {
//print img_picto('', 'rightarrow', 'class="pictofixedwidth"');
print '<a class="" href="'.$obj->url.'">';
}
print $link;

View file

@ -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'))) {

View file

@ -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

View file

@ -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') {

View file

@ -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 = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';
$input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

View file

@ -134,7 +134,7 @@ $coldisplay++;
<?php
if (empty($canchangeproduct)) {
if ($line->fk_parent_line > 0) {
echo img_picto('', 'rightarrow');
echo img_picto('', 'rightarrow.png');
} ?>
<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
<?php

View file

@ -185,12 +185,12 @@ if (($line->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);

View file

@ -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);

View file

@ -1588,7 +1588,7 @@ if ($reshook == 0) { //add buttons
print '<!-- Show the search input text -->'."\n";
print '<div class="margintoponly">';
print '<input type="text" id="search" class="input-search-takepos input-nobottom" name="search" onkeyup="Search2(\''.dol_escape_js($keyCodeForEnter).'\', null);" style="width: 80%; width:calc(100% - 51px); font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans("Search")).'" autofocus> ';
print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch(false);">'.img_picto('', 'searchclear').'</a>';
print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch(false);">'.img_picto('', 'searchclear.png').'</a>';
print '</div>';
}
?>

View file

@ -2018,7 +2018,7 @@ if ($placeid > 0) {
}
$htmlsupplements[$line->fk_parent_line] .= '>';
$htmlsupplements[$line->fk_parent_line] .= '<td class="left">';
$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;
}

View file

@ -303,9 +303,9 @@ if ($action == 'create') {
print '<td>';
$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 '</td>';