From a17121f4646cd5f8fa1314ca711ecb40ca146b66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 1 Jan 2005 20:14:03 +0000
Subject: [PATCH] =?UTF-8?q?New:=20Possibilit=E9=20de=20choisir=20son=20ges?=
 =?UTF-8?q?tionnaire=20pour=20le=20menu=20de=20gauche=20sur=20le=20m=EAme?=
 =?UTF-8?q?=20principe=20que=20celui=20du=20haut.=20Les=20gestionnaires=20?=
 =?UTF-8?q?sont=20=E0=20placer=20dans=20le=20r=E9pertoire=20includes/menus?=
 =?UTF-8?q?/barre=5Fleft.=20Le=20gestionnaire=20par=20defaut=20ne=20fait?=
 =?UTF-8?q?=20rien,=20ce=20qui=20=E9quivaut=20=E0=20prendre=20la=20gestion?=
 =?UTF-8?q?=20courante=20des=20menus=20(bas=E9s=20sur=20les=20fichiers=20p?=
 =?UTF-8?q?re.inc.php)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/main.inc.php   | 16 ++--------------
 htdocs/master.inc.php | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 34ab6501915..6d85c5d0ee8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -191,11 +191,7 @@ function top_menu($head, $title="", $target="")
 
   print '<a class="tmenu" id="'.$id.'" href="'.DOL_URL_ROOT.'/index.php"'.($target?" target=$target":"").'>'.$langs->trans("Home").'</a>';
 
-  if (!defined(MAIN_MENU_BARRETOP))
-    {
-      define("MAIN_MENU_BARRETOP","default.php");
-    }
-  require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".MAIN_MENU_BARRETOP);
+  require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".$conf->top_menu);
 
   // Lien sur fiche du login
   print '<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'">'.$user->login.'</a>' ;
@@ -224,17 +220,9 @@ function left_menu($menu, $help_url='', $form_search='')
 {
   global $user, $conf, $langs;
 
-
-  if (! defined(MAIN_MENU_BARRELEFT))
-    {
-      define("MAIN_MENU_BARRELEFT","default.php");
-    }
-
   // Si un gestionnaire de menu gauche est actif, on l'utilise:
   // Ce gestionnnaire est libre d'écrasé ou non l'objet $menu qui détermine le menu à afficher.
-  require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".MAIN_MENU_BARRELEFT);
-
- 
+  require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_left/".$conf->left_menu);
 
   print '<div class="vmenuplusfiche" width="158">'."\n";
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index cbacc60afbf..cd10ca8d0fe 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -24,7 +24,7 @@
  *
  */
 
-/*!
+/**
     \file       htdocs/master.inc.php
     \brief      Fichier de preparation de l'environnement Dolibarr
     \version    $Revision$
@@ -137,6 +137,21 @@ if ($result)
     }
 }
 
+
+/*
+ * Positionne les gestionnaires de menu
+ */
+if (! defined(MAIN_MENU_BARRETOP))
+{
+  define("MAIN_MENU_BARRETOP","default.php");
+}
+if (! defined(MAIN_MENU_BARRELEFT))
+{
+  define("MAIN_MENU_BARRELEFT","default.php");
+}
+$conf->top_menu=MAIN_MENU_BARRETOP;
+$conf->left_menu=MAIN_MENU_BARRELEFT;
+
 /*
  * Positionne le langage et localisation dans $conf->langage
  * et charge l'objet de traduction