lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Selection double de menu

Browse Source
This commit is contained in:
Laurent Destailleur 2008-01-26 15:26:06 +00:00
parent a81f652e28
commit b5fa865774
3 changed files with 58 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/includes/menus/barre_top/eldy_backoffice.php
View File

@ -15,20 +15,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/includes/menus/barre_top/eldy_backoffice.php \file htdocs/includes/menus/barre_top/eldy_backoffice.php
\brief Gestionnaire nomm<EFBFBD> eldy du menu du haut \brief Gestionnaire nomm<EFBFBD> eldy du menu du haut
\version $Revision$ \version $Id$
\remarks La construction d'un gestionnaire pour le menu du haut est simple: \remarks La construction d'un gestionnaire pour le menu du haut est simple:
\remarks Toutes les entr<EFBFBD>es de menu <EFBFBD> faire apparaitre dans la barre du haut \remarks Toutes les entrees de menu a faire apparaitre dans la barre du haut
\remarks doivent <EFBFBD>tre affich<EFBFBD>es par <a class="tmenu" href="...?mainmenu=...">...</a> \remarks doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
\remarks On peut <EFBFBD>ventuellement ajouter l'attribut id="sel" dans la balise <a> \remarks On peut eventuellement ajouter l'attribut id="sel" dans la balise <a>
\remarks quand il s'agit de l'entr<EFBFBD>e du menu qui est s<EFBFBD>lectionn<EFBFBD>e. \remarks quand il s'agit de l'entree du menu qui est selectionnee.
*/ */
@ -83,7 +81,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -102,7 +100,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -125,7 +123,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -150,7 +148,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -171,7 +169,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -193,7 +191,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -207,28 +205,6 @@ class MenuTop {
print '<td class="tmenu"><font class="tmenudisabled">'.$langs->trans("MenuFinancial").'</font></td>'; print '<td class="tmenu"><font class="tmenudisabled">'.$langs->trans("MenuFinancial").'</font></td>';
} }
// 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 '<td class="tmenu"><a '.$class.' href="'.DOL_URL_ROOT.'/comm/action/index.php?mainmenu=agenda&amp;leftmenu="'.($this->atarget?" target=$this->atarget":"").'>'.$langs->trans("Agenda").'</a></td>';
else
print '<td class="tmenu"><font class="tmenudisabled">'.$langs->trans("Agenda").'</font></td>';
}
*/
// Projects // Projects
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
@ -237,7 +213,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -259,7 +235,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -280,7 +256,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -297,7 +273,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -315,7 +291,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -333,7 +309,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -351,7 +327,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {

36
htdocs/includes/menus/barre_top/eldy_frontoffice.php
View File

@ -14,20 +14,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/includes/menus/barre_top/eldy_frontoffice.php \file htdocs/includes/menus/barre_top/eldy_frontoffice.php
\brief Gestionnaire nomm<EFBFBD> eldy du menu du haut \brief Gestionnaire nomme eldy du menu du haut
\version $Revision$ \version $Id$
\remarks La construction d'un gestionnaire pour le menu du haut est simple: \remarks La construction d'un gestionnaire pour le menu du haut est simple:
\remarks Toutes les entr<EFBFBD>es de menu <EFBFBD> faire apparaitre dans la barre du haut \remarks Toutes les ente<EFBFBD>es de menu a faire apparaitre dans la barre du haut
\remarks doivent <EFBFBD>tre affich<EFBFBD>es par <a class="tmenu" href="...?mainmenu=...">...</a> \remarks doivent etre affice<EFBFBD>es par <a class="tmenu" href="...?mainmenu=...">...</a>
\remarks On peut <EFBFBD>ventuellement ajouter l'attribut id="sel" dans la balise <a> \remarks On peut eventuellement ajouter l'attribut id="sel" dans la balise <a>
\remarks quand il s'agit de l'entr<EFBFBD>e du menu qui est s<EFBFBD>lectionn<EFBFBD>e. \remarks quand il s'agit de l'entree du menu qui est selectionnee.
*/ */
@ -82,7 +80,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -101,7 +99,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -123,7 +121,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -150,7 +148,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -173,7 +171,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -195,7 +193,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -217,7 +215,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -241,7 +239,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -262,7 +260,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -279,7 +277,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -297,7 +295,7 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members")
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {

43
htdocs/includes/menus/barre_top/rodolphe.php
View File

@ -79,11 +79,13 @@ class MenuTop {
if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")) 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"])) { if (! ereg("^".DOL_URL_ROOT."\/(adherents|comm|commande|compta|contrat|product|fichinter|fourn|telephonie|energie|boutique|oscommerce_ws|projet)\/",$_SERVER["PHP_SELF"])
$id="sel"; && (! $_SESSION['idmenu'] && ! $_GET["idmenu"]))
{
$id="sel"; $_SESSION['idmenu']='';
} }
else { else {
$id=""; $id="";
@ -98,11 +100,11 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") 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"])) elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -120,11 +122,12 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") 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 else
{ {
@ -146,11 +149,11 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "compta") 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"])) elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -169,11 +172,11 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product") 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"])) if (ereg("^".DOL_URL_ROOT."\/projet\/[^w]",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -192,11 +195,11 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product") 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"])) elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -219,11 +222,11 @@ class MenuTop {
$class=""; $class="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") 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"])) elseif (ereg("^".DOL_URL_ROOT."\/fourn\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -239,7 +242,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -256,7 +259,7 @@ class MenuTop {
$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"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -273,7 +276,7 @@ class MenuTop {
$class=""; $class="";
if (ereg("^".DOL_URL_ROOT."\/boutique\/",$_SERVER["PHP_SELF"])) if (ereg("^".DOL_URL_ROOT."\/boutique\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {
@ -290,7 +293,7 @@ class MenuTop {
$class=""; $class="";
if (ereg("^".DOL_URL_ROOT."\/oscommerce_ws\/",$_SERVER["PHP_SELF"])) if (ereg("^".DOL_URL_ROOT."\/oscommerce_ws\/",$_SERVER["PHP_SELF"]))
{ {
$class='class="tmenu" id="sel"'; $class='class="tmenu" id="sel"'; $_SESSION['idmenu']='';
} }
else else
{ {