Fix CSS
This commit is contained in:
parent
ccbcd2b339
commit
7f8c4d7d0f
@ -519,7 +519,7 @@ if ($id > 0)
|
|||||||
|
|
||||||
// Lien recap
|
// Lien recap
|
||||||
$boxstat.='<div class="box">';
|
$boxstat.='<div class="box">';
|
||||||
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
|
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
|
||||||
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
|
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
|
||||||
|
|
||||||
if ($conf->propal->enabled)
|
if ($conf->propal->enabled)
|
||||||
|
|||||||
@ -284,7 +284,7 @@ if ($object->id > 0)
|
|||||||
|
|
||||||
// Lien recap
|
// Lien recap
|
||||||
$boxstat.='<div class="box">';
|
$boxstat.='<div class="box">';
|
||||||
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable" width="100%">';
|
$boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom" width="100%">';
|
||||||
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
|
$boxstat.='<tr class="impair"><td colspan="2" class="tdboxstats nohover">';
|
||||||
|
|
||||||
if ($conf->supplier_proposal->enabled)
|
if ($conf->supplier_proposal->enabled)
|
||||||
|
|||||||
@ -516,7 +516,6 @@ foreach($dashboardlines as $tmp)
|
|||||||
{
|
{
|
||||||
if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp;
|
if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp;
|
||||||
}
|
}
|
||||||
$rowspan = count($valid_dashboardlines);
|
|
||||||
|
|
||||||
// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
|
// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
|
||||||
foreach($valid_dashboardlines as $board)
|
foreach($valid_dashboardlines as $board)
|
||||||
@ -549,8 +548,6 @@ if ($showweather)
|
|||||||
$text='';
|
$text='';
|
||||||
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
|
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
|
||||||
$options='height="64px"';
|
$options='height="64px"';
|
||||||
if ($rowspan <= 2) $options='height="24"'; // Weather logo is smaller if dashboard has few elements
|
|
||||||
else if ($rowspan <= 3) $options='height="48"'; // Weather logo is smaller if dashboard has few elements
|
|
||||||
$boxwork.=showWeather($totallate,$text,$options);
|
$boxwork.=showWeather($totallate,$text,$options);
|
||||||
$boxwork.='</td>';
|
$boxwork.='</td>';
|
||||||
/*$boxwork.='<td align="left" colspan="3" class="nohover">';
|
/*$boxwork.='<td align="left" colspan="3" class="nohover">';
|
||||||
@ -564,43 +561,54 @@ if ($showweather)
|
|||||||
|
|
||||||
// Show dashboard
|
// Show dashboard
|
||||||
$nbworkboardempty=0;
|
$nbworkboardempty=0;
|
||||||
foreach($valid_dashboardlines as $board)
|
if (! empty($valid_dashboardlines))
|
||||||
{
|
{
|
||||||
if (empty($boad->nbtodo)) $nbworkboardempty++;
|
foreach($valid_dashboardlines as $board)
|
||||||
|
|
||||||
$var=!$var;
|
|
||||||
$boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' '.$board->label.'</td>';
|
|
||||||
$boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
|
|
||||||
$boxwork .= '<td align="right">';
|
|
||||||
$textlate = $langs->trans("NActionsLate",$board->nbtodolate);
|
|
||||||
$textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
|
|
||||||
$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
|
|
||||||
$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
|
|
||||||
$boxwork .= $board->nbtodolate;
|
|
||||||
$boxwork .= '</span>';
|
|
||||||
$boxwork .= '</a>';
|
|
||||||
$boxwork .='</td>';
|
|
||||||
$boxwork .='<td>';
|
|
||||||
if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
|
|
||||||
$boxwork .='</td>';
|
|
||||||
/*print '<td class="nowrap" align="right">';
|
|
||||||
print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
|
|
||||||
print '</td>';*/
|
|
||||||
/*
|
|
||||||
if ($showweather)
|
|
||||||
{
|
{
|
||||||
$boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
|
if (empty($boad->nbtodo)) $nbworkboardempty++;
|
||||||
$text='';
|
|
||||||
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
|
$var=!$var;
|
||||||
$options='height="64px"';
|
$boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' '.$board->label.'</td>';
|
||||||
if ($rowspan <= 2) $options='height="24"'; // Weather logo is smaller if dashboard has few elements
|
$boxwork .= '<td align="right"><a class="dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator">'.$board->nbtodo.'</span></a></td>';
|
||||||
else if ($rowspan <= 3) $options='height="48"'; // Weather logo is smaller if dashboard has few elements
|
$boxwork .= '<td align="right">';
|
||||||
$boxwork.=showWeather($totallate,$text,$options);
|
$textlate = $langs->trans("NActionsLate",$board->nbtodolate);
|
||||||
$boxwork.='</td>';
|
$textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
|
||||||
$showweather=0;
|
$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late ).'">';
|
||||||
}*/
|
$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate>0?' dashboardlineko':' dashboardlineok').'">';
|
||||||
$boxwork .='</tr>';
|
$boxwork .= $board->nbtodolate;
|
||||||
$boxwork .="\n";
|
$boxwork .= '</span>';
|
||||||
|
$boxwork .= '</a>';
|
||||||
|
$boxwork .='</td>';
|
||||||
|
$boxwork .='<td>';
|
||||||
|
if ($board->nbtodolate > 0) $boxwork .=img_picto($textlate, "warning", 'class="valignmiddle"').' ';
|
||||||
|
$boxwork .='</td>';
|
||||||
|
/*print '<td class="nowrap" align="right">';
|
||||||
|
print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')';
|
||||||
|
print '</td>';*/
|
||||||
|
/*
|
||||||
|
if ($showweather)
|
||||||
|
{
|
||||||
|
$boxwork.='<td class="nohover hideonsmartphone noborderbottom" rowspan="'.$rowspan.'" width="80" style="border-left: 1px solid #DDDDDD" align="center">';
|
||||||
|
$text='';
|
||||||
|
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate).')';
|
||||||
|
$options='height="64px"';
|
||||||
|
if ($rowspan <= 2) $options='height="24"'; // Weather logo is smaller if dashboard has few elements
|
||||||
|
else if ($rowspan <= 3) $options='height="48"'; // Weather logo is smaller if dashboard has few elements
|
||||||
|
$boxwork.=showWeather($totallate,$text,$options);
|
||||||
|
$boxwork.='</td>';
|
||||||
|
$showweather=0;
|
||||||
|
}*/
|
||||||
|
$boxwork .='</tr>';
|
||||||
|
$boxwork .="\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$boxwork.='<tr class="nohover">';
|
||||||
|
$boxwork.='<td colspan="4" class="nohover valignmiddle opacitymedium">';
|
||||||
|
$boxwork.=$langs->trans("NoOpenedElementToProcess");
|
||||||
|
$boxwork.='</td>';
|
||||||
|
$boxwork.='</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
$boxwork.='</table>'; // End table array of working board
|
$boxwork.='</table>'; // End table array of working board
|
||||||
|
|||||||
@ -408,6 +408,7 @@ TotalDuration=Total duration
|
|||||||
Summary=Summary
|
Summary=Summary
|
||||||
DolibarrStateBoard=Statistics
|
DolibarrStateBoard=Statistics
|
||||||
DolibarrWorkBoard=Work tasks board
|
DolibarrWorkBoard=Work tasks board
|
||||||
|
NoOpenedElementToProcess=No opened element to process
|
||||||
Available=Available
|
Available=Available
|
||||||
NotYetAvailable=Not yet available
|
NotYetAvailable=Not yet available
|
||||||
NotAvailable=Not available
|
NotAvailable=Not available
|
||||||
|
|||||||
@ -2858,6 +2858,9 @@ span.dashboardlineko {
|
|||||||
}
|
}
|
||||||
.boxtable {
|
.boxtable {
|
||||||
margin-bottom: 8px !important;
|
margin-bottom: 8px !important;
|
||||||
|
border-bottom-width: 1px;
|
||||||
|
}
|
||||||
|
.boxtablenobottom {
|
||||||
border-bottom-width: 0 !important;
|
border-bottom-width: 0 !important;
|
||||||
}
|
}
|
||||||
.tdboxstats {
|
.tdboxstats {
|
||||||
|
|||||||
@ -2785,6 +2785,9 @@ span.dashboardlineko {
|
|||||||
}
|
}
|
||||||
.boxtable {
|
.boxtable {
|
||||||
margin-bottom: 8px !important;
|
margin-bottom: 8px !important;
|
||||||
|
border-bottom-width: 1px;
|
||||||
|
}
|
||||||
|
.boxtablenobottom {
|
||||||
border-bottom-width: 0 !important;
|
border-bottom-width: 0 !important;
|
||||||
}
|
}
|
||||||
.tdboxstats {
|
.tdboxstats {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user