Merge remote-tracking branch 'upstream/develop' into doltrunc
This commit is contained in:
commit
2ad63f36e7
@ -120,7 +120,7 @@ if (function_exists('curl_init'))
|
|||||||
print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
|
print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
|
print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction smallpaddingimp">'.$langs->trans("Check").'</a>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1376,7 +1376,7 @@ if ($resql)
|
|||||||
// Alias
|
// Alias
|
||||||
if (!empty($arrayfields['s.name_alias']['checked']))
|
if (!empty($arrayfields['s.name_alias']['checked']))
|
||||||
{
|
{
|
||||||
print '<td>';
|
print '<td class="tdoverflowmax150" title="'.$obj->name_alias.'">';
|
||||||
print $obj->name_alias;
|
print $obj->name_alias;
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if (!$i) $totalarray['nbfield']++;
|
if (!$i) $totalarray['nbfield']++;
|
||||||
|
|||||||
@ -3503,6 +3503,7 @@ table.hidepaginationnext .paginationnext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Set the color for hover lines */
|
/* Set the color for hover lines */
|
||||||
.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
|
.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user