diff --git a/htdocs/includes/menus/barre_top/eldy_frontoffice.php b/htdocs/includes/menus/barre_top/eldy_frontoffice.php index 0fd70c15859..eb28268b5de 100644 --- a/htdocs/includes/menus/barre_top/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_frontoffice.php @@ -18,7 +18,7 @@ */ /** - \file htdocs/includes/menus/barre_top/eldy_backoffice.php + \file htdocs/includes/menus/barre_top/eldy_frontoffice.php \brief Gestionnaire nomme eldy du menu du haut \version $Id$ diff --git a/htdocs/includes/menus/barre_top/empty.php b/htdocs/includes/menus/barre_top/empty.php index 6763be7a6f1..d690eff1f09 100644 --- a/htdocs/includes/menus/barre_top/empty.php +++ b/htdocs/includes/menus/barre_top/empty.php @@ -29,6 +29,8 @@ class MenuTop { var $require_left=array("empty"); // If this top menu handler must be used with a particular left menu handler + var $hideifnotallowed=false; // Put 0 for back office menu, 1 for front office menu + var $atarget=""; // To store arget to use in menu links @@ -68,12 +70,14 @@ class MenuTop { // Code to show personalized menus require_once(DOL_DOCUMENT_ROOT."/core/menubase.class.php"); - $menuArbo = new Menubase($this->db,'eldy','top'); - $tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],''); - for($i=0;$idb,'empty','top'); + $tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],'empty'); + + for($i=0; $iatarget?" target=$this->atarget":"").'>'.$tabMenu[$i]['titre'].''; + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else $class='class="tmenu"'; + print 'atarget?" target=$this->atarget":"").'>'; + print $tabMenu[$i]['titre']; + print ''; } else { - print ''.$tabMenu[$i]['titre'].''; + if (! $this->hideifnotallowed) print ''.$tabMenu[$i]['titre'].''; } } } diff --git a/htdocs/includes/menus/barre_top/rodolphe.php b/htdocs/includes/menus/barre_top/rodolphe.php index 7ecaadac020..d2a17004462 100644 --- a/htdocs/includes/menus/barre_top/rodolphe.php +++ b/htdocs/includes/menus/barre_top/rodolphe.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2008 Laurent Destailleur +/* Copyright (C) 2005-2008 Laurent Destailleur + * 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 @@ -18,26 +18,28 @@ */ /** - \file htdocs/includes/menus/barre_top/rodolphe.php - \brief Gestionnaire menu haut Rodolphe - \version $Id$ - + \file htdocs/includes/menus/barre_top/rodolphe.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 entrees de menu e faire apparaitre dans la barre du haut - \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 ... */ /** - \class MenuTop - \brief Classe permettant la gestion par defaut du menu du haut -*/ - + * \class MenuTop + * \brief Classe permettant la gestion du menu du haut Rodolphe + */ class MenuTop { - var $require_left=array(); // Si doit etre en phase avec un gestionnaire de menu gauche particulier - var $atarget=""; // Valeur du target a utiliser dans les liens + var $require_left=array(); // 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 + /** * \brief Constructeur @@ -45,7 +47,11 @@ class MenuTop { */ function MenuTop($db) { + global $langs; $this->db=$db; + + $langs->setTransFromTab("Company",$langs->trans("ThirdParty")); + $langs->setTransFromTab("NewCompany",$langs->trans("NewThirdParty")); } @@ -54,8 +60,8 @@ class MenuTop { */ function showmenu() { - global $user,$conf,$langs,$dolibarr_main_db_name; - + global $user,$conf,$langs,$dolibarr_main_db_name;; + // On sauve en session le menu principal choisi if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"]=$_GET["mainmenu"]; if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; @@ -65,43 +71,76 @@ class MenuTop { print ''; // Home - $id=""; - - if ($_GET["mainmenu"] == "home" || ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home")) + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") { - $id="sel"; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } - - 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=""; - } - print ''; - - // Adherent - if ($conf->adherent->enabled && $user->rights->adherent->lire) + else { - $langs->load("members"); + $class = 'class="tmenu"'; + } + $idsel='id="home" '; + print ''; + + // Third parties + if ($conf->societe->enabled || $conf->fournisseur->enabled) + { + $langs->load("companies"); + $langs->load("suppliers"); + $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - elseif (ereg("^".DOL_URL_ROOT."\/adherents\/",$_SERVER["PHP_SELF"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - print ''; + $idsel='id="companies" '; + if (($conf->societe->enabled && $user->rights->societe->lire) + || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) + { + print ''; + } + else + { + if (! $this->hideifnotallowed) print ''; + } + } + + + // Products-Services + if ($conf->produit->enabled || $conf->service->enabled) + { + $langs->load("products"); + + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") + { + $class='class="tmenusel"'; $_SESSION['idmenu']=''; + } + else + { + $class = 'class="tmenu"'; + } + $chaine=""; + if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); } + 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 + { + if (! $this->hideifnotallowed) print ''; + } } // Commercial @@ -114,138 +153,125 @@ class MenuTop { if ($showcommercial)*/ if ($conf->commercial->enabled) { - $langs->load("commercial"); + $langs->load("commercial"); + + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") + { + $class='class="tmenusel"'; $_SESSION['idmenu']=''; + } + else + { + $class = 'class="tmenu"'; + } + + $idsel='id="commercial" '; + if($user->rights->societe->lire) + { + print ''; + } + else + { + if (! $this->hideifnotallowed) print ''; + } + } + // Financial + if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled + || $conf->facture->enabled) + { + $langs->load("compta"); + $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - elseif (ereg("^".DOL_URL_ROOT."\/(comm|commande|contrat)\/",$_SERVER["PHP_SELF"]) - && (! $_SESSION['idmenu'] && ! $_GET["idmenu"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - - print ''; - } - - // Compta/treso (sert pour banque, tva, entites a facturer...) - if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled - || $conf->commande->enabled || $conf->facture->enabled) - { -// if ($user->rights->compta->general->lire || $user->rights->comptaexpert->general->lire) -// { - $langs->load("compta"); - - $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "compta") - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - elseif (ereg("^".DOL_URL_ROOT."\/compta\/",$_SERVER["PHP_SELF"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - else - { - $class = 'class="tmenu"'; - } - - print ''; -// } + + $idsel='id="accountancy" '; + if ($user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire + || $user->rights->facture->lire || $user->rights->banque->lire) + { + print ''; + } + else + { + if (! $this->hideifnotallowed) print ''; + } } // Projects - if ($conf->projet->enabled && $user->rights->projet->lire) + if ($conf->projet->enabled) { $langs->load("projects"); - + $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product") + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - if (ereg("^".DOL_URL_ROOT."\/projet\/[^w]",$_SERVER["PHP_SELF"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - - $chaine.=$langs->trans("Projects"); - print ''; + + $idsel='id="project" '; + if ($user->rights->projet->lire) + { + print ''; + } + else + { + if (! $this->hideifnotallowed) print ''; + } } - // Produit/service - if (($conf->produit->enabled || $conf->service->enabled) && $user->rights->produit->lire) + // Tools + if ($conf->mailing->enabled || $conf->export->enabled || $conf->bookmark->enabled + || $conf->global->MAIN_MODULE_IMPORT || $conf->global->MAIN_MODULE_DOMAIN) { - $langs->load("products"); - + $langs->load("other"); + $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "product") + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - elseif (ereg("^".DOL_URL_ROOT."\/product\/",$_SERVER["PHP_SELF"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - $chaine=""; - if ($conf->produit->enabled) { $chaine.=$langs->trans("Products"); } - if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } - if ($conf->service->enabled) { $chaine.=$langs->trans("Services"); } - - print ''; - - } - - // Supplier - if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) - { - $langs->load("suppliers"); - - $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") + + $idsel='id="tools" '; + if ($user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire) { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; - } - elseif (ereg("^".DOL_URL_ROOT."\/fourn\/",$_SERVER["PHP_SELF"])) - { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + print ''; } else { - $class = 'class="tmenu"'; - } - - print ''; + if (! $this->hideifnotallowed) print ''; + } } - + // Telephonie if ($conf->telephonie->enabled && $user->rights->telephonie->lire) { $class=""; if (ereg("^".DOL_URL_ROOT."\/telephonie\/",$_SERVER["PHP_SELF"])) { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - print ''; + $idsel='id="telephonie" '; + print ''; } // Energie @@ -255,77 +281,109 @@ class MenuTop { $class=""; if (ereg("^".DOL_URL_ROOT."\/energie\/",$_SERVER["PHP_SELF"])) { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - print ''; + $idsel='id="energie" '; + print ''; } - - // OSCommerce 1 + + // OSCommerce 1 if ($conf->boutique->enabled) { $langs->load("shop"); + $class=""; - if (ereg("^".DOL_URL_ROOT."\/boutique\/",$_SERVER["PHP_SELF"])) + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - - print ''; + + $idsel='id="shop" '; + print ''; } - + // OSCommerce 2 if ($conf->oscommerce2->enabled) { $langs->load("shop"); + $class=""; - if (ereg("^".DOL_URL_ROOT."\/oscommerce_ws\/",$_SERVER["PHP_SELF"])) + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "shop") { - $class='class="tmenu" id="sel"'; $_SESSION['idmenu']=''; + $class='class="tmenusel"'; $_SESSION['idmenu']=''; } else { $class = 'class="tmenu"'; } - - print ''; + + $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,'rodolphe','top'); - $tabMenu = $menuArbo->menuTopCharger(2,$_SESSION['mainmenu'],'rodolphe'); + $menuArbo = new Menubase($this->db,'eldy','top'); + $tabMenu = $menuArbo->menuTopCharger(0,$_SESSION['mainmenu'],'eldy'); - for($i=0;$iatarget?" target=$this->atarget":"").'>'.$tabMenu[$i]['titre'].''; + if (! empty($_SESSION['idmenu']) && $tabMenu[$i]['rowid'] == $_SESSION['idmenu']) $class='class="tmenusel"'; + else $class='class="tmenu"'; + print ''; } else { - print ''; + if (! $this->hideifnotallowed) print ''; } } } @@ -333,7 +391,7 @@ class MenuTop { print '
atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").'atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").''.$langs->trans("ThirdParties").'atarget?" target=$this->atarget":"").'>'.$chaine.''.$chaine.'atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").''.$langs->trans("Commercial").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuFinancial").''.$langs->trans("MenuFinancial").''.$chaine.'atarget?" target=$this->atarget":"").'>'.$langs->trans("Projects").''.$langs->trans("Projects").'atarget?" target=$this->atarget":"").'>'.$chaine.'atarget?" target=$this->atarget":"").'>'.$langs->trans("Tools").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").''.$langs->trans("Tools").'atarget?" target=$this->atarget":"").'>Telephonieatarget?" target=$this->atarget":"").'>Telephonieatarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'atarget?" target=$this->atarget":"").'>'.$langs->trans("Energy").'atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").'atarget?" target=$this->atarget":"").'>'.$langs->trans("MenuMembers").''.$langs->trans("MenuMembers").'atarget?" target=$this->atarget":"").'>'; + print $tabMenu[$i]['titre']; + print ''.$tabMenu[$i]['titre'].''.$tabMenu[$i]['titre'].'
'; } - + } -?> \ No newline at end of file +?> diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index 5903255cf67..236bdf7660e 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -160,6 +160,7 @@ div.tmenu .tmenudisabled padding-right: 6px; padding-top: 3px; cursor: not-allowed; + font-weight: normal; } table.tmenu @@ -178,7 +179,6 @@ a.tmenu:link height: 21px; font-weight: normal; } - a.tmenu:visited { color:#FFFFFF; @@ -189,18 +189,6 @@ a.tmenu:visited height: 21px; font-weight: normal; } - -a.tmenusel -{ - color:#234046; - text-decoration:none; - padding-left:5px; - padding-right:5px; - padding-top: 2px; - height: 21px; - font-weight: normal; - background: #FFFFFF; -} a.tmenu:hover { color:#234046; @@ -212,7 +200,6 @@ a.tmenu:hover font-weight: normal; background: #FFFFFF; } - a.tmenu:active { color:#234046; @@ -224,13 +211,32 @@ a.tmenu:active height: 21px; font-weight: normal; } - -font.tmenudisabled +a.tmenusel { - color: #9FCED9; - font-weight: normal; - font-size: 12px; - cursor: not-allowed; + color:#234046; + text-decoration:none; + padding-left:5px; + padding-right:5px; + padding-top: 2px; + height: 21px; + font-weight: normal; + background: #FFFFFF; +} +a.tmenusel:link +{ + font-weight: normal; +} +a.tmenusel:visited +{ + font-weight: normal; +} +a.tmenusel:hover +{ + font-weight: normal; +} +a.tmenusel:active +{ + font-weight: normal; } diff --git a/htdocs/theme/bluelagoon/bluelagoon.css b/htdocs/theme/bluelagoon/bluelagoon.css index 4aec4b65d94..6896bbb3773 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css +++ b/htdocs/theme/bluelagoon/bluelagoon.css @@ -141,15 +141,6 @@ a.tmenu:hover font-size:12px; } -font.tmenudisabled -{ - color: #93a5aa; - padding: 0em 1em; - margin: 0em 0em 1em 0em; - font-size:12px; -} - - /* Pour menu TOP auguria uniquement */ * html div.tmenu li a diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index ebbd68e7cb9..fe584ea7dcd 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -140,8 +140,6 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ - td.vmenu { margin-right: 2px; @@ -187,6 +185,7 @@ div.tmenu .tmenudisabled padding-right: 6px; padding-top: 3px; cursor: not-allowed; + font-weight: normal; } table.tmenu @@ -214,20 +213,6 @@ a.tmenu:visited font-family: helvetica, verdana, arial, sans-serif; font-weight: normal; } -a.tmenusel -{ - color: #234046; - padding: 0px 5px 0px 5px; - margin: 0px 0px 0px 0px; - font-size: 12px; - font-family: helvetica, verdana, arial, sans-serif; - font-weight: normal; - background: #F4F4F4; - border-right: 1px solid #555555; - border-top: 1px solid #D8D8D8; - border-left: 1px solid #D8D8D8; - border-bottom: 2px solid #F4F4F4; -} a.tmenu:hover { color: #234046; @@ -243,7 +228,6 @@ a.tmenu:hover border-left: 1px solid #D8D8D8; border-bottom: 2px solid #dee7ec; } - a.tmenu:active { padding: 0px 5px 0px 5px; @@ -258,15 +242,35 @@ a.tmenu:active border-left: 1px solid #D8D8D8; border-bottom: 2px solid #dee7ec; } - -font.tmenudisabled +a.tmenusel { - color: #93a5aa; + color: #234046; padding: 0px 5px 0px 5px; - margin: 0px 0px 2px 0px; - font-weight: normal; + margin: 0px 0px 0px 0px; font-size: 12px; - cursor: not-allowed; + font-family: helvetica, verdana, arial, sans-serif; + font-weight: normal; + background: #F4F4F4; + border-right: 1px solid #555555; + border-top: 1px solid #D8D8D8; + border-left: 1px solid #D8D8D8; + border-bottom: 2px solid #F4F4F4; +} +a.tmenusel:link +{ + font-weight: normal; +} +a.tmenusel:visited +{ + font-weight: normal; +} +a.tmenusel:hover +{ + font-weight: normal; +} +a.tmenusel:active +{ + font-weight: normal; } diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index 7f4d9226189..8152ba84e1d 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -177,9 +177,8 @@ div.tmenu .tmenudisabled { color: #757575; font-size: 12px; - padding-left:10px; - padding-right:10px; - padding-top:3px; + padding: 0px 8px; + margin: 0px 0px 6px 0px; cursor: not-allowed; } @@ -216,14 +215,6 @@ a.tmenu:visited font-weight: bold; font-size:12px; } -a.tmenusel -{ - color: #202020; - background: #bbbbcc; - padding: 0px 8px; - margin: 0px 0px 6px 0px; - border: 1px solid #eeeeff; -} a.tmenu:hover { color: #202020; @@ -234,15 +225,13 @@ a.tmenu:hover text-decoration: none; } -font.tmenudisabled -{ - color: #93a5aa; +a.tmenusel +{ + color: #202020; + background: #bbbbcc; padding: 0px 8px; margin: 0px 0px 6px 0px; - border: 0px; - font-weight:bold; - font-size:12px; - cursor: not-allowed; + border: 1px solid #eeeeff; } diff --git a/htdocs/theme/rodolphe/rodolphe.css b/htdocs/theme/rodolphe/rodolphe.css index dbf18de5482..2acc8013f43 100644 --- a/htdocs/theme/rodolphe/rodolphe.css +++ b/htdocs/theme/rodolphe/rodolphe.css @@ -169,17 +169,6 @@ a.tmenu:hover text-decoration: none; } -font.tmenudisabled -{ - color: #93a5aa; - padding: 0em 1em; - margin: 0em 0em 1.5em 0em; - border: 1px solid #b3c5cc; - font-weight:bold; - font-size:12px; -} - - /* Pour menu TOP auguria uniquement */ div.tmenu ul { diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index 0a16a6c7ff3..79e7e1169d4 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -123,8 +123,6 @@ form /* Styles de positionnement des zones */ /* ============================================================================== */ -/* Removed div.vmenuplusfiche, replaced div.vmenu by td.vmenu, removed div.fiche */ - td.vmenu { margin-right: 2px; @@ -155,13 +153,20 @@ div.tmenu border-bottom: 1px solid #555555; padding: 0px 0px 0px 0px; margin: 0px 0px 2px 0px; - font-weight:bold; - font-size:12px; + font-weight: bold; + font-size: 12px; height: 20px; background: #dcdcb3; color: #000000; text-decoration: none; } +div.tmenu .tmenudisabled +{ + color: #757575; + font-size: 12px; + padding: 0px 5px; + cursor: not-allowed; +} table.tmenu { @@ -186,13 +191,6 @@ a.tmenu:visited font-weight:bold; font-size:12px; } -a.tmenusel -{ - color: #234046; - background: #eeeecc; - padding: 0px 5px; - border: 1px solid #eeeecc; -} a.tmenu:hover { color: #234046; @@ -202,17 +200,16 @@ a.tmenu:hover text-decoration: none; } -font.tmenudisabled -{ - color: #93a5aa; +a.tmenusel +{ + color: #234046; + background: #eeeecc; padding: 0px 5px; - border: 0px; - font-weight:bold; - font-size:12px; - cursor: not-allowed; + border: 1px solid #eeeecc; } + /* Pour menu TOP auguria uniquement */ * html div.tmenu li a {