Skip to content

Commit

Permalink
Fix CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Mar 14, 2017
1 parent ccbcd2b commit 7f8c4d7
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 40 deletions.
2 changes: 1 addition & 1 deletion htdocs/comm/card.php
View file
Expand Up @@ -519,7 +519,7 @@

// Lien recap
$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">';

if ($conf->propal->enabled)
Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/card.php
View file
Expand Up @@ -284,7 +284,7 @@

// Lien recap
$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">';

if ($conf->supplier_proposal->enabled)
Expand Down
84 changes: 46 additions & 38 deletions htdocs/index.php
View file
Expand Up @@ -516,7 +516,6 @@
{
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
foreach($valid_dashboardlines as $board)
Expand Down Expand Up @@ -549,8 +548,6 @@
$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>';
/*$boxwork.='<td align="left" colspan="3" class="nohover">';
Expand All @@ -564,43 +561,54 @@

// Show dashboard
$nbworkboardempty=0;
foreach($valid_dashboardlines as $board)
if (! empty($valid_dashboardlines))
{
if (empty($boad->nbtodo)) $nbworkboardempty++;

$var=!$var;
$boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$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)
foreach($valid_dashboardlines as $board)
{
$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";
if (empty($boad->nbtodo)) $nbworkboardempty++;

$var=!$var;
$boxwork .= '<tr class="oddeven'.($board->nbtodo?'':' workboardempty').'"><td class="nowrap">'.$board->img.' &nbsp; '.$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">';
$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
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/en_US/main.lang
View file
Expand Up @@ -408,6 +408,7 @@ TotalDuration=Total duration
Summary=Summary
DolibarrStateBoard=Statistics
DolibarrWorkBoard=Work tasks board
NoOpenedElementToProcess=No opened element to process
Available=Available
NotYetAvailable=Not yet available
NotAvailable=Not available
Expand Down
3 changes: 3 additions & 0 deletions htdocs/theme/eldy/style.css.php
View file
Expand Up @@ -2858,6 +2858,9 @@
}
.boxtable {
margin-bottom: 8px !important;
border-bottom-width: 1px;
}
.boxtablenobottom {
border-bottom-width: 0 !important;
}
.tdboxstats {
Expand Down
3 changes: 3 additions & 0 deletions htdocs/theme/md/style.css.php
View file
Expand Up @@ -2785,6 +2785,9 @@
}
.boxtable {
margin-bottom: 8px !important;
border-bottom-width: 1px;
}
.boxtablenobottom {
border-bottom-width: 0 !important;
}
.tdboxstats {
Expand Down

0 comments on commit 7f8c4d7

Please sign in to comment.