diff --git a/htdocs/includes/menus/barre_top/auguria.lib.php b/htdocs/includes/menus/barre_top/auguria.lib.php index 6278c755736..ce6335176cc 100644 --- a/htdocs/includes/menus/barre_top/auguria.lib.php +++ b/htdocs/includes/menus/barre_top/auguria.lib.php @@ -79,10 +79,10 @@ function print_auguria_menu($db,$atarget,$hideifnotallowed) else if (! empty($_SESSION['mainmenu']) && $tabMenu[$i]['mainmenu'] == $_SESSION['mainmenu']) $class='class="tmenusel"'; else $class='class="tmenu"'; - if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '
  • '; - else print ''; + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '
  • '; - else print ''; + if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '
  • '."\n"; else print ''."\n"; diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index d795a4cafe7..e89a5155757 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -53,10 +53,10 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { $class = 'class="tmenu"'; } - $id='mainmenu_home'; $idsel='id="'.$id.'" '; - print ''; - print '
    '; - print ''.$langs->trans("Home").''; + $id='mainmenu_home';$idsel='home'; + print ''; + print '
    '; + print ''.$langs->trans("Home").''; print ''; @@ -76,22 +76,22 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_companies'; $idsel='id="'.$id.'" '; + $id='mainmenu_companies'; $idsel='company'; if (($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) { - print ''; - print '
    '; - print ''.$langs->trans("ThirdParties").''; + print ''; + print '
    '; + print ''.$langs->trans("ThirdParties").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("ThirdParties").''; + print ''; + print '
    '; + print ''.$langs->trans("ThirdParties").''; print ''; } } @@ -117,21 +117,21 @@ 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='id="'.$id.'" '; + $id='mainmenu_products'; $idsel='products'; if ($user->rights->produit->lire || $user->rights->service->lire) { - print ''; - print '
    '; - print ''.$chaine.''; + print ''; + print '
    '; + print ''.$chaine.''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$chaine.''; + print ''; + print '
    '; + print ''.$chaine.''; print ''; } } @@ -152,21 +152,21 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_commercial'; $idsel='id="'.$id.'" '; + $id='mainmenu_commercial'; $idsel='commercial'; if($user->rights->societe->lire || $user->rights->societe->contact->lire) { - print ''; + print ''; print '
    '; - print ''.$langs->trans("Commercial").''; + print ''.$langs->trans("Commercial").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("Commercial").''; + print ''; + print '
    '; + print ''.$langs->trans("Commercial").''; print ''; } } @@ -188,22 +188,22 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_accountancy'; $idsel='id="'.$id.'" '; + $id='mainmenu_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 ''.$langs->trans("MenuFinancial").''; + print ''; + print '
    '; + print ''.$langs->trans("MenuFinancial").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("MenuFinancial").''; + print ''; + print '
    '; + print ''.$langs->trans("MenuFinancial").''; print ''; } } @@ -224,21 +224,21 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_project'; $idsel='id="'.$id.'" '; + $id='mainmenu_project'; $idsel='project'; if ($user->rights->projet->lire) { - print ''; - print '
    '; - print ''.$langs->trans("Projects").''; + print ''; + print '
    '; + print ''.$langs->trans("Projects").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("Projects").''; + print ''; + print '
    '; + print ''.$langs->trans("Projects").''; print ''; } } @@ -259,21 +259,21 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_tools'; $idsel='id="'.$id.'" '; + $id='mainmenu_tools'; $idsel='tools'; if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire || $user->rights->import->run) { - print ''; - print '
    '; - print ''.$langs->trans("Tools").''; + print ''; + print '
    '; + print ''.$langs->trans("Tools").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("Tools").''; + print ''; + print '
    '; + print ''.$langs->trans("Tools").''; print ''; } } @@ -294,10 +294,10 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_shop'; $idsel='id="'.$id.'" '; - print ''; - print '
    '; - print ''.$langs->trans("OSCommerce").''; + $id='mainmenu_shop'; $idsel='shop'; + print ''; + print '
    '; + print ''.$langs->trans("OSCommerce").''; print ''; } @@ -316,10 +316,10 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_shop'; $idsel='id="'.$id.'" '; - print ''; - print '
    '; - print ''.$langs->trans("OSCommerce").''; + $id='mainmenu_shop'; $idsel='shop'; + print ''; + print '
    '; + print ''.$langs->trans("OSCommerce").''; print ''; } @@ -338,21 +338,21 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) $class = 'class="tmenu"'; } - $id='mainmenu_members'; $idsel='id="'.$id.'" '; + $id='mainmenu_members'; $idsel='members'; if ($user->rights->adherent->lire) { - print ''; - print '
    '; - print ''.$langs->trans("MenuMembers").''; + print ''; + print '
    '; + print ''.$langs->trans("MenuMembers").''; print ''; } else { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$langs->trans("MenuMembers").''; + print ''; + print '
    '; + print ''.$langs->trans("MenuMembers").''; print ''; } } @@ -363,12 +363,15 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); $menuArbo = new Menubase($db,'eldy','top'); + $tabMenu = $menuArbo->menuTopCharger($hideifnotallowed,$_SESSION['mainmenu'],'eldy'); for($i=0; $i'; - print '
    '; - print ''; + print ''; + print '
    '; + print '
    '; print $tabMenu[$i]['titre']; print ''; print ''; @@ -405,9 +408,9 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) { if (! $hideifnotallowed) { - print ''; - print '
    '; - print ''.$tabMenu[$i]['titre'].''; + print ''; + print '
    '; + print ''.$tabMenu[$i]['titre'].''; print ''; } }