NEW Simplification of styles architcture: Showing or not the menuhider

is completely decided by CSS and screen size instead of PHP+CSS.

htdocs/collab/index.php

@@ -33,10 +33,7 @@ $langs->loadLangs(array("admin","other","website"));
 
 if (! $user->admin) accessforbidden();
 
-if (! ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+$conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
-{
-	$conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
-}
 
 $error=0;
 $website=GETPOST('website', 'alpha');

htdocs/core/menus/standard/auguria.lib.php

@@ -53,7 +53,8 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 	if (empty($noout)) print_start_menu_array_auguria();
 
-	$usemenuhider = (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+    $usemenuhider = 1;
+    global $usemenuhider;
 
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -264,7 +265,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+	$usemenuhider = 0;
 	global $usemenuhider;
 
 	// Show logo company
@@ -393,7 +394,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					{
                         $langs->load('accountancy');
                         $journallabel=$langs->transnoentities($objp->label);	// Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-                        if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy/', $leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+                        if (empty($leftmenu) || preg_match('/accountancy/', $leftmenu)) $newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
 					}
 					$i++;
 				}

htdocs/core/menus/standard/eldy.lib.php

@@ -53,7 +53,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	if (empty($noout)) print_start_menu_array();
 
-	$usemenuhider = (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+    $usemenuhider = 1;
 
 	// Show/Hide vertical menu
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -183,7 +183,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// MRP
 	$menu_arr[] = array(
 	    'name' => 'TMenuMRP',
-	    'link' => '/bom/bom_list.php?mainmenu=mrp&leftmenu=',
+	    'link' => '/mrp/index.php?mainmenu=mrp&leftmenu=',
 	    'title' => $langs->trans("TMenuMRP"),
 	    'level' => 0,
 	    'enabled' => $showmode = isVisibleToUserType(
@@ -650,7 +650,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	$mainmenu=($forcemainmenu?$forcemainmenu:$_SESSION["mainmenu"]);
 	$leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"]));
 
-	$usemenuhider = (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+    $usemenuhider = 0;
 
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -1057,7 +1057,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			{
 				$langs->load("orders");
 				if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
-				//                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 			}
 
 			// Supplier Orders to bill
@@ -1067,7 +1067,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				{
 					$langs->load("supplier");
 					$newmenu->add("/fourn/commande/list.php?leftmenu=orders&search_status=5&billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
-					//                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
 				}
 			}
 

htdocs/core/menus/standard/empty.php

@@ -90,7 +90,7 @@ class MenuManager
 		{
 			if (empty($noout)) print_start_menu_array_empty();
 
-			$usemenuhider = (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER));
+            $usemenuhider = 1;
 
 			// Show/Hide vertical menu
 			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider &&  empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

htdocs/core/modules/modBom.class.php

@@ -278,34 +278,7 @@ class modBom extends DolibarrModules
 								'target'=>'',
 								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
 		*/
-        /*
+
-		$this->menu[$r++]=array(
-                				'fk_menu'=>'fk_mainmenu=bom',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',			                // This is a Left menu entry
-								'titre'=>'List Bom',
-								'mainmenu'=>'bom',
-								'leftmenu'=>'bom_bom',
-								'url'=>'/bom/bom_list.php',
-								'langs'=>'mrp',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>1100+$r,
-								'enabled'=>'$conf->bom->enabled',  // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		$this->menu[$r++]=array(
-                				'fk_menu'=>'fk_mainmenu=bom,fk_leftmenu=bom_bom',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',			                // This is a Left menu entry
-								'titre'=>'New Bom',
-								'mainmenu'=>'bom',
-								'leftmenu'=>'bom_bom',
-								'url'=>'/bom/bom_card.php?action=create',
-								'langs'=>'mrp',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>1100+$r,
-								'enabled'=>'$conf->bom->enabled',  // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-        */
 		/* END MODULEBUILDER LEFTMENU BILLOFMATERIALS */
 
 

htdocs/langs/en_US/mrp.lang

@@ -1,7 +1,9 @@
+MRPArea=MRP Area
 MenuBOM=Bills of material
+LatestBOMModified=Latest %s Bills of materials modified
 BillOfMaterials=Bill of Material
 BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material (BOM)
+ListOfBOMs=List of bills of material - BOM
 NewBOM=New bill of material
 ProductBOMHelp=Product to create with this BOM
 BOMsNumberingModules=BOM numbering templates

htdocs/main.inc.php

@@ -271,7 +271,6 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
 	//var_dump($conf->browser);
 
 	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
@@ -1092,9 +1091,10 @@ if (! function_exists("llxHeader"))
 		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		if ($conf->browser->layout == 'phone'){
+		//if ($conf->browser->layout == 'phone')
+		//{
 		    $morecssonbody.= ' sidebar-collapse';
-		}
+		//}
 
 		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
 
@@ -1255,7 +1255,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		print "\n";
 
 		if (GETPOST('version', 'int')) $ext='version='.GETPOST('version', 'int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider', 'int')?GETPOST('testmenuhider', 'int'):$conf->global->MAIN_TESTMENUHIDER);
 
 		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09')?'&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
 		$themeparam.=($ext?'&amp;'.$ext:'');
@@ -1810,7 +1809,7 @@ function top_menu_user(User $user, Translate $langs)
     <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu">
         <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle" data-toggle="dropdown">
             '.$userImage.'
-            <span class="hidden-xs maxwidth200">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 11).'</span>
+            <span class="hidden-xs maxwidth200 atoploginusername">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 11).'</span>
             <span class="fa fa-chevron-down" id="dropdown-icon-down"></span>
             <span class="fa fa-chevron-up hidden" id="dropdown-icon-up"></span>
         </a>

htdocs/mrp/index.php

@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/mrp/index.php
+ *       \ingroup    bom, mrp
+ *       \brief      Home page for BOM and MRP modules
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies","mrp"));
+
+// Security check
+$result=restrictedArea($user, 'bom|mrp');
+
+
+/*
+ * View
+ */
+
+$staticbom = new BOM($db);
+
+llxHeader('', $langs->trans("MRP"), '');
+
+print load_fiche_titre($langs->trans("MRPArea"));
+
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/*
+ * Statistics
+ */
+
+if ($conf->use_javascript_ajax)
+{
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder nohover" width="100%">';
+    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
+    print '<tr><td class="center" colspan="2">';
+
+
+
+
+    print '</table>';
+    print '</div>';
+}
+
+print '<br>';
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+/*
+ * Last modified BOM
+ */
+$max=5;
+
+$sql = "SELECT a.rowid, a.status, a.ref, a.tms as datem";
+$sql.= " FROM ".MAIN_DB_PREFIX."bom_bom as a";
+$sql.= " WHERE a.entity IN (".getEntity('bom').")";
+$sql.= $db->order("a.tms", "DESC");
+$sql.= $db->plimit($max, 0);
+
+$resql=$db->query($sql);
+if ($resql)
+{
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder" width="100%">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="4">'.$langs->trans("LatestBOMModified", $max).'</th></tr>';
+
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+
+			$staticbom->id=$obj->rowid;
+			$staticbom->ref=$obj->ref;
+			$staticbom->date_modification=$obj->datem;
+
+			print '<tr class="oddeven">';
+			print '<td>'.$staticbom->getNomUrl(1, 32).'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
+			print '<td class="right">'.$staticbom->getLibStatut(5).'</td>';
+			print '</tr>';
+			$i++;
+		}
+	}
+	print "</table></div>";
+	print "<br>";
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+
+print '</div></div></div>';
+
+// End of page
+llxFooter();
+$db->close();

htdocs/theme/eldy/global.inc.php

@@ -979,10 +979,6 @@ td.showDragHandle {
 	transition: left 0.5s ease;
 }
 
-body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
-	display: none;
-}
-
 div.blockvmenulogo
 {
 	border-bottom: 0 !important;
@@ -1015,8 +1011,22 @@ div.vmenu, td.vmenu {
 }
 */
 
-/* For smartphone (testmenuhider is on) */
+
-<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+.menuhider { display: none !important; }
+
+/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 50, 0) + 12; ?>px)	/* reduction 3 */
+{
+body.sidebar-collapse .side-nav {
+	display: none;
+}
+
+body.sidebar-collapse .login_block {
+	display: none;
+}
+
+.menuhider { display: block !important; }
+
 #id-container {
 	width: 100%;
 }
