From 3a05649df148d9315f1769545c6925a01b4d6f55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 1 May 2012 23:40:23 +0200
Subject: [PATCH] Qual: Top menus use div only now. Menu manager eldy and
 auguria does not differs. First work to align eldy theme to dolibarr theme.

---
 htdocs/core/menus/standard/auguria.lib.php |  30 ++---
 htdocs/core/menus/standard/eldy.lib.php    |  68 +++++------
 htdocs/theme/eldy/img/menutab-active.png   | Bin 0 -> 111 bytes
 htdocs/theme/eldy/img/menutab-r.png        | Bin 0 -> 306 bytes
 htdocs/theme/eldy/img/nav-overlay.png      | Bin 0 -> 144 bytes
 htdocs/theme/eldy/img/nav-overlay3.png     | Bin 0 -> 3159 bytes
 htdocs/theme/eldy/style.css.php            | 135 +++++++++++++--------
 7 files changed, 129 insertions(+), 104 deletions(-)
 create mode 100644 htdocs/theme/eldy/img/menutab-active.png
 create mode 100644 htdocs/theme/eldy/img/menutab-r.png
 create mode 100644 htdocs/theme/eldy/img/nav-overlay.png
 create mode 100644 htdocs/theme/eldy/img/nav-overlay3.png

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 8023c202f56..bb8ad9404d1 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -80,7 +80,7 @@ function print_auguria_menu($db,$atarget,$type_user)
 				else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
 				else $classname='class="tmenu"';
 
-				print_start_menu_entry_auguria($idsel);
+				print_start_menu_entry_auguria($idsel,$classname);
 				print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($newTabMenu[$i]['target']?' target="'.$newTabMenu[$i]['target'].'"':($atarget?' target="'.$atarget.'"':'')).'>';
 				print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
@@ -91,7 +91,7 @@ function print_auguria_menu($db,$atarget,$type_user)
 			{
 				if (! $type_user)
 				{
-					print_start_menu_entry_auguria($idsel);
+					print_start_menu_entry_auguria($idsel,'class="tmenu"');
 					print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 					print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 					print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
@@ -109,28 +109,27 @@ function print_auguria_menu($db,$atarget,$type_user)
 
 
 /**
- * Output start menu entry
+ * Output start menu array
  *
  * @return	void
  */
 function print_start_menu_array_auguria()
 {
 	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<table class="tmenu" summary="topmenu"><tr class="tmenu">';
-	else print '<ul class="tmenu">';
+	print '<div class="tmenudiv">';
+	print '<ul class="tmenu">';
 }
 
 /**
- * Output menu entry
+ * Output start menu entry
  *
  * @param	string	$idsel		Text
  * @return	void
  */
-function print_start_menu_entry_auguria($idsel)
+function print_start_menu_entry_auguria($idsel,$classname)
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<td class="tmenu" id="mainmenutd_'.$idsel.'">';
-	else print '<li class="tmenu" id="mainmenutd_'.$idsel.'">';
+	print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
+	print '<div class="tmenuleft"></div><div class="tmenucenter">';
 }
 
 /**
@@ -141,7 +140,6 @@ function print_start_menu_entry_auguria($idsel)
  */
 function print_text_menu_entry_auguria($text)
 {
-	global $conf;
 	print '<span class="mainmenuaspan">';
 	print $text;
 	print '</span>';
@@ -154,9 +152,8 @@ function print_text_menu_entry_auguria($text)
  */
 function print_end_menu_entry_auguria()
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</td>';
-	else print '</li>';
+	print '</div>';
+	print '</li>';
 	print "\n";
 }
 
@@ -167,9 +164,8 @@ function print_end_menu_entry_auguria()
  */
 function print_end_menu_array_auguria()
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</tr></table>';
-	else print '</ul>';
+	print '</div>';
+	print '</ul>';
 	print "\n";
 }
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e249311631f..9bb5ae22814 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -55,7 +55,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$classname = 'class="tmenu"';
 	}
 	$idsel='home';
-	print_start_menu_entry($idsel);
+	print_start_menu_entry($idsel,$classname);
 	print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
 	print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 	print '</a>';
