From 78d2817ba604fb5f35d3269085ba6a95b339cb73 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 8 Apr 2005 20:30:44 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20Simplification=20du=20m=E9canisme=20des?= =?UTF-8?q?=20gestionnaires=20de=20menu=20haut.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/includes/menus/barre_left/eldy.php | 5 +++-- htdocs/includes/menus/barre_top/default.php | 25 ++++++++++++++++----- htdocs/includes/menus/barre_top/eldy.php | 4 ++-- htdocs/includes/menus/barre_top/esprit.php | 23 +++++++++++-------- htdocs/main.inc.php | 9 +++----- 5 files changed, 42 insertions(+), 24 deletions(-) diff --git a/htdocs/includes/menus/barre_left/eldy.php b/htdocs/includes/menus/barre_left/eldy.php index 55fd62de90c..1bdc1892365 100644 --- a/htdocs/includes/menus/barre_left/eldy.php +++ b/htdocs/includes/menus/barre_left/eldy.php @@ -157,9 +157,10 @@ class MenuLeft { $langs->load("companies"); // Prospects - $newmenu->add(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); + $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 1, $user->rights->societe->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("List"), 1, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=prospects&type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire); // Clients @@ -177,7 +178,7 @@ class MenuLeft { { $langs->load("propal"); $newmenu->add(DOL_URL_ROOT."/comm/propal.php?leftmenu=propals", $langs->trans("Prop"), 0 ,$user->rights->propale->lire); - if ($leftmenu=="propals") $newmenu->add_submenu(DOL_URL_ROOT."/socite.php?leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer); + if ($leftmenu=="propals") $newmenu->add_submenu(DOL_URL_ROOT."/societe.php?leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer); if ($leftmenu=="propals") $newmenu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=0", $langs->trans("PropalsDraft"), 1, $user->rights->propale->lire); if ($leftmenu=="propals") $newmenu->add_submenu(DOL_URL_ROOT."/comm/propal.php?viewstatut=1", $langs->trans("PropalsOpened"), 1, $user->rights->propale->lire); if ($leftmenu=="propals") $newmenu->add_submenu(DOL_URL_ROOT."/comm/propal/stats/", $langs->trans("Statistics"), 1, $user->rights->propale->lire); diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php index bd8c4bdeb29..f79547e2c37 100644 --- a/htdocs/includes/menus/barre_top/default.php +++ b/htdocs/includes/menus/barre_top/default.php @@ -34,14 +34,14 @@ */ -/** \class MenuTop +/** + \class MenuTop \brief Classe permettant la gestion par défaut du menu du haut */ class MenuTop { var $require_left=array(); // Si doit etre en phase avec un gestionnaire de menu gauche particulier - var $showhome=true; // Faut-il afficher le menu Accueil par le main.inc.php var $atarget=""; // Valeur du target a utiliser dans les liens /** @@ -62,7 +62,18 @@ class MenuTop { global $conf,$langs; - + // Entrée home + $id=""; + if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")) + { + $id="sel"; + } + if (! ereg("^".DOL_URL_ROOT."\/(adherents|comm|compta|product|fourn|projet)\/",$_SERVER["PHP_SELF"])) { + $id="sel"; + } + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").''; + + // Entrée adherent if ($conf->adherent->enabled) { $langs->load("members"); @@ -84,6 +95,7 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").''; } + // Entrée commercial if ($conf->commercial->enabled) { $langs->load("commercial"); @@ -106,6 +118,7 @@ class MenuTop { } + // Entrée compta if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled) { $langs->load("compta"); @@ -128,6 +141,7 @@ class MenuTop { } + // Entrée produit/service if ($conf->produit->enabled || $conf->service->enabled) { $langs->load("products"); @@ -155,7 +169,7 @@ class MenuTop { } - + // Entrée fournisseur if ($conf->fournisseur->enabled) { $langs->load("suppliers"); @@ -177,7 +191,7 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").''; } - + // Entrée webcal if ($conf->webcal->enabled) { $langs->load("other"); @@ -198,6 +212,7 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Calendar").''; }; + } } diff --git a/htdocs/includes/menus/barre_top/eldy.php b/htdocs/includes/menus/barre_top/eldy.php index 8f8c4f2cc1f..a20d940fb94 100644 --- a/htdocs/includes/menus/barre_top/eldy.php +++ b/htdocs/includes/menus/barre_top/eldy.php @@ -32,14 +32,14 @@ */ -/** \class MenuTop +/** + \class MenuTop \brief Classe permettant la gestion du menu du haut Eldy */ class MenuTop { var $require_left=array("eldy"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier - var $showhome=false; // Faut-il afficher le menu Accueil par le main.inc.php var $atarget=""; // Valeur du target a utiliser dans les liens diff --git a/htdocs/includes/menus/barre_top/esprit.php b/htdocs/includes/menus/barre_top/esprit.php index 7c0d1d6b8ae..8536369aa18 100644 --- a/htdocs/includes/menus/barre_top/esprit.php +++ b/htdocs/includes/menus/barre_top/esprit.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,8 @@ * */ -/** \file htdocs/includes/menus/barre_top/esprit.php +/** + \file htdocs/includes/menus/barre_top/esprit.php \brief Gestionnaire du menu du haut spécialisé vente de CD/livres \version $Revision$ @@ -33,14 +34,14 @@ */ -/** \class MenuTop +/** + \class MenuTop \brief Classe permettant la gestion du menu du haut Esprit */ class MenuTop { var $require_left=array(); // Si doit etre en phase avec un gestionnaire de menu gauche particulier - var $showhome=true; // Faut-il afficher le menu Accueil par le main.inc.php var $atarget=""; // Valeur du target a utiliser dans les liens @@ -63,10 +64,14 @@ class MenuTop { $langs->load("commercial"); $langs->load("other"); - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Books").''; - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Customers").''; - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Criticals").''; - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Categories").''; + // Entrée home + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").''; + + // Autres entrées + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Books").''; + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Customers").''; + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Criticals").''; + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Categories").''; } } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 037f4742ec4..36f3583e838 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -188,15 +188,12 @@ function top_menu($head, $title="", $target="") */ print '
'."\n"; - // Autres entrées du menu par le gestionnaire + // Charge le gestionnaire des entrées de menu du haut require_once(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".$conf->top_menu); $menutop = new MenuTop($db); $menutop->atarget=$target; - if (! isset($menutop->showhome) || $menutop->showhome) { // Entrée Home/Accueil du menu - $id=""; - if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")) { $id="sel"; } - print ''.$langs->trans("Home").''; - } + + // Affiche le menu $menutop->showmenu(); // Lien sur fiche du login