From fde683199ec939a2dc8d8bc2d352ae8720c87d84 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Jul 2009 15:02:00 +0000 Subject: [PATCH] Fix: Top menu selection was not lost when clickin on module left menu --- .../menus/barre_top/auguria_backoffice.php | 5 +++- .../menus/barre_top/auguria_frontoffice.php | 5 +++- .../menus/barre_top/eldy_backoffice.php | 7 ++++- .../menus/barre_top/eldy_frontoffice.php | 4 +++ htdocs/includes/menus/barre_top/rodolphe.php | 26 +++++++++++-------- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/htdocs/includes/menus/barre_top/auguria_backoffice.php b/htdocs/includes/menus/barre_top/auguria_backoffice.php index 9a79722f5d1..a2ec6d03847 100644 --- a/htdocs/includes/menus/barre_top/auguria_backoffice.php +++ b/htdocs/includes/menus/barre_top/auguria_backoffice.php @@ -95,7 +95,10 @@ class MenuTop { } $url.="idmenu=".$tabMenu[$i]['rowid']; } - if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; + + // Define the class (top menu selected or not) + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; else $class='class="tmenu"'; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '
  • '; diff --git a/htdocs/includes/menus/barre_top/auguria_frontoffice.php b/htdocs/includes/menus/barre_top/auguria_frontoffice.php index cb7372bfe6b..e629c29adcc 100644 --- a/htdocs/includes/menus/barre_top/auguria_frontoffice.php +++ b/htdocs/includes/menus/barre_top/auguria_frontoffice.php @@ -95,7 +95,10 @@ class MenuTop { } $url.="idmenu=".$tabMenu[$i]['rowid']; } - if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; + + // Define the class (top menu selected or not) + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; else $class='class="tmenu"'; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '
  • '; diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index c310f6c7377..8edea1d1202 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -402,7 +402,8 @@ class MenuTop { } } - // Affichage des menus personnalises + + // Show personalized menus require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($this->db,'eldy','top'); @@ -430,8 +431,12 @@ class MenuTop { } $url.="idmenu=".$tabMenu[$i]['rowid']; } + + // Define the class (top menu selected or not) if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; else $class='class="tmenu"'; + print ''; print 'atarget?" target=$this->atarget":"")).'>'; print $tabMenu[$i]['titre']; diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 95ab2038d90..7342e65ed86 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -430,8 +430,12 @@ class MenuTop { } $url.="idmenu=".$tabMenu[$i]['rowid']; } + + // Define the class (top menu selected or not) if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; else $class='class="tmenu"'; + print ''; print 'atarget?" target=$this->atarget":"")).'>'; print $tabMenu[$i]['titre']; diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 27eecd19af0..e4ae1d36f1d 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -18,15 +18,15 @@ */ /** - \file htdocs/includes/menus/barre_top/rodolphe.php - \brief Gestionnaire nomme rodolphe du menu du haut - \version $Id$ - - \remarks La construction d'un gestionnaire pour le menu du haut est simple: - \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut - \remarks doivent etre affichees par ... - \remarks ou si menu selectionne ... -*/ + * \file htdocs/includes/menus/barre_top/rodolphe.php + * \brief Gestionnaire nomme rodolphe du menu du haut + * \version $Id$ + * + * \remarks La construction d'un gestionnaire pour le menu du haut est simple: + * \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut + * \remarks doivent etre affichees par ... + * \remarks ou si menu selectionne ... + */ /** @@ -370,8 +370,12 @@ class MenuTop { $url.='mainmenu='.$tabMenu[$i]['mainmenu'].'&leftmenu='; $url.="&idmenu=".$tabMenu[$i]['rowid']; } - if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; - else $class='class="tmenu"'; + + // Define the class (top menu selected or not) + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; + else $class='class="tmenu"'; + print 'atarget?" target=$this->atarget":"")).'>'; print $tabMenu[$i]['titre']; print '';