@@ -1032,10 +1042,10 @@ div.blockvmenulogo
 {
 	border-bottom: 0 !important;
 }
-div.blockvmenusearch {
+/*div.blockvmenusearch {
 	padding-bottom: 12px !important;
 	border-bottom: 1px solid #e0e0e0;
-}
+}*/
 div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
 	border-top: none !important;
 	border-left: none !important;
@@ -1050,8 +1060,8 @@ div.fiche {
 	margin-<?php print $left; ?>: 9px !important;
 	margin-<?php print $right; ?>: 10px !important;
 }
-<?php } ?>
+<?php //} ?>
-
+}
 
 
 div.fiche {
@@ -5588,8 +5598,8 @@ div.tabsElem a.tab {
 }
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize)?$fontsize.'px':$fontsize ?> */
-/* rule to reduce top menu - 1st reduction */
+/* rule to reduce top menu - 1st reduction: Reduce width of top menu icons */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * 91, 0) + 24; ?>px)	/* reduction 1 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 91, 0) + 124; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
 	    width: <?php echo round(52); ?>px;	/* size of viewport */
@@ -5621,8 +5631,8 @@ div.tabsElem a.tab {
 		max-width: 300px;
 	}
 }
-/* rule to reduce top menu - 2nd reduction */
+/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * 75, 0) + 24; ?>px)	/* reduction 2 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 74, 0); ?>px)	/* reduction 2 */
 {
 	div.mainmenu {
 		height: 23px;
@@ -5645,8 +5655,8 @@ div.tabsElem a.tab {
     	left: 4px;
 	}
 }
-/* rule to reduce top menu - 3rd reduction */
+/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
-@media only screen and (max-width: <?php echo round($nbtopmenuentries * 49, 0) + 12; ?>px)	/* reduction 3 */
+@media only screen and (max-width: <?php echo round($nbtopmenuentries * 50, 0) + 12; ?>px)	/* reduction 3 */
 {
 	.side-nav {
 		z-index: 200;
@@ -5680,19 +5690,15 @@ div.tabsElem a.tab {
 		min-width: 0;
 		width: 100%;
 	}
+	div.login_block a {
+        color: unset;
+    }
 	div.login_block {
-		<?php if ($conf->browser->layout == 'phone' && ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
 		/* Style when phone layout or when using the menuhider */
-		padding-top: 20px;
+		padding-top: 10px;
 		padding-left: 20px;
     	padding-right: 20px;
     	padding-bottom: 16px;
-		<?php } else { ?>
-		padding-top: 5px;
-		padding-left: 5px;
-    	padding-right: 5px;
-    	padding-bottom: 5px;
-    	<?php } ?>
 		top: inherit !important;
 		left: 0 !important;
 		text-align: center;
@@ -5703,9 +5709,15 @@ div.tabsElem a.tab {
         height: 50px;
 
     	z-index: 202;
-    	min-width: 190px;
+    	min-width: 200px;      /* must be width of menu + padding + padding of sidenav */
-    	max-width: 190px;
+    	max-width: 200px;      /* must be width of menu + padding + padding of sidenav */
-    	width: 190px;
+    	width: 200px;          /* must be width of menu + padding + padding of sidenav */
+    }
+    .side-nav-vert .user-menu .dropdown-menu {
+        width: 234px !important;
+    }
+    div.login_block_other {
+        margin-right: unset;
     }
 	div.login_block_user, div.login_block_other { clear: both; }
 	.atoplogin, .atoplogin:hover

htdocs/theme/md/style.css.php

@@ -1160,7 +1160,7 @@ td.showDragHandle {
 	display: block;
 	font-family: "RobotoDraft","Roboto",sans-serif;
 	left: 0;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 <?php } else { ?>
 	position: fixed;
 	top: 50px;
@@ -1189,7 +1189,7 @@ td.showDragHandle {
 	-moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	-webkit-overflow-scrolling: touch;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 <?php } else { ?>
 	overflow-x: hidden;
 	overflow-y: auto;
@@ -1217,7 +1217,7 @@ body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right {
 	margin-left: 228px;
 }
 body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 	left: -240px;
 <?php } else { ?>
 	left: -229px;
@@ -1232,7 +1232,7 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block {
 <?php } ?>
 
 /* For smartphone (testmenuhider is on) */
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 #id-container {
 	width: 100%;
 }
@@ -1245,7 +1245,7 @@ div.login_block {
 }
 
 .side-nav {
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 <?php } else { ?>
 	overflow-x: initial !important;
 	overflow-y: scroll;
@@ -1293,7 +1293,7 @@ div.login_block {
 	z-index: 91;
 	background: rgb(<?php echo $colorbackvmenu1; ?>);
 	border-right: 1px solid rgba(0,0,0,0.3);
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 	top: 50px ! important;
 <?php } else { ?>
 	top: 60px ! important;
@@ -2014,7 +2014,7 @@ div.login_block {
     padding-bottom: 3px;
 	<?php print $left; ?>: 0;
 	top: 0px;
-<?php if (in_array($conf->browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?>
+<?php if (in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
 	position: absolute;
 <?php } else { ?>
 	position: fixed;

htdocs/website/index.php

@@ -41,10 +41,7 @@ $langs->loadLangs(array("admin","other","website","errors"));
 
 if (! $user->rights->website->read) accessforbidden();
 
-if (! ((GETPOST('testmenuhider', 'int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)))
+$conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
-{
-	$conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
-}
 
 $error=0;
 $websitekey=GETPOST('website', 'alpha');