@@ -85,7 +85,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		if (($conf->societe->enabled && $user->rights->societe->lire)
 		|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -98,7 +98,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($langs->trans("ThirdParties"));
@@ -131,7 +131,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$idsel='products';
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage"  id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -144,7 +144,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($chaine);
@@ -178,7 +178,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$idsel='commercial';
 		if($user->rights->societe->lire || $user->rights->societe->contact->lire)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="'.$id.'"></span></div>';
 			print '</a>';
@@ -191,7 +191,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print print_text_menu_entry($langs->trans("Commercial"));
@@ -221,7 +221,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
 		|| $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -234,7 +234,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($langs->trans("MenuFinancial"));
@@ -263,7 +263,7 @@ function print_eldy_menu($db,$atarget,$type_user)
         $idsel='bank';
         if ($user->rights->banque->lire)
         {
-            print_start_menu_entry($idsel);
+            print_start_menu_entry($idsel,$classname);
             print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
             print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
             print '</a>';
@@ -276,7 +276,7 @@ function print_eldy_menu($db,$atarget,$type_user)
         {
             if (! $type_user)
             {
-                print_start_menu_entry($idsel);
+                print_start_menu_entry($idsel,$classname);
                 print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
                 print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
                 print_text_menu_entry($langs->trans("MenuBankCash"));
@@ -304,7 +304,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$idsel='project';
 		if ($user->rights->projet->lire)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -317,7 +317,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($langs->trans("Projects"));
@@ -345,7 +345,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$idsel='tools';
 		if ($user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -358,7 +358,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled"  id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($langs->trans("Tools"));
@@ -384,7 +384,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		}
 
 		$idsel='shop';
-		print_start_menu_entry($idsel);
+		print_start_menu_entry($idsel,$classname);
 		print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
@@ -412,7 +412,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		$idsel='members';
 		if ($user->rights->adherent->lire)
 		{
-			print_start_menu_entry($idsel);
+			print_start_menu_entry($idsel,$classname);
 			print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
 			print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 			print '</a>';
@@ -425,7 +425,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 		{
 			if (! $type_user)
 			{
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 				print_text_menu_entry($langs->trans("MenuMembers"));
@@ -475,7 +475,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 				else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
 				else $classname='class="tmenu"';
 
-				print_start_menu_entry($idsel);
+				print_start_menu_entry($idsel,$classname);
 				print '<a class="tmenuimage" href="'.$url.'"'.($newTabMenu[$i]['target']?" target='".$newTabMenu[$i]['target']."'":($atarget?' target="'.$atarget.'"':'')).'>';
 				print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 				print '</a>';
@@ -488,7 +488,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 			{
 				if (! $type_user)
 				{
-					print_start_menu_entry($idsel);
+					print_start_menu_entry($idsel,'class="tmenu"');
 					print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
 					print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
 					print_text_menu_entry($newTabMenu[$i]['titre']);
@@ -503,12 +503,15 @@ function print_eldy_menu($db,$atarget,$type_user)
 }
 
 
-
+/**
+ * Output start menu array
+ *
+ * @return	void
+ */
 function print_start_menu_array()
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<table class="tmenu" summary="topmenu"><tr class="tmenu">';
-	else print '<ul class="tmenu">';
+	print '<div class="tmenudiv">';
+	print '<ul class="tmenu">';
 }
 
 /**
@@ -517,11 +520,10 @@ function print_start_menu_array()
  * @param	string	$idsel		Text
  * @return	void
  */
-function print_start_menu_entry($idsel)
+function print_start_menu_entry($idsel,$classname)
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<td class="tmenu" id="mainmenutd_'.$idsel.'">';
-	else print '<li class="tmenu" id="mainmenutd_'.$idsel.'">';
+	print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
+	print '<div class="tmenuleft"></div><div class="tmenucenter">';
 }
 
 /**
@@ -532,7 +534,6 @@ function print_start_menu_entry($idsel)
  */
 function print_text_menu_entry($text)
 {
-	global $conf;
 	print '<span class="mainmenuaspan">';
 	print $text;
 	print '</span>';
@@ -545,9 +546,7 @@ function print_text_menu_entry($text)
  */
 function print_end_menu_entry()
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</td>';
-	else print '</li>';
+	print '</div></li>';
 	print "\n";
 }
 
@@ -558,9 +557,8 @@ function print_end_menu_entry()
  */
 function print_end_menu_array()
 {
-	global $conf;
-	if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</tr></table>';
-	else print '</ul>';
+	print '</div>';
+    print '</ul>';
 	print "\n";
 }
 
diff --git a/htdocs/theme/eldy/img/menutab-active.png b/htdocs/theme/eldy/img/menutab-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fbb9ba634d7ac000397efc60d1e5851dc234ded
GIT binary patch
literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^l0dA?!3HD~ITo$}Qf8hmjv*e$-(K0s$)Lc%?8th(
ztXOqdQ)^QJ|H}2=zL!ovy>+jqk%xnY>0_(_2g@S`MR{ebEJihVrTSm$&u#%tVDNPH
Kb6Mw<&;$S!Bp_k{

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/menutab-r.png b/htdocs/theme/eldy/img/menutab-r.png
new file mode 100644
index 0000000000000000000000000000000000000000..9db9b9d9b88eb96dc54fbecc5e7a4e68af7144e7
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^tUzqb!2%@D`)98MQcT58o*^6@p>Nzkf}8~&k;M!Q
zG72Efc$R<mJfNUViEBhjaDG}zd16s2gJVj5QmTSmW>IQ+eo=O@f^)F(jB9SpKy{)Z
zb<Rbpi6xo&c?uz!xv30B`i7?Zh6Zy(Z!Z8U==F4Q4ABVg?RVsJGUQ-ge&vXE^$#XJ
zhL`8pU%Xpl)W3wuhSA~AQ6H9LjIy2W56(CxE4f$muhEZrbInVo$?%Z;8kr`SyUnNH
zTr_r+XmY%x@#hAQ3G>dapRTGMTEX4-Fj4j>6L0QrzH7VA&V1LnFrwy!H1E;V>t<iQ
tZ+vvY1?kJLF8(uJyv96lTY*m41L;2@_0<;-d4XKc;OXk;vd$@?2>_!HZn^*f

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/nav-overlay.png b/htdocs/theme/eldy/img/nav-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..595f026cc248f0f52bf9d40a45693237d5719667
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^l0ZC_gAGWoogH`pNQHa4IEGZ*dVBUDCxZhAi=p%u
ziJSi(<~Z$eXL~mH)~_lK7N$lA1p(rz6Y(CCcK%}w`QLi`#2G;opcM?Bu6{1-oD!M<
DR3Rr4

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/img/nav-overlay3.png b/htdocs/theme/eldy/img/nav-overlay3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f252f5f51a58e77d09cd19e5f6a72e1c40fd8625
GIT binary patch
literal 3159
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
G<lg}Uc>OZ~

literal 0
HcmV?d00001

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index d9e6c6095f8..01ca6507a03 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -353,12 +353,28 @@ if (! empty($conf->browser->phone))
 }
 else
 {
-	$minwidthtmenu=64;
-	$heightmenu=48;
+	$minwidthtmenu=66;
+//	$heightmenu=48;
+	$heightmenu=54;
 }
 ?>
 
-div.tmenu {
+
+div#tmenu_tooltip {
+<?php if (! empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED) || ! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) {
+    $colortexttopmenu=$colortextmain;
+?>
+	background: rgb(<?php echo $colorback1 ?>);
+<?php } else {
+    if ($usecss3) $colortexttopmenu='FFFFFF';
+    else $colortexttopmenu='000000';
+?>
+	background: #305582; /* 2C68A3 */
+<?php
+    } ?>
+}
+
+div.tmenudiv {
 <?php if (GETPOST("optioncss") == 'print') {  ?>
 	display:none;
 <?php } else { ?>
@@ -370,17 +386,18 @@ div.tmenu {
     border-<?php print $right; ?>: 0px solid #555555;
     border-bottom: 1px solid #FFFFFF;
     padding: 0px 0px 0px 0px;	/* t r b l */
-    margin: 0px 0px 7px 0px;	/* t r b l */
+    margin: 0px 0px 0px 0px;	/* t r b l */
 	font-size: 13px;
     font-weight: normal;
     height: <?php print ($heightmenu+1); ?>px;
 
 <?php if ($usecss3) { ?>
-    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
-    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
-    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);
-    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
-    background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);
+    /*    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
+    /*    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
+    /*    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);*/
+    /*    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
+    /*    background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
+	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0% repeat-x;
 <?php } else { ?>
     background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu2.jpg' ?>);
     background-position:top;
@@ -391,20 +408,8 @@ div.tmenu {
 <?php } ?>
 }
 
-table.tmenu {
-    padding: 0px 0px 10px 0px;	/* t r b l */
-    margin: 0px 0px 0px 0px;	/* t r b l */
-	text-align: center;
-}
-td.tmenu {
-	<?php print $minwidthtmenu?'width: '.$minwidthtmenu.'px;':''; ?>
-	text-align: center;
-	vertical-align: bottom;
-	white-space: nowrap;
-}
-
 a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active {
-	color: #757575;
+	color: #808080;
     font-weight: normal;
 	padding: 0px 5px 0px 5px;
 	margin: 0px 1px 2px 1px;
@@ -416,49 +421,46 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
     font-weight: normal;
 	padding: 0px 5px 0px 5px;
-	margin: 0px 1px 2px 1px;
 	white-space: nowrap;
-	text-shadow: 1px 1px 1px #FFFFFF;
+	/*	text-shadow: 1px 1px 1px #000000; */
+	color: #<?php echo $colortexttopmenu; ?>;
 }
 a.tmenu:link, a.tmenu:visited {
-	color: #<?php echo $colortextmain; ?>;
+	color: #<?php echo $colortexttopmenu; ?>;
 }
 a.tmenu:hover, a.tmenu:active {
-	color: #233030;
 	margin: 0px 0px 0px 0px;
-	border-<?php print $right; ?>: 1px solid #555555;
-	border-<?php print $left; ?>: 1px solid #D8D8D8;
-	border-top: 1px solid #D8D8D8;
-	border-bottom: 2px solid #F4F4F4;
-	background: #F4F4F4;
-	text-shadow: 1px 1px 1px #FFFFFF;
+    /*	border-<?php print $right; ?>: 1px solid #555555; */
+    /*	border-<?php print $left; ?>: 1px solid #D8D8D8; */
+    /*	border-top: 1px solid #D8D8D8; */
+    /*	border-bottom: 2px solid #F4F4F4; */
+    /*	background: #F4F4F4; */
+    /*	text-shadow: 1px 1px 1px #FFFFFF !important; */
+	color: #<?php echo $colortexttopmenu; ?>;
 }
 
 a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
 	font-weight: normal;
-	color: #233030;
 	padding: 0px 5px 0px 5px;
 	margin: 0px 0px 0px 0px;
-	background: #F4F4F4;
-	border-<?php print $right; ?>: 1px solid #555555;
-	border-top: 1px solid #D8D8D8;
-	border-<?php print $left; ?>: 1px solid #D8D8D8;
-	border-bottom: 2px solid #F4F4F4;
+    /*	background: #F4F4F4; */
+    /*	border-<?php print $right; ?>: 1px solid #555555; */
+    /*	border-top: 1px solid #D8D8D8; */
+    /*	border-<?php print $left; ?>: 1px solid #D8D8D8; */
+    /*	border-bottom: 2px solid #F4F4F4; */
 	white-space: nowrap;
-	text-shadow: 1px 1px 1px #FFFFFF;
-}
-
-
-* html li.tmenu a {
-	min-width:60px;
+	/*	text-shadow: 1px 1px 1px #FFFFFF;*/
+	color: #<?php echo $colortexttopmenu; ?>;
 }
 
 ul.tmenu {	/* t r b l */
-    padding: 0px 0px 10px 0px;
-    margin: 0px 0px 0px 6px;
+    padding: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 	list-style: none;
+    height: <?php print $heightmenu; ?>px;
+    background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 0 0 repeat-x !important;
 }
