diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index fbbb105f3d0..6470d3a6ee2 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -39,6 +39,8 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"]; if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; $_SESSION["leftmenuopened"]=""; + + $id='mainmenu'; print '
| ';
- print ' ';
+ print ' ';
print ''.$langs->trans("Home").'';
print ' | ';
@@ -75,12 +77,12 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_companies'; $idsel='company';
+ $idsel='companies';
if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("ThirdParties").'';
print ' | ';
}
@@ -89,7 +91,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("ThirdParties").'';
print ' | ';
}
@@ -116,11 +118,11 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; }
if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); }
- $id='mainmenu_products'; $idsel='products';
+ $idsel='products';
if ($user->rights->produit->lire || $user->rights->service->lire)
{
print '';
- print ' ';
+ print ' ';
print ''.$chaine.'';
print ' | ';
}
@@ -129,7 +131,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$chaine.'';
print ' | ';
}
@@ -151,11 +153,11 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_commercial'; $idsel='commercial';
+ $idsel='commercial';
if($user->rights->societe->lire || $user->rights->societe->contact->lire)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Commercial").'';
print ' | ';
}
@@ -164,7 +166,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Commercial").'';
print ' | ';
}
@@ -187,12 +189,12 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_accountancy'; $idsel='accountancy';
+ $idsel='accountancy';
if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|| $user->rights->facture->lire || $user->rights->banque->lire)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("MenuFinancial").'';
print ' | ';
}
@@ -201,7 +203,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("MenuFinancial").'';
print ' | ';
}
@@ -223,11 +225,11 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_project'; $idsel='project';
+ $idsel='project';
if ($user->rights->projet->lire)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Projects").'';
print ' | ';
}
@@ -236,7 +238,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Projects").'';
print ' | ';
}
@@ -258,11 +260,11 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_tools'; $idsel='tools';
+ $idsel='tools';
if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire || $user->rights->import->run)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Tools").'';
print ' | ';
}
@@ -271,7 +273,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("Tools").'';
print ' | ';
}
@@ -293,9 +295,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_shop'; $idsel='shop';
+ $idsel='shop';
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("OSCommerce").'';
print ' | ';
}
@@ -315,9 +317,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_shop'; $idsel='shop';
+ $idsel='shop';
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("OSCommerce").'';
print ' | ';
}
@@ -337,11 +339,11 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
$class = 'class="tmenu"';
}
- $id='mainmenu_members'; $idsel='members';
+ $idsel='members';
if ($user->rights->adherent->lire)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("MenuMembers").'';
print ' | ';
}
@@ -350,7 +352,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print '';
- print ' ';
+ print ' ';
print ''.$langs->trans("MenuMembers").'';
print ' | ';
}
@@ -372,7 +374,6 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
//var_dump($tabMenu[$i]);
$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
- $id='mainmenu_'.$idsel;
if ($tabMenu[$i]['right'] == true) // Is allowed
{
if (preg_match("/^(http:\/\/|https:\/\/)/i",$tabMenu[$i]['url']))
@@ -397,7 +398,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
else $class='class="tmenu"';
print '';
- print ' ';
+ print ' ';
print '';
print $tabMenu[$i]['titre'];
print '';
@@ -408,7 +409,7 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed)
if (! $hideifnotallowed)
{
print ' | ';
- print ' ';
+ print ' ';
print ''.$tabMenu[$i]['titre'].'';
print ' | ';
}
diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php
index 558f25a09d3..d5340981185 100644
--- a/htdocs/theme/eldy/eldy.css.php
+++ b/htdocs/theme/eldy/eldy.css.php
@@ -387,164 +387,84 @@ li.tmenu {
-div.mainmenu_home {
+div.mainmenu {
position : relative;
color: white;
+ background-repeat:no-repeat;
+ background-position:center top;
+ height:28px;
+ margin-left: 0px;
+}
+
+div.mainmenu.home{
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_companies {
- position : relative;
- color: white;
+div.mainmenu.companies {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_products {
- position : relative;
- color: white;
+div.mainmenu.products {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
margin-left: 10px;
}
-div.mainmenu_commercial {
- position : relative;
- color: white;
+div.mainmenu.commercial {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_accountancy {
- position : relative;
- color: white;
+div.mainmenu.accountancy {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:24px;
- margin-left: 0px;
}
-div.mainmenu_project {
- position : relative;
- color: white;
+div.mainmenu.project {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:27px;
- margin-left: 0px;
}
-div.mainmenu_tools {
- position : relative;
- color: white;
+div.mainmenu.tools {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_members {
- position : relative;
- color: white;
+div.mainmenu.members {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_shop {
- position : relative;
- color: white;
+div.mainmenu.shop {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_agenda {
- position : relative;
- color: white;
+div.mainmenu.agenda {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_ecm {
- position : relative;
- color: white;
+div.mainmenu.ecm {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_cashdesk {
- position : relative;
- color: white;
+div.mainmenu.cashdesk {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
- height:28px;
- margin-left: 0px;
}
-div.mainmenu_generic1 {
- position : relative;
- color: white;
+div.mainmenu.generic1 {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:26px;
- margin-left: 0px;
}
-div.mainmenu_generic2 {
- position : relative;
- color: white;
+div.mainmenu.generic2 {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:26px;
- margin-left: 0px;
}
-div.mainmenu_generic3 {
- position : relative;
- color: white;
+div.mainmenu.generic3 {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:26px;
- margin-left: 0px;
}
-div.mainmenu_generic4 {
- position : relative;
- color: white;
+div.mainmenu.generic4 {
background-image: url();
- background-repeat:no-repeat;
- background-position:center top;
height:26px;
- margin-left: 0px;
}