From dccf9a2cc24d5fd4ec1bba0f1a1a91e69df9dc5e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 26 Jan 2008 17:39:45 +0000 Subject: [PATCH] =?UTF-8?q?Modif=20gestionnaires=20menu=20pour=20accepter?= =?UTF-8?q?=20des=20tables=20dans=20le=20libell=E9=20menu=20gauche?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/barre_left/auguria_backoffice.php | 5 ++--- .../menus/barre_left/auguria_frontoffice.php | 5 ++--- .../menus/barre_left/eldy_backoffice.php | 10 ++++++---- .../menus/barre_left/eldy_frontoffice.php | 6 +++++- htdocs/includes/menus/barre_left/rodolphe.php | 16 ++++++++++------ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/htdocs/includes/menus/barre_left/auguria_backoffice.php b/htdocs/includes/menus/barre_left/auguria_backoffice.php index 0b787ff0640..8520f012fe1 100644 --- a/htdocs/includes/menus/barre_left/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_backoffice.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007-2008 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 @@ -14,14 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/includes/menus/barre_left/auguria_backoffice.php \brief Gestionnaire du menu du gauche Auguria - \version $Revision$ + \version $Id$ \remarks La construction d'un gestionnaire pour le menu de gauche est simple: \remarks A l'aide d'un objet $newmenu=new Menu() et des méthode add et add_submenu, diff --git a/htdocs/includes/menus/barre_left/auguria_frontoffice.php b/htdocs/includes/menus/barre_left/auguria_frontoffice.php index 68ec3a39bf9..8b46df23d65 100644 --- a/htdocs/includes/menus/barre_left/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_left/auguria_frontoffice.php @@ -1,5 +1,6 @@ + * Copyright (C) 2007-2008 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 @@ -14,14 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/includes/menus/barre_left/auguria_frontoffice.php \brief Gestionnaire du menu du gauche Auguria - \version $Revision$ + \version $Id$ \remarks La construction d'un gestionnaire pour le menu de gauche est simple: \remarks A l'aide d'un objet $newmenu=new Menu() et des méthode add et add_submenu, diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index 47fb07bb64f..bd14ee85ae7 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -14,14 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* $Id$ */ /** \file htdocs/includes/menus/barre_left/eldy_backoffice.php \brief Gestionnaire du menu du gauche Eldy - \version $Revision$ + \version $Id$ \remarks La construction d'un gestionnaire pour le menu de gauche est simple: \remarks A l'aide d'un objet $newmenu=new Menu() et des méthode add et add_submenu, @@ -902,7 +900,11 @@ class MenuLeft { { if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; + print $this->menu_array[$i]['titre']; + print ''; + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu_array[$i]['titre'],''; } else { diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 501e6e282a4..52485dbbf3d 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -872,7 +872,11 @@ class MenuLeft { { if ($this->menu_array[$i]['enabled']) { - print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'
'; + print 'menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; + print $this->menu_array[$i]['titre']; + print ''; + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu_array[$i]['titre'],''; } else { diff --git a/htdocs/includes/menus/barre_left/rodolphe.php b/htdocs/includes/menus/barre_left/rodolphe.php index e430dba69d5..48cd8219088 100644 --- a/htdocs/includes/menus/barre_left/rodolphe.php +++ b/htdocs/includes/menus/barre_left/rodolphe.php @@ -14,13 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/includes/menus/barre_left/rodolphe.php \brief Gestionnaire par défaut du menu de gauche - \version $Revision$ + \version $Id$ \remarks La construction d'un gestionnaire pour le menu de gauche est simple: \remarks A l'aide d'un objet $newmenu=new Menu() et des méthode add et add_submenu, @@ -77,13 +75,19 @@ class MenuLeft { } if ($this->menu_array[$i]['level']==0) { - print ''.$this->menu_array[$i]['titre'].'
'; + print ''.$this->menu_array[$i]['titre'].''; + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu_array[$i]['titre'],''; } if ($this->menu_array[$i]['level']==1) { - print ''.$this->menu_array[$i]['titre'].'
'; + print ''.$this->menu_array[$i]['titre'].''; + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu_array[$i]['titre'],''; } if ($this->menu_array[$i]['level']==2) { - print '    '.$this->menu_array[$i]['titre'].'
'; + print '    '.$this->menu_array[$i]['titre'].''; + // If title is not pure text and contains a table, no carriage return added + if (! strstr($this->menu_array[$i]['titre'],''; } if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {