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

Fix tooltip on extrafield title was on wrong line.

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-23 20:35:39 +02:00
parent b48f08dd07
commit fd04729727
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -2209,7 +2209,7 @@ class Adherent extends CommonObject
} }
elseif ($statut == 0) elseif ($statut == 0)
{ {
$statusType = 'status0'; $statusType = 'status6';
$labelstatut = $langs->trans("MemberStatusResiliated"); $labelstatut = $langs->trans("MemberStatusResiliated");
$labelstatutShort = $langs->trans("MemberStatusResiliatedShort"); $labelstatutShort = $langs->trans("MemberStatusResiliatedShort");
} }

4
htdocs/core/class/extrafields.class.php
View File

@ -1573,9 +1573,9 @@ class ExtraFields
if ($type == 'date') $out.=' (YYYY-MM-DD)'; if ($type == 'date') $out.=' (YYYY-MM-DD)';
elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)'; elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
*/ */
if (! empty($help)) { if (! empty($help) && $keyprefix != 'search_options_') {
$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3); $out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
} }
return $out; return $out;
} }

11
htdocs/core/tpl/extrafields_list_search_title.tpl.php
View File

@ -23,8 +23,15 @@ if (! empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_
$align=$extrafields->getAlignFlag($key); $align=$extrafields->getAlignFlag($key);
$sortonfield = $extrafieldsobjectprefix.$key; $sortonfield = $extrafieldsobjectprefix.$key;
if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield=''; if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>'; if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
else print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder)."\n"; print '<th class="liste_titre thseparator"></th>';
}
else
{
$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', 0, $tooltip)."\n";
}
} }
} }
} }

6
htdocs/theme/eldy/badges.inc.php
View File

@ -177,7 +177,8 @@ a.badge-dark:focus, a.badge-dark:hover {
/* /*
* STATUS BADGES * STATUS BADGES
*/ */
<?php for ($i = 0; $i <= 9; $i++){ <?php
for ($i = 0; $i <= 9; $i++){
/* Default Status */ /* Default Status */
_createStatusBadgeCss($i, '', "STATUS".$i); _createStatusBadgeCss($i, '', "STATUS".$i);
@ -203,7 +204,6 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
print "\n/* " . strtoupper($commentLabel) . " */\n"; print "\n/* " . strtoupper($commentLabel) . " */\n";
$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName}; $thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName};
$TBadgeBorderOnly = array(0, 3, 5, 7); $TBadgeBorderOnly = array(0, 3, 5, 7);
$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff'; $thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff';
@ -236,7 +236,7 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n"; print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
print " color: " . $thisBadgeTextColor . " !important;\n"; print " color: " . $thisBadgeTextColor . " !important;\n";
print " background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n"; //print " background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array($statusName, $TBadgeBorderOnly)) {
print " border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n"; print " border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n";
} }