diff --git a/htdocs/includes/menus/barre_top/eldy.php b/htdocs/includes/menus/barre_top/eldy.php
index b44801390d0..5c414ce5566 100644
--- a/htdocs/includes/menus/barre_top/eldy.php
+++ b/htdocs/includes/menus/barre_top/eldy.php
@@ -108,6 +108,7 @@ class MenuTop {
print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'';
}
+ // 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 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").'';
}
+ // 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 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Accountancy")."/".$langs->trans("Treasury").'';
}
-
+
+ // Tools
if (1 == 1) {
$langs->load("other");
@@ -199,16 +204,13 @@ class MenuTop {
print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'';
}
+ // 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"';
}
diff --git a/htdocs/projet/webcal.php b/htdocs/projet/webcal.php
index 06461f5a4c3..0a709afdc99 100644
--- a/htdocs/projet/webcal.php
+++ b/htdocs/projet/webcal.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2004-2005 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
@@ -20,7 +20,7 @@
*
*/
-/*! \file htdocs/projet/webcal.php
+/** \file htdocs/projet/webcal.php
\ingroup webcalendar
\brief Page générant 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 "
@@ -39,7 +40,7 @@ print "