lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tooltips

Browse Source
This commit is contained in:
Laurent Destailleur 2023-04-27 15:55:21 +02:00
parent 60385ea6ca
commit 46e3413e8a
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/class/commande.class.php
View File

@ -3870,7 +3870,7 @@ class Commande extends CommonOrder
$result .= $linkstart; $result .= $linkstart;
if ($withpicto) { if ($withpicto) {
$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1); $result .= img_object(($notooltip ? '' : $label), $this->picto, (($withpicto != 2) ? 'class="paddingright"' : ''), 0, 0, $notooltip ? 0 : 1);
} }
if ($withpicto != 2) { if ($withpicto != 2) {
$result .= $this->ref; $result .= $this->ref;

1
htdocs/core/class/commonobject.class.php
View File

@ -794,6 +794,7 @@ abstract class CommonObject
// Note that $action and $object may have been modified by some hooks // Note that $action and $object may have been modified by some hooks
$hookmanager->executeHooks('getTooltipContent', $parameters, $this, $action); $hookmanager->executeHooks('getTooltipContent', $parameters, $this, $action);
//var_dump($datas);
$label = implode($datas); $label = implode($datas);
return $label; return $label;

4
htdocs/cron/class/cronjob.class.php
View File

@ -1067,7 +1067,7 @@ class Cronjob extends CommonObject
$label = $langs->trans("ShowCronJob"); $label = $langs->trans("ShowCronJob");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
} }
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"'; $linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
} else { } else {
$linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@ -1079,7 +1079,7 @@ class Cronjob extends CommonObject
$result .= $linkstart; $result .= $linkstart;
if ($withpicto) { if ($withpicto) {
$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : $dataparams.' class="'.(($withpicto != 2) ? 'paddingright ' : '').$classfortooltip.'"'), 0, 0, $notooltip ? 0 : 1); $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), (($withpicto != 2) ? 'class="paddingright"' : ''), 0, 0, $notooltip ? 0 : 1);
} }
if ($withpicto != 2) { if ($withpicto != 2) {
$result .= $this->ref; $result .= $this->ref;

2
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -872,7 +872,7 @@ class MyObject extends CommonObject
$result .= '</div>'; $result .= '</div>';
} else { } else {
$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"'), 0, 0, $notooltip ? 0 : 1);
} }
} }
} }

1
htdocs/user/class/user.class.php
View File

@ -2807,6 +2807,7 @@ class User extends CommonObject
$type = ($this->socid ? $langs->trans("ExternalUser").$company : $langs->trans("InternalUser")); $type = ($this->socid ? $langs->trans("ExternalUser").$company : $langs->trans("InternalUser"));
$datas['type'] = '<br><b>'.$langs->trans("Type").':</b> '.$type; $datas['type'] = '<br><b>'.$langs->trans("Type").':</b> '.$type;
$datas['closediv'] = '</div>'; $datas['closediv'] = '</div>';
if ($infologin > 0) { if ($infologin > 0) {
$datas['newlinelogin'] = '<br>'; $datas['newlinelogin'] = '<br>';
$datas['session'] = '<br><u>'.$langs->trans("Session").'</u>'; $datas['session'] = '<br><u>'.$langs->trans("Session").'</u>';

4
htdocs/user/list.php
View File

@ -1281,7 +1281,7 @@ while ($i < $imaxinloop) {
print $hookmanager->resPrint; print $hookmanager->resPrint;
// Date creation // Date creation
if (!empty($arrayfields['u.datec']['checked'])) { if (!empty($arrayfields['u.datec']['checked'])) {
print '<td class="center">'; print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
print '</td>'; print '</td>';
if (!$i) { if (!$i) {
@ -1290,7 +1290,7 @@ while ($i < $imaxinloop) {
} }
// Date modification // Date modification
if (!empty($arrayfields['u.tms']['checked'])) { if (!empty($arrayfields['u.tms']['checked'])) {
print '<td class="center">'; print '<td class="center nowraponall">';
print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
print '</td>'; print '</td>';
if (!$i) { if (!$i) {