diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 4cd18c35bd4..bc7a429b165 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -156,10 +156,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''.$langs->trans("DefaultMenuManager").''; print ''; - print $htmladmin->select_menu($conf->global->MAIN_MENU_STANDARD,'MAIN_MENU_STANDARD',$dirtop); + print $htmladmin->select_menu(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED, 'MAIN_MENU_STANDARD', $dirtop, empty($conf->global->MAIN_MENU_STANDARD_FORCED)?'':' disabled="disabled"'); print ''; print ''; - print $htmladmin->select_menu($conf->global->MAIN_MENUFRONT_STANDARD,'MAIN_MENUFRONT_STANDARD',$dirtop); + print $htmladmin->select_menu(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED, 'MAIN_MENUFRONT_STANDARD', $dirtop, empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?'':' disabled="disabled"'); print ''; print ''; @@ -169,10 +169,10 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=!$var; print ''.$langs->trans("DefaultMenuSmartphoneManager").''; print ''; - print $htmladmin->select_menu($conf->global->MAIN_MENU_SMARTPHONE,'main_menu_smartphone',$dirsmartphone); + print $htmladmin->select_menu(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED, 'main_menu_smartphone', $dirsmartphone, empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?'':' disabled="disabled"'); print ''; print ''; - print $htmladmin->select_menu($conf->global->MAIN_MENUFRONT_SMARTPHONE,'main_menufront_smartphone',$dirsmartphone); + print $htmladmin->select_menu(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED, 'main_menufront_smartphone', $dirsmartphone, empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?'':' disabled="disabled"'); print ''; print ''; } @@ -205,11 +205,11 @@ else $var=!$var; print ''.$langs->trans("DefaultMenuManager").''; print ''; - $filelib=preg_replace('/.php$/i','',$conf->global->MAIN_MENU_STANDARD); + $filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED)); print $filelib; print ''; print ''; - $filelib=preg_replace('/.php$/i','',$conf->global->MAIN_MENUFRONT_STANDARD); + $filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED)); print $filelib; print ''; print ''; @@ -220,11 +220,11 @@ else print ''; print ''.$langs->trans("DefaultMenuSmartphoneManager").''; print ''; - $filelib=preg_replace('/.php$/i','',$conf->global->MAIN_MENU_SMARTPHONE); + $filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED)); print $filelib; print ''; print ''; - $filelib=preg_replace('/.php$/i','',$conf->global->MAIN_MENUFRONT_SMARTPHONE); + $filelib=preg_replace('/.php$/i','',(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)); print $filelib; print ''; print ''; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 576fc44c332..007295de3cf 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -669,16 +669,16 @@ if (! empty($_GET["theme"])) // Define menu manager to use if (empty($user->societe_id)) // If internal user or not defined { - $conf->top_menu=$conf->global->MAIN_MENU_STANDARD; - $conf->smart_menu=$conf->global->MAIN_MENU_SMARTPHONE; + $conf->top_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED); + $conf->smart_menu=(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED); // For backward compatibility if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php'; if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php'; } else // If external user { - $conf->top_menu=$conf->global->MAIN_MENUFRONT_STANDARD; - $conf->smart_menu=$conf->global->MAIN_MENUFRONT_SMARTPHONE; + $conf->top_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED); + $conf->smart_menu=(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED); // For backward compatibility if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_frontoffice.php'; if ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_frontoffice.php'; @@ -1065,6 +1065,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a include_once(DOL_DOCUMENT_ROOT."/includes/menus/standard/".$top_menu); } + print "\n".''."\n"; if ($conf->use_javascript_ajax && $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) print '
'."\n";