diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php
index e5b27f037ef..972ad655579 100644
--- a/htdocs/includes/menus/barre_top/eldy_backoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php
@@ -36,6 +36,8 @@
class MenuTop {
var $require_left=array("eldy_backoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
+ var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu
+
var $atarget=""; // Valeur du target a utiliser dans les liens
@@ -78,8 +80,8 @@ class MenuTop {
{
$class = 'class="tmenu"';
}
-
- print '';
+ $idsel='id="home" ';
+ print '';
// Third parties
@@ -98,12 +100,17 @@ class MenuTop {
$class = 'class="tmenu"';
}
- if (($conf->societe->enabled && $user->rights->societe->lire)
+ $idsel='id="companies" ';
+ if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
- print '';
- else
- print '';
- }
+ {
+ print '';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
+ }
// Products-Services
@@ -125,34 +132,16 @@ class MenuTop {
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
+ $idsel='id="products" ';
if ($user->rights->produit->lire)
- print '';
- else
- print '';
- }
-
- // Suppliers
-/*
- if ($conf->fournisseur->enabled)
- {
- $langs->load("suppliers");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{
- $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ print '';
}
else
{
- $class = 'class="tmenu"';
+ if (! $this->hideifnotallowed) print '';
}
-
- if ($user->rights->fournisseur->lire)
- print '';
- else
- print '';
}
-*/
// Commercial
/*$showcommercial=0;
@@ -176,11 +165,16 @@ class MenuTop {
$class = 'class="tmenu"';
}
- if($user->rights->societe->lire)
- print '';
+ $idsel='id="commercial" ';
+ if($user->rights->societe->lire)
+ {
+ print '';
+ }
else
- print '';
- }
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
+ }
// Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
@@ -198,11 +192,16 @@ class MenuTop {
$class = 'class="tmenu"';
}
+ $idsel='id="accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
// Projects
@@ -220,10 +219,15 @@ class MenuTop {
$class = 'class="tmenu"';
}
+ $idsel='id="project" ';
if ($user->rights->projet->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
// Tools
@@ -242,12 +246,15 @@ class MenuTop {
$class = 'class="tmenu"';
}
+ $idsel='id="tools" ';
if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
- //print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'';
- //print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'';
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
// Telephonie
@@ -263,7 +270,8 @@ class MenuTop {
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="telephonie" ';
+ print '';
}
// Energie
@@ -280,7 +288,8 @@ class MenuTop {
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="energie" ';
+ print '';
}
// OSCommerce 1
@@ -298,7 +307,8 @@ class MenuTop {
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="shop" ';
+ print '';
}
// OSCommerce 2
@@ -316,13 +326,14 @@ class MenuTop {
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="shop" ';
+ print '';
}
// Members
if ($conf->adherent->enabled)
{
- // $langs->load("members"); Added in main file to increase
+ // $langs->load("members"); Added in main file
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
@@ -334,10 +345,15 @@ class MenuTop {
$class = 'class="tmenu"';
}
+ $idsel='id="members" ';
if ($user->rights->adherent->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
@@ -351,7 +367,8 @@ class MenuTop {
{
if ($tabMenu[$i]['enabled'] == true)
{
- if ($tabMenu[$i]['right'] == true)
+ $idsel=(empty($tabMenu[$i]['mainmenu'])?'id="none" ':'id="'.$tabMenu[$i]['mainmenu'].'" ');
+ if ($tabMenu[$i]['right'] == true)
{
$url=DOL_URL_ROOT.$tabMenu[$i]['url'];
if (! eregi('\?',DOL_URL_ROOT.$tabMenu[$i]['url'])) $url.='?';
@@ -360,15 +377,13 @@ class MenuTop {
$url.="&idmenu=".$tabMenu[$i]['rowid'];
if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"';
else $class='class="tmenu"';
- // Define idsel
- $idsel='';
print '';
}
else
{
- print '';
+ if (! $this->hideifnotallowed) print '';
}
}
}
diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
index 9458a7dc61e..0fd70c15859 100644
--- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php
+++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2007 Regis Houssin
*
* 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
@@ -17,12 +18,12 @@
*/
/**
- \file htdocs/includes/menus/barre_top/eldy_frontoffice.php
+ \file htdocs/includes/menus/barre_top/eldy_backoffice.php
\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 entetes de menu a faire apparaitre dans la barre du haut
+ \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
\remarks doivent etre affichees par
\remarks ou si menu selectionne
*/
@@ -35,6 +36,8 @@
class MenuTop {
var $require_left=array("eldy_frontoffice"); // Si doit etre en phase avec un gestionnaire de menu gauche particulier
+ var $hideifnotallowed=true; // Put 0 for back office menu, 1 for front office menu
+
var $atarget=""; // Valeur du target a utiliser dans les liens
@@ -71,14 +74,14 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
-
- print '';
+ $idsel='id="home" ';
+ print '';
// Third parties
@@ -90,19 +93,25 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
-
- if (($conf->societe->enabled && $user->rights->societe->lire)
+
+ $idsel='id="companies" ';
+ if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
- print '';
- else
- print '';
- }
+ {
+ print '';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
+ }
+
// Products-Services
if ($conf->produit->enabled || $conf->service->enabled)
@@ -112,7 +121,7 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
@@ -123,36 +132,17 @@ class MenuTop {
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
-/*
+ $idsel='id="products" ';
if ($user->rights->produit->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
-*/
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
- // Suppliers
-/*
- if ($conf->fournisseur->enabled)
- {
- $langs->load("suppliers");
-
- $class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
- {
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
- }
- else
- {
- $class = 'class="tmenu"';
- }
-
- if ($user->rights->fournisseur->lire)
- print '';
- else
- print '';
- }
-*/
// Commercial
/*$showcommercial=0;
if ($conf->societe->enabled) $showcommercial=1;
@@ -168,18 +158,23 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
-
- if($user->rights->societe->lire)
- print '';
+
+ $idsel='id="commercial" ';
+ if($user->rights->societe->lire)
+ {
+ print '';
+ }
else
- print '';
- }
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
+ }
// Financial
if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled
@@ -190,18 +185,23 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
-
+
+ $idsel='id="accountancy" ';
if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
// Projects
@@ -212,19 +212,22 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
{
- $class = 'class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
-
-/*
+
+ $idsel='id="project" ';
if ($user->rights->projet->lire)
- print '';
+ {
+ print '';
+ }
else
- print '';
-*/
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
// Tools
@@ -236,35 +239,39 @@ class MenuTop {
$class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
{
- $class = 'class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
+ $idsel='id="tools" ';
if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire)
- //print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'';
- //print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'';
- print '';
+ {
+ print '';
+ }
else
- print '';
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
}
- // Telephonie
+ // Telephonie
if ($conf->telephonie->enabled && $user->rights->telephonie->lire)
{
$class="";
if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="telephonie" ';
+ print '';
}
// Energie
@@ -274,70 +281,117 @@ class MenuTop {
$class="";
if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"]))
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
- print '';
+ $idsel='id="energie" ';
+ print '';
}
- // Members
- if ($conf->adherent->enabled)
+ // OSCommerce 1
+ if ($conf->boutique->enabled)
{
- // $langs->load("members"); Added in main file to increase
+ $langs->load("shop");
$class="";
- if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
{
- $class='class="tmenusel" id="xxx"'; $_SESSION['idmenu']='';
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
}
else
{
$class = 'class="tmenu"';
}
- if ($user->rights->adherent->lire)
- print '';
- else
- print '';
+ $idsel='id="shop" ';
+ print '';
}
+ // OSCommerce 2
+ if ($conf->oscommerce2->enabled)
+ {
+ $langs->load("shop");
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="shop" ';
+ print '';
+ }
+
+ // Members
+ if ($conf->adherent->enabled)
+ {
+ // $langs->load("members"); Added in main file
+
+ $class="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
+ {
+ $class='class="tmenusel"'; $_SESSION['idmenu']='';
+ }
+ else
+ {
+ $class = 'class="tmenu"';
+ }
+
+ $idsel='id="members" ';
+ if ($user->rights->adherent->lire)
+ {
+ print '';
+ }
+ else
+ {
+ if (! $this->hideifnotallowed) print '';
+ }
+ }
+
// Affichage des menus personnalises
require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php");
$menuArbo = new Menubase($this->db,'eldy','top');
- $tabMenu = $menuArbo->menuTopCharger(1,$_SESSION['mainmenu'],'eldy');
- for($i=0; $imenuTopCharger(0,$_SESSION['mainmenu'],'eldy');
+
+ for($i=0; $i