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

Fix CSS

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-14 14:33:25 +01:00
parent ccbcd2b339
commit 7f8c4d7d0f
6 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/card.php
View File

@ -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)

2
htdocs/fourn/card.php
View File

@ -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)

16
htdocs/index.php
View File

@ -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,8 +561,10 @@ if ($showweather)
// Show dashboard // Show dashboard
$nbworkboardempty=0; $nbworkboardempty=0;
foreach($valid_dashboardlines as $board) if (! empty($valid_dashboardlines))
{ {
foreach($valid_dashboardlines as $board)
{
if (empty($boad->nbtodo)) $nbworkboardempty++; if (empty($boad->nbtodo)) $nbworkboardempty++;
$var=!$var; $var=!$var;
@ -601,6 +600,15 @@ foreach($valid_dashboardlines as $board)
}*/ }*/
$boxwork .='</tr>'; $boxwork .='</tr>';
$boxwork .="\n"; $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

1
htdocs/langs/en_US/main.lang
View File

@ -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

3
htdocs/theme/eldy/style.css.php
View File

@ -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 {

3
htdocs/theme/md/style.css.php
View File

@ -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 {