From 742bf29c65a8c38c9d0739676e60b8d08741e896 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 18 Nov 2017 01:29:42 +0100
Subject: [PATCH] Look and feel v6 - Show status of thirdparty in dol_banner

---
 htdocs/core/lib/functions.lib.php      | 9 ++++++---
 htdocs/societe/class/societe.class.php | 2 +-
 htdocs/theme/eldy/style.css.php        | 2 ++
 htdocs/theme/md/style.css.php          | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 85eda032d42..2b1fada73df 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1433,6 +1433,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 		{
 		   	$morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
 		}
+		else {
+			$morehtmlstatus.=$object->getLibStatut(5);
+		}
 	}
 	elseif ($object->element == 'product')
 	{
@@ -1458,13 +1461,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	}
 	elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
-		if ($object->statut==0) $morehtmlstatus.=$object->getLibStatut(2);
+		if ($object->statut == 0) $morehtmlstatus.=$object->getLibStatut(5);
 		else $morehtmlstatus.=$object->getLibStatut(4);
 	}
 	elseif ($object->element == 'facturerec')
 	{
-		if ($object->frequency==0) $morehtmlstatus.=$object->getLibStatut(2);
-		else $morehtmlstatus.=$object->getLibStatut(4);
+		if ($object->frequency == 0) $morehtmlstatus.=$object->getLibStatut(2);
+		else $morehtmlstatus.=$object->getLibStatut(5);
 	}
 	else { // Generic case
 		$tmptxt=$object->getLibStatut(6);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 5b203c71693..dd8ff69448f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2021,7 +2021,7 @@ class Societe extends CommonObject
 	/**
 	 *    Return label of status (activity, closed)
 	 *
-	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *    @return   string        		Libelle
 	 */
 	function getLibStatut($mode=0)
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 83fa26e2f75..f551a8c5e44 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1280,6 +1280,8 @@ div.statusref {
 }
 div.statusref img {
     padding-left: 8px;
+   	padding-right: 9px;
+   	vertical-align: text-bottom;
 }
 img.photoref, div.photoref {
 	border: 1px solid #CCC;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9abccc49a3e..4540c569d18 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1306,6 +1306,8 @@ div.statusref {
 }
 div.statusref img {
     padding-left: 8px;
+    padding-right: 9px;
+    vertical-align: text-bottom;
 }
 img.photoref, div.photoref {
 	border: 1px solid #CCC;