diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index 1d5a047d307..000a1d2dfce 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -15,20 +15,18 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
*/
/**
\file htdocs/includes/menus/barre_top/eldy_backoffice.php
\brief Gestionnaire nomm� eldy du menu du haut
- \version $Revision$
+ \version $Id$
\remarks La construction d'un gestionnaire pour le menu du haut est simple:
- \remarks Toutes les entr�es de menu � faire apparaitre dans la barre du haut
- \remarks doivent �tre affich�es par
- \remarks On peut �ventuellement ajouter l'attribut id="sel" dans la balise
- \remarks quand il s'agit de l'entr�e du menu qui est s�lectionn�e.
+ \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
+ \remarks doivent etre affichees par
+ \remarks On peut eventuellement ajouter l'attribut id="sel" dans la balise
+ \remarks quand il s'agit de l'entree du menu qui est selectionnee.
*/
@@ -83,7 +81,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -102,7 +100,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -125,7 +123,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -150,7 +148,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -171,7 +169,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -193,7 +191,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -207,28 +205,6 @@ class MenuTop {
print '';
}
- // Agenda
-/* if ($conf->agenda->enabled)
- {
- $langs->load("commercial");
- $langs->load("agenda");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "agenda")
- {
- $class='class="tmenu" id="sel"';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- if ($user->rights->agenda->myactions->read || $user->rights->agenda->allactions->read)
- print '';
- else
- print '';
- }
-*/
// Projects
if ($conf->projet->enabled)
{
@@ -237,7 +213,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -259,7 +235,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -280,7 +256,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -297,7 +273,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -315,7 +291,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -333,7 +309,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -351,7 +327,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 1116447d006..262659e8324 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -14,20 +14,18 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
*/
/**
\file htdocs/includes/menus/barre_top/eldy_frontoffice.php
- \brief Gestionnaire nomm� eldy du menu du haut
- \version $Revision$
+ \brief Gestionnaire nomme eldy du menu du haut
+ \version $Id$
\remarks La construction d'un gestionnaire pour le menu du haut est simple:
- \remarks Toutes les entr�es de menu � faire apparaitre dans la barre du haut
- \remarks doivent �tre affich�es par
- \remarks On peut �ventuellement ajouter l'attribut id="sel" dans la balise
- \remarks quand il s'agit de l'entr�e du menu qui est s�lectionn�e.
+ \remarks Toutes les ente�es de menu a faire apparaitre dans la barre du haut
+ \remarks doivent etre affice�es par
+ \remarks On peut eventuellement ajouter l'attribut id="sel" dans la balise
+ \remarks quand il s'agit de l'entree du menu qui est selectionnee.
*/
@@ -82,7 +80,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -101,7 +99,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -123,7 +121,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -150,7 +148,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -173,7 +171,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -195,7 +193,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -217,7 +215,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -241,7 +239,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -262,7 +260,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -279,7 +277,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -297,7 +295,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php
index 6e1cc350925..c9dce731e38 100644
--- a/htdocs/includes/menus/barre_top/rodolphe.php
+++ b/htdocs/includes/menus/barre_top/rodolphe.php
@@ -79,11 +79,13 @@ class MenuTop {
if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home"))
{
- $id="sel";
+ $id="sel"; $_SESSION['idmenu']='';
}
- if (! ereg("^".DOL_URL_ROOT."\/(adherents|comm|commande|compta|contrat|product|fichinter|fourn|telephonie|energie|boutique|oscommerce_ws|projet)\/",$_SERVER["PHP_SELF"])) {
- $id="sel";
+ if (! ereg("^".DOL_URL_ROOT."\/(adherents|comm|commande|compta|contrat|product|fichinter|fourn|telephonie|energie|boutique|oscommerce_ws|projet)\/",$_SERVER["PHP_SELF"])
+ && (! $_SESSION['idmenu'] && ! $_GET["idmenu"]))
+ {
+ $id="sel"; $_SESSION['idmenu']='';
}
else {
$id="";
@@ -98,11 +100,11 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -120,11 +122,12 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
- elseif (ereg("^".DOL_URL_ROOT."\/(comm|commande|contrat)\/",$_SERVER["PHP_SELF"]))
+ elseif (ereg("^".DOL_URL_ROOT."\/(comm|commande|contrat)\/",$_SERVER["PHP_SELF"])
+ && (! $_SESSION['idmenu'] && ! $_GET["idmenu"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -146,11 +149,11 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "compta")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -169,11 +172,11 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
if (ereg("^".DOL_URL_ROOT."\/projet\/[^w]",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -192,11 +195,11 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -219,11 +222,11 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
elseif (ereg("^".DOL_URL_ROOT."\/fourn\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -239,7 +242,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -256,7 +259,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -273,7 +276,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/boutique\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{
@@ -290,7 +293,7 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/oscommerce_ws\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenu" id="sel"';
+ $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
}
else
{