From fd04729727d69d4f3bfb30beb1453304ed42a9fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Oct 2019 20:35:39 +0200
Subject: [PATCH] Fix tooltip on extrafield title was on wrong line.

---
 htdocs/adherents/class/adherent.class.php             |  2 +-
 htdocs/core/class/extrafields.class.php               |  4 ++--
 htdocs/core/tpl/extrafields_list_search_title.tpl.php | 11 +++++++++--
 htdocs/theme/eldy/badges.inc.php                      |  6 +++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 5c7e825671c..d21dbb2673d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2209,7 +2209,7 @@ class Adherent extends CommonObject
 		}
 		elseif ($statut == 0)
 		{
-			$statusType = 'status0';
+			$statusType = 'status6';
 			$labelstatut = $langs->trans("MemberStatusResiliated");
 			$labelstatutShort = $langs->trans("MemberStatusResiliatedShort");
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 271297b75e7..6807e75ba80 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1573,9 +1573,9 @@ class ExtraFields
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
-		 if (! empty($help)) {
+		if (! empty($help) && $keyprefix != 'search_options_') {
 			$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
-		 }
+		}
 		return $out;
 	}
 
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index e8b1e396f1a..c6d3776cfe4 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -23,8 +23,15 @@ if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_
 				$align=$extrafields->getAlignFlag($key);
 				$sortonfield = $extrafieldsobjectprefix.$key;
 				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
-				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-				else print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder)."\n";
+				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
+					print '<th class="liste_titre thseparator"></th>';
+				}
+				else
+				{
+					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
+
+					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', 0, $tooltip)."\n";
+				}
 			}
 		}
 	}
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index d3d22c622dc..975f2eb311f 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -177,7 +177,8 @@ a.badge-dark:focus, a.badge-dark:hover {
 /*
  * STATUS BADGES
  */
-<?php for ($i = 0; $i <= 9; $i++){
+<?php
+for ($i = 0; $i <= 9; $i++){
 	/* Default Status */
 	_createStatusBadgeCss($i, '', "STATUS".$i);
 
@@ -203,7 +204,6 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print "\n/* " . strtoupper($commentLabel) . " */\n";
 		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName};
 
-
 		$TBadgeBorderOnly = array(0, 3, 5, 7);
 		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff';
 
@@ -236,7 +236,7 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
 		print "    color: " . $thisBadgeTextColor . " !important;\n";
-		print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
+		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
 		if (in_array($statusName, $TBadgeBorderOnly)) {
 			print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n";
 		}