From 6973e29b2ca02eb0eb0bde2fd45b3c4b9b94ec61 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Thu, 1 Aug 2019 17:40:14 +0200
Subject: [PATCH] fix flex last line

---
 htdocs/index.php                   | 21 +++++++++++++++++----
 htdocs/theme/eldy/info-box.inc.php | 20 ++++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/htdocs/index.php b/htdocs/index.php
index 02648490bfc..f53d6eace2b 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -713,10 +713,15 @@ if (! empty($valid_dashboardlines))
 			$openedDashBoard.= '		<span class="info-box-icon bg-infoxbox-'.$groupKeyLowerCase.'"><i class="fa fa-dol-'.$groupKeyLowerCase.'"></i></span>'."\n";
 			$openedDashBoard.= '		<div class="info-box-content">'."\n";
 
-			$openedDashBoard .= '			<span class="info-box-text"><strong>'.$groupName.'</strong></span>' . "\n";
+			$openedDashBoard .= '			<span class="info-box-title">'.$groupName.'</span>' . "\n";
 
 			foreach($boards as $board) {
-				$infoName = !empty($board->labelShort) ? $board->labelShort : $board->label ;
+				if(!empty($board->labelShort)){
+					$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
+				}
+				else{
+					$infoName = $board->label ;
+				}
 
 				$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
 				$textLateTitle.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
@@ -729,13 +734,16 @@ if (! empty($valid_dashboardlines))
 					$textLate .= '</span>';
 				}
 
-
 				$nbtodClass = '';
 				if($board->nbtodo>0){
 					$nbtodClass = 'badge badge-info';
 				}
 
-				$openedDashBoard .= '			<span class="info-box-text">'.$infoName.' : <span class="'.$nbtodClass.'">'.$board->nbtodo.'</span>'.$textLate.'</span>' . "\n";
+				$openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>'.$textLate.'</a>' . "\n";
+
+				if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX) || $board->total > 0){
+					$openedDashBoard .=  '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total)	.'</a>';
+				}
 			}
 
 
@@ -747,6 +755,11 @@ if (! empty($valid_dashboardlines))
 
     }
 
+
+	for ($i = 1; $i <= 10; $i++) {
+		$openedDashBoard .= '<div class="box-flex-item filler"></div>';
+	}
+
 	$nbworkboardcount=0;
     foreach($valid_dashboardlines as $infoKey => $board)
     {
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index d5e67be03ac..4796c7cbe3c 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -11,7 +11,7 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
 	min-height: 90px;
 	background: #fff;
 	width: 100%;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+	box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.1);
 	border-radius: 2px;
 	margin-bottom: 15px;
 }
@@ -57,16 +57,23 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
 	font-size: 18px;
 }
 .progress-description,
-.info-box-text {
+.info-box-text,
+.info-box-title{
 	display: block;
 	font-size: 12px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
-.info-box-text {
+
+.info-box-title{
 	text-transform: uppercase;
+	font-weight: bold;
 }
+.info-box-text:first-letter{text-transform: uppercase}
+a.info-box-text{ text-decoration: none;}
+
+
 .info-box-more {
 	display: block;
 }
@@ -157,10 +164,15 @@ if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
 }
 
 .box-flex-item{
-	flex-grow : 2;
+	flex-grow : 1;
 	flex-shrink: 1;
 	flex-basis: auto;
 
 	width: 280px;
 	padding: 5px 10px;
 }
+.box-flex-item.filler{
+	margin: 0;
+	padding: 0px 10px !important;
+	height: 0;
+}