Look and feel v12: CSS for qty in lists

This commit is contained in:
Laurent Destailleur 2020-02-24 21:47:48 +01:00
parent 68526a14cd
commit 7cd49f327e
4 changed files with 26 additions and 2 deletions

View File

@ -4304,7 +4304,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding valignmiddle col-title">';
print '<div class="titre inline-block">'.$titre;
if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print ' ('.$totalnboflines.')';
if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack">('.$totalnboflines.')</span>';
print '</div></td>';
// Center

View File

@ -2454,7 +2454,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
*/
function getTaskProgressBadge($task, $label = '', $tooltip = '')
{
global $conf;
global $conf, $langs;
$out = '';
$badgeClass = '';
@ -2472,12 +2472,15 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
$badgeClass .= 'badge-danger';
if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
}
elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
$badgeClass .= 'badge-warning';
if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("Expected").' '.$progressCalculated.'%';
}
else {
$badgeClass .= 'badge-success';
if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
}
}
}

View File

@ -334,6 +334,13 @@ select.flat, form.flat select {
.opacitytransp {
opacity: 0;
}
.colorwhite {
color: #fff;
}
.colorblack {
color: #000;
}
select:invalid {
color: gray;
}
@ -368,6 +375,7 @@ input#onlinepaymenturl, input#directdownloadlink {
opacity: 0.7;
}
div#moretabsList, div#moretabsListaction {
z-index: 5;
}

View File

@ -279,6 +279,12 @@ textarea.cke_source:focus
box-shadow: none;
}
th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
overflow: hidden;
white-space: nowrap;
max-width: 120px;
text-overflow: ellipsis;
}
.liste_titre input[name=month_date_when], .liste_titre input[name=monthvalid], .liste_titre input[name=search_ordermonth], .liste_titre input[name=search_deliverymonth],
.liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month],
.liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
@ -465,6 +471,13 @@ select.flat, form.flat select {
.opacitytransp {
opacity: 0;
}
.colorwhite {
color: #fff;
}
.colorblack {
color: #000;
}
select:invalid {
color: gray;
}