diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f6ef44de0fe..212c5e32355 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -50,14 +50,18 @@ $searchformtitle=array($langs->trans("Companies"),$langs->trans("Contacts"),$lan
if (isset($_POST["action"]) && $_POST["action"] == 'update')
{
dolibarr_set_const($db, "MAIN_LANG_DEFAULT", $_POST["main_lang_default"]);
- dolibarr_set_const($db, "MAIN_MENU_BARRETOP", $_POST["main_menu_barretop"]);
- dolibarr_set_const($db, "MAIN_MENU_BARRELEFT", $_POST["main_menu_barreleft"]);
dolibarr_set_const($db, "SIZE_LISTE_LIMIT", $_POST["size_liste_limit"]);
dolibarr_set_const($db, "MAIN_DISABLE_JAVASCRIPT", $_POST["disable_javascript"]);
dolibarr_set_const($db, "MAIN_SHOW_BUGTRACK_LINK", $_POST["bugtrack"]);
dolibarr_set_const($db, "MAIN_SHOW_WORKBOARD", $_POST["workboard"]);
+ dolibarr_set_const($db, "MAIN_MENU_BARRETOP", $_POST["main_menu_barretop"]);
+ dolibarr_set_const($db, "MAIN_MENU_BARRELEFT", $_POST["main_menu_barreleft"]);
+
+ dolibarr_set_const($db, "MAIN_MENUFRONT_BARRETOP", $_POST["main_menufront_barretop"]);
+ dolibarr_set_const($db, "MAIN_MENUFRONT_BARRELEFT", $_POST["main_menufront_barreleft"]);
+
dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"]);
dolibarr_set_const($db, "MAIN_SEARCHFORM_CONTACT",$_POST["main_searchform_contact"]);
@@ -80,126 +84,114 @@ print "
\n";
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
- print '
';
- print '
';
+ print '';
+ print '
';
}
else
{
@@ -211,18 +203,6 @@ else
$var=!$var;
print '| '.$langs->trans("DefaultLanguage").' | ' . $conf->global->MAIN_LANG_DEFAULT . ' |
';
- $var=!$var;
- print '| '.$langs->trans("DefaultMenuTopManager").' | ';
- $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENU_BARRETOP);
- print $filelib;
- print ' |
';
-
- $var=!$var;
- print '| '.$langs->trans("DefaultMenuLeftManager").' | ';
- $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENU_BARRELEFT);
- print $filelib;
- print ' |
';
-
$var=!$var;
print '| '.$langs->trans("DefaultMaxSizeList").' | ' . $conf->global->SIZE_LISTE_LIMIT . ' |
';
@@ -241,10 +221,49 @@ else
print '
';
- // Skin
+
+ // Gestionnaires de menu
+ $var=true;
+
+ print '';
+ print '| '.$langs->trans("Menu").' | ';
+ print ''.$langs->trans("InternalUsers").' | ';
+ print ''.$langs->trans("ExternalUsers").' | ';
+ print '
';
+
+ $var=!$var;
+ print '| '.$langs->trans("DefaultMenuTopManager").' | ';
+ print '';
+ $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENU_BARRETOP);
+ print $filelib;
+ print ' | ';
+ print '';
+ $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENUFRONT_BARRETOP);
+ print $filelib;
+ print ' | ';
+ print '
';
+
+ $var=!$var;
+ print '';
+ print '| '.$langs->trans("DefaultMenuLeftManager").' | ';
+ print '';
+ $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENU_BARRELEFT);
+ print $filelib;
+ print ' | ';
+ print '';
+ $filelib=eregi_replace('\.php$','',$conf->global->MAIN_MENUFRONT_BARRELEFT);
+ print $filelib;
+ print ' | ';
+ print '
';
+
+ print '
';
+
+
+ // Themes
show_theme(0);
print '
';
+
// Liste des zone de recherche permanantes supportées
print '';
print '| '.$langs->trans("PermanentLeftSearchForm").' | '.$langs->trans("Activated").' |
';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 28235b1132f..639504349fc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -4,6 +4,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
DolibarrSetup=Dolibarr setup
+DolibarrUser=Dolibarr user
+InternalUser=Internal user
+ExternalUser=External user
+InternalUsers=Internal users
+ExternalUsers=External users
GlobalSetup=Global setup
GUISetup=GUI setup
DictionnarySetup=Dictionnary setup
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 4365495ec7d..ae27adf0fda 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -4,6 +4,11 @@ VersionExperimental=Exp
VersionDevelopment=Développement
VersionUnknown=Inconnue
DolibarrSetup=Installation de Dolibarr
+DolibarrUser=Utilisateur Dolibarr
+InternalUser=Utilisateur interne
+ExternalUser=Utilisateur externe
+InternalUsers=Utilisateurs internes
+ExternalUsers=Utilisateurs externes
GlobalSetup=Général
GUISetup=Interface
DictionnarySetup=Dictionnaires