Fix: Top menu selection was not lost when clickin on module left menu
This commit is contained in:
parent
e92ad7ec23
commit
fde683199e
@ -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 '<li class="tmenu" id="li_'.$idsel.'">';
|
||||
|
||||
@ -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 '<li class="tmenu" id="li_'.$idsel.'">';
|
||||
|
||||
@ -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 '<td class="tmenu" id="td_'.$idsel.'">';
|
||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||
print $tabMenu[$i]['titre'];
|
||||
|
||||
@ -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 '<td class="tmenu" id="td_'.$idsel.'">';
|
||||
print '<a '.$class.' id="mainmenu_'.$idsel.'" href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||
print $tabMenu[$i]['titre'];
|
||||
|
||||
@ -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 <a class="tmenu" href="...?mainmenu=...">...</a>
|
||||
\remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
|
||||
*/
|
||||
* \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 <a class="tmenu" href="...?mainmenu=...">...</a>
|
||||
* \remarks ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
@ -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 '<td class="tmenu"><a '.$class.' '.$idsel.'href="'.$url.'"'.($tabMenu[$i]['atarget']?" target='".$tabMenu[$i]['atarget']."'":($this->atarget?" target=$this->atarget":"")).'>';
|
||||
print $tabMenu[$i]['titre'];
|
||||
print '</a></td>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user