diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index f1df39f42f9..28e2748b3d2 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -205,8 +205,8 @@ class Conf //var_dump($this->modules); // Clean some variables - if (empty($this->global->MAIN_MENU_BARRETOP)) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php"; - if (empty($this->global->MAIN_MENUFRONT_BARRETOP)) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_frontoffice.php"; + if (empty($this->global->MAIN_MENU_STANDARD)) $this->global->MAIN_MENU_STANDARD="eldy_backoffice.php"; + if (empty($this->global->MAIN_MENUFRONT_STANDARD)) $this->global->MAIN_MENUFRONT_STANDARD="eldy_frontoffice.php"; if (empty($this->global->MAIN_MENU_SMARTPHONE)) $this->global->MAIN_MENU_SMARTPHONE="iphone_backoffice.php"; if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) $this->global->MAIN_MENUFRONT_SMARTPHONE="iphone_frontoffice.php"; diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index 4b4f888552a..4d43cf32ccd 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -127,8 +127,9 @@ class FormAdmin * @param selected Preselected menu value * @param htmlname Name of html select * @param dirmenu Directory to scan + * @param moreattrib More attributes on html select tag */ - function select_menu($selected='',$htmlname,$dirmenu) + function select_menu($selected='', $htmlname, $dirmenu, $moreattrib='') { global $langs,$conf; @@ -152,7 +153,7 @@ class FormAdmin $prefix=''; if (preg_match('/^eldy|^iphone/i',$file)) $prefix='0'; // 0=Recommanded, 1=Experimental, 2=Other else $prefix='2'; - + if ($file == $selected) { $menuarray[$prefix.'_'.$file]=''; @@ -170,7 +171,7 @@ class FormAdmin ksort($menuarray); // Affichage liste deroulante des menus - print ''; $oldprefix=''; foreach ($menuarray as $key => $val) { @@ -224,7 +225,7 @@ class FormAdmin if (preg_match('/^empty/i',$filelib)) continue; if (preg_match('/\.lib/i',$filelib)) continue; if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue; - + $menuarray[$filelib]=1; } $menuarray['all']=1;