From 1bb2fc0db46c97819cf823d3cee2eb03193fb366 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 22 Oct 2020 22:45:27 +0200 Subject: [PATCH] css --- htdocs/index.php | 22 ++++++++++++---------- htdocs/theme/eldy/info-box.inc.php | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 4eea2353d3e..492dd7b0ec2 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -698,15 +698,18 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { // Show the span for the total of record if (!empty($groupElement['globalStats'])) { $globalStatInTopOpenedDashBoard[] = $globalStatsKey; - $openedDashBoard .= ' '.$nbTotal.''."\n"; + $openedDashBoard .= ''.$nbTotal.''; } - $openedDashBoard .= ' '."\n"; - $openedDashBoard .= '
'."\n"; + $openedDashBoard .= ''."\n"; + $openedDashBoard .= '
'."\n"; - $openedDashBoard .= ' '.$groupName.''."\n"; + $openedDashBoard .= '
'.$groupName.'
'."\n"; + $openedDashBoard .= '
'."\n"; foreach ($boards as $board) { + $openedDashBoard .= '
'; + if (!empty($board->labelShort)) { $infoName = ''.$board->labelShort.''; } else { @@ -723,8 +726,6 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $textLate .= ''; } - $openedDashBoard .= '
'; - $nbtodClass = ''; if ($board->nbtodo > 0) { $nbtodClass = 'badge badge-info'; @@ -745,11 +746,12 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) { $openedDashBoard .= ''.$langs->trans('Total').' : '.price($board->total).''; } - - $openedDashBoard .= '
'; + $openedDashBoard .= '
'."\n"; } - $openedDashBoard .= '
'."\n"; + // TODO Add hook here to add more "info-box-line" + + $openedDashBoard .= '
'."\n"; $openedDashBoard .= ' '."\n"; $openedDashBoard .= ''."\n"; $openedDashBoard .= ''."\n"; @@ -776,7 +778,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50'); $weatherDashBoard .= ' '."\n"; $weatherDashBoard .= '
'."\n"; - $weatherDashBoard .= ' '.$langs->trans('GlobalOpenedElemView').''."\n"; + $weatherDashBoard .= '
'.$langs->trans('GlobalOpenedElemView').'
'."\n"; if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) { $weatherDashBoard .= ' '.$langs->transnoentitiesnoconv("NActionsLate", diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php index 0d3ee436bf4..9bbc4101065 100644 --- a/htdocs/theme/eldy/info-box.inc.php +++ b/htdocs/theme/eldy/info-box.inc.php @@ -87,12 +87,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> } .info-box-sm .info-box-icon { height: 80px; - width: 80px; + width: 78px; font-size: 25px; line-height: 92px; } .opened-dash-board-wrap .info-box-sm .info-box-icon { - border-radius: 0 20px 0 20px; + border-radius: 0 0 0 20px; } .opened-dash-board-wrap .info-box-sm .info-box-icon { line-height: 80px;