From 583932a94d262c4bef8abacb0590560e0e50995b Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 4 Apr 2005 20:00:05 +0000 Subject: [PATCH] =?UTF-8?q?R=E9organisation=20des=20menus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/commande/pre.inc.php | 15 ++++++--------- htdocs/commande/stats/pre.inc.php | 19 ++++++++++--------- htdocs/expedition/pre.inc.php | 10 ++-------- htdocs/expedition/stats/pre.inc.php | 20 ++++++++------------ 4 files changed, 26 insertions(+), 38 deletions(-) diff --git a/htdocs/commande/pre.inc.php b/htdocs/commande/pre.inc.php index 2872fabce98..2d36bd32909 100644 --- a/htdocs/commande/pre.inc.php +++ b/htdocs/commande/pre.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2005 Rodolphe Quiedeville * Copyright (C) 2004-2005 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -22,18 +22,16 @@ */ /** - \file htdocs/commande/pre.inc.php - \ingroup commandes - \brief Gestionnaire du menu commandes - \version $Revision$ + \file htdocs/commande/pre.inc.php + \ingroup commandes + \brief Gestionnaire du menu commandes + \version $Revision$ */ require("../main.inc.php"); require("./commande.class.php"); - $langs->load("orders"); - function llxHeader($head = "", $title="", $help_url='') { global $user, $conf, $langs; @@ -44,13 +42,12 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders")); $menu->add_submenu(DOL_URL_ROOT."/commande/liste.php", $langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics")); if ($conf->expedition->enabled) { $menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings")); } - $menu->add(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics")); - left_menu($menu->liste, $help_url); } ?> diff --git a/htdocs/commande/stats/pre.inc.php b/htdocs/commande/stats/pre.inc.php index 71f3ba22996..0f79795b4d8 100644 --- a/htdocs/commande/stats/pre.inc.php +++ b/htdocs/commande/stats/pre.inc.php @@ -22,14 +22,15 @@ */ /*! - \file htdocs/commande/stats/pre.inc.php - \ingroup commandes - \brief Gestionnaire du menu commandes - \version $Revision$ + \file htdocs/commande/stats/pre.inc.php + \ingroup commandes + \brief Gestionnaire du menu commandes + \version $Revision$ */ require("../../main.inc.php"); require("../../bargraph.class.php"); +$langs->load("orders"); function llxHeader($head = "", $title="", $help_url='') { @@ -41,12 +42,12 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders")); $menu->add_submenu(DOL_URL_ROOT."/commande/liste.php", $langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics")); - if ($conf->expedition->enabled) { - $menu->add(DOL_URL_ROOT."/expedition/", "Expeditions"); - } - - $menu->add(DOL_URL_ROOT."/commande/stats/", $langs->trans("Statistics")); + if ($conf->expedition->enabled) + { + $menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings")); + } left_menu($menu->liste, $help_url); } diff --git a/htdocs/expedition/pre.inc.php b/htdocs/expedition/pre.inc.php index 0ea2c4d62ee..8b104cafc13 100644 --- a/htdocs/expedition/pre.inc.php +++ b/htdocs/expedition/pre.inc.php @@ -31,17 +31,12 @@ require("../main.inc.php"); require("../commande/commande.class.php"); require("./expedition.class.php"); - $langs->load("orders"); function llxHeader($head = "", $title="", $help_url='') { - global $user, $conf, $langs; + global $langs; - /* - * - * - */ top_menu($head, $title); $menu = new Menu(); @@ -50,8 +45,7 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings")); $menu->add_submenu(DOL_URL_ROOT."/expedition/liste.php", $langs->trans("List")); - - $menu->add(DOL_URL_ROOT."/expedition/stats/", $langs->trans("Statistics")); + $menu->add_submenu(DOL_URL_ROOT."/expedition/stats/", $langs->trans("Statistics")); left_menu($menu->liste, $help_url, $form_search, $author); } diff --git a/htdocs/expedition/stats/pre.inc.php b/htdocs/expedition/stats/pre.inc.php index 9db109105f6..c099c5fda96 100644 --- a/htdocs/expedition/stats/pre.inc.php +++ b/htdocs/expedition/stats/pre.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2003-2005 Rodolphe Quiedeville * * 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,26 +21,22 @@ */ require("../../main.inc.php"); require("../../bargraph.class.php"); +$langs->load("orders"); -function llxHeader($head = "", $urlp = "") +function llxHeader($head = "", $title="", $urlp = "") { global $langs; - top_menu($head); + top_menu($head, $title); $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/expedition/", "Expeditions"); - - - $menu->add("./", $langs->trans("Statistics")); + $menu->add(DOL_URL_ROOT."/commande/", $langs->trans("Orders")); + $menu->add(DOL_URL_ROOT."/expedition/", $langs->trans("Sendings")); + $menu->add_submenu(DOL_URL_ROOT."/expedition/liste.php", $langs->trans("List")); + $menu->add_submenu(DOL_URL_ROOT."/expedition/stats/", $langs->trans("Statistics")); left_menu($menu->liste); - /* - * - * - */ - } ?>