From c6a269e4c4384c8e5365729990c6c81acd4b7fad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Mar 2019 19:53:27 +0100
Subject: [PATCH] Fix select of menu entry

---
 htdocs/core/menus/standard/eldy.lib.php       | 10 +--
 htdocs/theme/eldy/_main_menu_fa_icons.css.php | 62 ++++++++++---------
 htdocs/theme/eldy/theme_vars.php              |  2 +-
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1db6dc01ab4..968abcb0687 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -201,10 +201,10 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	    'position' => 30,
 	    'id' => $id,
 	    'idsel' => 'mrp',
-	    'classname' =>  $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 'class="tmenusel"' : 'class="tmenu"',
+	    'classname' =>  $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp" ) ? 'class="tmenusel"' : 'class="tmenu"',
 	    'prefix' => '',
-	    'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 0 : 1 ),
-	    'loadLangs' => array("projects"),
+	    'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp" ) ? 0 : 1 ),
+	    'loadLangs' => array("mrp"),
 	    'submenus' => array(),
 	);
 
@@ -433,9 +433,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	{
 		$smenu = (object) $smenu;
 
-		if( $smenu->enabled )
+		if ($smenu->enabled)
 		{
-			if($langs->session)
+			if ($smenu->session)
 			{
 				$_SESSION['idmenu']='';
 			}
diff --git a/htdocs/theme/eldy/_main_menu_fa_icons.css.php b/htdocs/theme/eldy/_main_menu_fa_icons.css.php
index e4f3b918ecb..1088a6f6160 100644
--- a/htdocs/theme/eldy/_main_menu_fa_icons.css.php
+++ b/htdocs/theme/eldy/_main_menu_fa_icons.css.php
@@ -1,7 +1,7 @@
 <?php if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 
-.mainmenu::before{  
+.mainmenu::before{
     /* font part */
     font-family: "Font Awesome 5 Free";
     font-weight: 900;
@@ -21,54 +21,52 @@ div.mainmenu.menu {
 	background-image: none;
 }
 
-div.mainmenu.menu::before {	
+div.mainmenu.menu::before {
 content: "\f0c9";
 }
 
 
-.mainmenu.home::before{
+div.mainmenu.home::before{
 	content: "\f015";
-} 
+}
 
-.mainmenu.billing::before {
+div.mainmenu.billing::before {
     content: "\f0d6";
 }
 
-.mainmenu.accountancy::before {
+div.mainmenu.accountancy::before {
     content: "\f0d6";
 }
 
-.mainmenu.agenda::before {
+div.mainmenu.agenda::before {
     content: "\f073";
 }
 
-.mainmenu.bank::before {
+div.mainmenu.bank::before {
     content: "\f19c";
 }
 
-<?php if($conf->global->MAIN_FEATURES_LEVEL == 2){ ?>
+<?php if ($conf->global->MAIN_FEATURES_LEVEL == 2) { ?>
 /* TESTING USAGE OF SVG WITHOUT FONT */
-.mainmenu.cashdesk{
+div.mainmenu.cashdesk{
     line-height: 26px;
 }
 
-.mainmenu.cashdesk .tmenuimage{
-
+div.mainmenu.cashdesk .tmenuimage {
     line-height: 26px;
     display: inline-block;
     vertical-align: middle;
     height: <?php echo $topMenuFontSize; ?>;
 	background-color: #<?php echo $colortextbackhmenu; ?>;
     width: 100%;
-	
+
     -webkit-mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%; /* for old webkit browser */
     mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%;
-    
 }
 
-<?php }else{ ?>
+<?php } else { ?>
 
-.mainmenu.cashdesk::before {
+div.mainmenu.cashdesk::before {
     content: "\f788";
 }
 
@@ -76,54 +74,58 @@ content: "\f0c9";
 
 
 
-.mainmenu.takepos::before {
+div.mainmenu.takepos::before {
     content: "\f217";
 }
 
-.mainmenu.companies::before {
+div.mainmenu.companies::before {
     content: "\f1ad";
 }
 
-.mainmenu.commercial::before {
+div.mainmenu.commercial::before {
     content: "\f508";
 }
 
-.mainmenu.ecm::before {
+div.mainmenu.ecm::before {
     content: "\f07c";
 }
 
-.mainmenu.externalsite::before {
+div.mainmenu.externalsite::before {
     content: "\f360";
 }
 
-.mainmenu.ftp::before {
+div.mainmenu.ftp::before {
     content: "\f362";
 }
 
-.mainmenu.hrm::before {
+div.mainmenu.hrm::before {
     content: "\f5ca";
 }
 
-.mainmenu.members::before {
+div.mainmenu.members::before {
     content: "\f0c0";
 }
 
-.mainmenu.products::before {
+div.mainmenu.products::before {
     content: "\f468";
 }
 
-.mainmenu.project::before {
+div.mainmenu.mrp::before {
+    content: "\f468";
+}
+
+div.mainmenu.project::before {
     content: "\f0e8";
 }
 
-.mainmenu.ticket::before {
+div.mainmenu.ticket::before {
     content: "\f3ff";
 }
 
-.mainmenu.tools::before {
+div.mainmenu.tools::before {
     content: "\f0ad";
 }
 
-.mainmenu.website::before {
+div.mainmenu.website::before {
     content: "\f542";
-}
\ No newline at end of file
+}
diff --git a/htdocs/theme/eldy/theme_vars.php b/htdocs/theme/eldy/theme_vars.php
index c03f6b28027..64910c0d96e 100644
--- a/htdocs/theme/eldy/theme_vars.php
+++ b/htdocs/theme/eldy/theme_vars.php
@@ -48,7 +48,7 @@ $colortext='0,0,0';
 $colortextlink='0,0,100';
 $fontsize='0.86em';
 $fontsizesmaller='0.75em';
-$topMenuFontSize='1.1em';
+$topMenuFontSize='1.2em';
 $toolTipBgColor='rgba(255, 255, 255, 0.96);';
 $toolTipFontColor='#333';