Fix param dol_invisible_topmenu

Conflicts:
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2018-06-29 00:19:43 +02:00
parent 5775dced37
commit 346bf7bdd6

View File

@ -1059,7 +1059,7 @@ if (! function_exists("llxHeader"))
print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n"; print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
// top menu and left menu area // top menu and left menu area
if (empty($conf->dol_hide_topmenu)) if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int'))
{ {
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url); top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
} }
@ -1480,11 +1480,11 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
/* /*
* Top menu * Top menu
*/ */
if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU'))) if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu','int')) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
{ {
print "\n".'<!-- Start top horizontal -->'."\n"; print "\n".'<!-- Start top horizontal -->'."\n";
print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu. dol_invisible_topmenu means we output menu but we make it invisible. print '<div class="side-nav-vert'.(GETPOST('dol_invisible_topmenu','int')?' hidden':'').'"><div id="id-top">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
// Show menu entries // Show menu entries
print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n"; print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";