-li.tmenu {
+li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
 	text-align: center;
 	vertical-align: bottom;
@@ -466,10 +468,33 @@ li.tmenu {
     height: <?php print $heightmenu; ?>px;
 	position:relative;
 	display: block;
-	padding: 2px 5px 0px 5px;
-    margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+	margin: 0px 0px 0px 0px;
 	font-weight: normal;
 }
+li.tmenu:hover, li.tmenusel {
+<?php if ($usecss3) { ?>
+    /*    background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
+    /*    background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
+    /*    background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); */
+    /*    background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
+    /*    background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
+	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0 repeat-x;
+<?php } ?>
+}
+div.tmenuleft
+{
+	width: 5px;
+	float: <?php print $left; ?>;
+    height: <?php print $heightmenu; ?>px;
+	background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menutab-r.png' ?>) 100% 0 no-repeat;
+}
+div.tmenucenter
+{
+	padding-top: 2px;
+	padding-right: 5px;
+    height: <?php print $heightmenu; ?>px;
+}
 
 
 div.mainmenu {
@@ -619,7 +644,6 @@ foreach($mainmenuusedarray as $key => $val)
 	{
 		print "div.mainmenu.".$val." {\n";
 		print "	background-image: url(".$url.");\n";
-		print "	height:28px;\n";
 		print "}\n";
 	}
 }
@@ -700,10 +724,10 @@ div.login {
 	font-weight: bold;
 }
 div.login a {
-	color: #233030;
+	color: #<?php echo $colortextmain; ?>;
 }
 div.login a:hover {
-	color: black;
+	color: #<?php echo $colortextmain; ?>;
 	text-decoration:underline;
 }
 
@@ -1704,6 +1728,13 @@ div.error {
   background: #EFCFCF;
 }
 
+div.jnotify-background {
+	opacity : 0.95 !important;
+    -moz-box-shadow: 4px 4px 4px #888 !important;
+    -webkit-box-shadow: 4px 4px 4px #888 !important;
+    box-shadow: 4px 4px 4px #888 !important;
+}
+
 /* Info admin */
 div.info {
   color: #807050;