Skip to content
Snippets Groups Projects
Commit add221b9 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Problème sur le menu webcalendar. C'est un autre menu qui apparaissait sélectionné.

parent 50523a94
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/includes/menus/barre_top/eldy.php
+ 8
− 6
View file @ add221b9
......@@ -108,6 +108,7 @@ class MenuTop {
print '<a '.$class.' href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'</a>';
}
// Products-Services
if ($conf->produit->enabled || $conf->service->enabled)
{
$langs->load("products");
......@@ -130,6 +131,7 @@ class MenuTop {
}
// Supplier
if ($conf->fournisseur->enabled)
{
$langs->load("suppliers");
......@@ -147,6 +149,7 @@ class MenuTop {
print '<a '.$class.' href="'.DOL_URL_ROOT.'/fourn/index.php?mainmenu=suppliers&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'</a>';
}
// Commercial
if ($conf->commercial->enabled)
{
$langs->load("commercial");
......@@ -165,6 +168,7 @@ class MenuTop {
}
// Compta
if ($conf->compta->enabled || $conf->banque->enabled || $conf->caisse->enabled)
{
$langs->load("compta");
......@@ -182,7 +186,8 @@ class MenuTop {
print '<a '.$class.' href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'</a>';
}
// Tools
if (1 == 1) {
$langs->load("other");
......@@ -199,16 +204,13 @@ class MenuTop {
print '<a '.$class.' href="'.DOL_URL_ROOT.'/comm/mailing/index.php?mainmenu=tools&leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'</a>';
}
// Webcal
if ($conf->webcal->enabled)
{
$langs->load("other");
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "webcalendar")
{
$class='class="tmenu" id="sel"';
}
elseif (ereg("^".DOL_URL_ROOT."\/projet\/webcal",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/webcalendar\/",$_SERVER["PHP_SELF"]))
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "webcal")
{
$class='class="tmenu" id="sel"';
}
......
htdocs/projet/webcal.php
+ 5
− 4
View file @ add221b9
<?php
/* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
......@@ -20,7 +20,7 @@
*
*/
/*! \file htdocs/projet/webcal.php
/** \file htdocs/projet/webcal.php
\ingroup webcalendar
\brief Page gnrant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage du calendrier
\author Laurent Destailleur
......@@ -29,8 +29,9 @@
require("./pre.inc.php");
$url=PHPWEBCALENDAR_URL;
$mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:"";
$leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:"";
print "
<html>
......@@ -39,7 +40,7 @@ print "
</head>
<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"webcaltop.php\" noresize scrolling=\"NO\" noborder>
<frame name=\"barre\" src=\"webcaltop.php?mainmenu=$mainmenu&leftmenu=$leftmenu\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"$url\">
<noframes>
<body>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment