Fix: Dans gestion menu top par defaut, on pouvait avoir le menu projet et webcalendar sélectionnés tous les deux.
This commit is contained in:
parent
7db7a38b21
commit
f5494dbc82
@ -164,21 +164,24 @@ class MenuTop {
|
|||||||
// Entrée projets
|
// Entrée projets
|
||||||
if ($conf->projet->enabled && $user->rights->projet->lire)
|
if ($conf->projet->enabled && $user->rights->projet->lire)
|
||||||
{
|
{
|
||||||
$langs->load("projects");
|
$langs->load("projects");
|
||||||
|
|
||||||
$class="";
|
$class="";
|
||||||
|
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product")
|
||||||
if (ereg("^".DOL_URL_ROOT."\/projet\/",$_SERVER["PHP_SELF"]))
|
|
||||||
{
|
{
|
||||||
$class='class="tmenu" id="sel"';
|
$class='class="tmenu" id="sel"';
|
||||||
}
|
}
|
||||||
else
|
if (ereg("^".DOL_URL_ROOT."\/projet\/[^w]",$_SERVER["PHP_SELF"]))
|
||||||
{
|
{
|
||||||
$class = 'class="tmenu"';
|
$class='class="tmenu" id="sel"';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$class = 'class="tmenu"';
|
||||||
}
|
}
|
||||||
|
|
||||||
$chaine.=$langs->trans("Projects");
|
$chaine.=$langs->trans("Projects");
|
||||||
print '<a '.$class.' href="'.DOL_URL_ROOT.'/projet/">'.$chaine.'</a>';
|
print '<a '.$class.' href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project">'.$chaine.'</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Entrée produit/service
|
// Entrée produit/service
|
||||||
@ -202,7 +205,7 @@ class MenuTop {
|
|||||||
$chaine="";
|
$chaine="";
|
||||||
if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
|
if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); }
|
||||||
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
|
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
|
||||||
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
|
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
|
||||||
|
|
||||||
print '<a '.$class.' href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products"'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a>';
|
print '<a '.$class.' href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products"'.($this->atarget?" target=$this->atarget":"").'>'.$chaine.'</a>';
|
||||||
|
|
||||||
@ -233,37 +236,36 @@ class MenuTop {
|
|||||||
// Entrée telephonie
|
// Entrée telephonie
|
||||||
if ($conf->telephonie->enabled && $user->rights->telephonie->lire)
|
if ($conf->telephonie->enabled && $user->rights->telephonie->lire)
|
||||||
{
|
{
|
||||||
$class="";
|
$class="";
|
||||||
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
|
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
|
||||||
{
|
{
|
||||||
$class='class="tmenu" id="sel"';
|
$class='class="tmenu" id="sel"';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$class = 'class="tmenu"';
|
$class = 'class="tmenu"';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<a '.$class.' href="'.DOL_URL_ROOT.'/telephonie/"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a>';
|
print '<a '.$class.' href="'.DOL_URL_ROOT.'/telephonie/"'.($this->atarget?" target=$this->atarget":"").'>Telephonie</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Entrée energie
|
// Entrée energie
|
||||||
if ($conf->energie->enabled)
|
if ($conf->energie->enabled)
|
||||||
{
|
{
|
||||||
$langs->load("energy");
|
$langs->load("energy");
|
||||||
$class="";
|
$class="";
|
||||||
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
|
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
|
||||||
{
|
{
|
||||||
$class='class="tmenu" id="sel"';
|
$class='class="tmenu" id="sel"';
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$class = 'class="tmenu"';
|
$class = 'class="tmenu"';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<a '.$class.' href="'.DOL_URL_ROOT.'/energie/"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a>';
|
print '<a '.$class.' href="'.DOL_URL_ROOT.'/energie/"'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'</a>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Entrée webcal
|
// Entrée webcal
|
||||||
if ($conf->webcal->enabled)
|
if ($conf->webcal->enabled)
|
||||||
{
|
{
|
||||||
@ -274,7 +276,7 @@ class MenuTop {
|
|||||||
{
|
{
|
||||||
$class='class="tmenu" id="sel"';
|
$class='class="tmenu" id="sel"';
|
||||||
}
|
}
|
||||||
elseif (ereg("^".DOL_URL_ROOT."\/projet\/",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"]))
|
elseif (ereg("^".DOL_URL_ROOT.".*\/webcal",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"]))
|
||||||
{
|
{
|
||||||
$class='class="tmenu" id="sel"';
|
$class='class="tmenu" id="sel"';
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user