From a09d7faf728cbadf437dfd4768668d4a9b69be5a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Dec 2006 20:03:52 +0000 Subject: [PATCH] =?UTF-8?q?Modifications=20au=20gestionnaire=20de=20menu?= =?UTF-8?q?=20eldy=20pour=20afficher=20une=20entr=E9e=20de=20menu=20des=20?= =?UTF-8?q?soci=E9t=E9s=20(tiers)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/contact.php | 4 +- htdocs/contact/index.php | 26 +++++-- .../menus/barre_left/eldy_backoffice.php | 72 ++++++++++++++++--- .../menus/barre_top/eldy_backoffice.php | 70 +++++++++++------- htdocs/langs/en_US/companies.lang | 6 +- htdocs/langs/en_US/users.lang | 1 - htdocs/langs/fr_BE/companies.lang | 6 +- htdocs/langs/fr_FR/companies.lang | 6 +- htdocs/langs/fr_FR/users.lang | 1 - htdocs/soc.php | 2 +- htdocs/theme/eldy/eldy.css.php | 12 ++-- 11 files changed, 156 insertions(+), 50 deletions(-) diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 6824a3b7466..43265aefe0e 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -54,9 +54,9 @@ if ($user->societe_id > 0) } -if (! $sortfield) $sortfield="p.name"; if (! $sortorder) $sortorder="ASC"; -if ($page == -1) { $page = 0 ; } +if (! $sortfield) $sortfield="p.name"; +if ($page < 0) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 39cac7300bd..cd16d4e1d1c 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -35,10 +35,12 @@ $langs->load("suppliers"); // Sécurité accés client +$socid=''; +if ($_GET["socid"]) { $socid=$_GET["socid"]; } if ($user->societe_id > 0) { - $action = ''; - $socid = $user->societe_id; + $action = ''; + $socid = $user->societe_id; } @@ -64,8 +66,20 @@ $offset = $limit * $page ; $langs->load("companies"); $titre=$langs->trans("ListOfContacts"); -if ($type == "c") { $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; } -if ($type == "f") { $titre=$langs->trans("ListOfSuppliersContacts").' ('.$langs->trans("ThirdPartySuppliers").')'; } +if ($type == "c") +{ + $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyCustomers").')'; + $urlfiche="fiche.php"; +} +if ($type == "p") +{ + $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartyProspects").')'; + $urlfiche="prospect/fiche.php"; +} +if ($type == "f") { + $titre=$langs->trans("ListOfContacts").' ('.$langs->trans("ThirdPartySuppliers").')'; + $urlfiche="fiche.php"; +} if ($view == 'phone') { $text="( Vue Téléphones)"; } if ($view == 'mail') { $text=" (Vue EMail)"; } if ($view == 'recent') { $text=" (Récents)"; } @@ -131,6 +145,10 @@ if ($type == "c") // filtre sur type { $sql .= " AND client = 1"; } +if ($type == "p") // filtre sur type +{ + $sql .= " AND client = 2"; +} if ($sall) { $sql .= " AND (p.name like '%".addslashes($sall)."%' OR p.firstname like '%".addslashes($sall)."%' OR p.email like '%".addslashes($sall)."%') "; diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index d8b28516ea0..270529bf4d4 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -98,7 +98,7 @@ class MenuLeft { $newmenu = new Menu(); - $overwritemenufor=array('home','members','products','suppliers','commercial','accountancy','project','tools'); + $overwritemenufor=array('home','companies','members','products','suppliers','commercial','accountancy','project','tools'); /** * On definit newmenu en fonction de mainmenu et leftmenu @@ -161,21 +161,77 @@ class MenuLeft { /* * Menu SOCIETES */ - if ($mainmenu == 'companies') { + if ($mainmenu == 'companies') + { + // Sociétés + if ($conf->societe->enabled && $user->rights->societe->lire) + { + $langs->load("companies"); + $newmenu->add(DOL_URL_ROOT."/societe.php", $langs->trans("ThirdParty")); + + if ($user->rights->societe->creer) + { + $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?action=create", $langs->trans("MenuNewThirdParty")); + } + + if(is_dir("societe/groupe")) + { + $newmenu->add_submenu(DOL_URL_ROOT."/societe/groupe/index.php", $langs->trans("MenuSocGroup")); + } + } + + // Fournisseurs + $langs->load("suppliers"); + + if ($conf->societe->enabled && $conf->fournisseur->enabled) + { + $newmenu->add(DOL_URL_ROOT."/fourn/liste.php?leftmenu=suppliers", $langs->trans("Suppliers"), 1, $user->rights->societe->lire && $user->rights->fournisseur->lire); + + // Sécurité accés client + if ($user->societe_id == 0) + { + $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&action=create&type=f",$langs->trans("NewSupplier"), 2, $user->rights->societe->creer && $user->rights->fournisseur->lire); + } + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&type=f",$langs->trans("Contacts"), 2, $user->rights->societe->lire && $user->rights->fournisseur->lire); + } + + // Prospects + if ($conf->societe->enabled && $user->rights->societe->lire) + { + $newmenu->add(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("Prospects"), 1, $user->rights->societe->lire); + + $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=p", $langs->trans("Contacts"), 2, $user->rights->societe->lire); + } + + // Clients + if ($conf->societe->enabled && $user->rights->societe->lire) + { + $newmenu->add(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("Customers"), 1, $user->rights->societe->lire); + + $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 2, $user->rights->societe->lire); + } + + // Contacts + $newmenu->add(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("Contacts"), 0, $user->rights->societe->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/fiche.php?leftmenu=contacts&action=create", $langs->trans("NewContact"), 1, $user->rights->societe->creer); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->lire); } /* * Menu COMMERCIAL */ - if ($mainmenu == 'commercial') { + if ($mainmenu == 'commercial') + { $langs->load("companies"); // Prospects $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 1, $user->rights->societe->creer); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?leftmenu=prospects", $langs->trans("List"), 1, $user->rights->societe->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=prospects&type=p", $langs->trans("List"), 1, $user->rights->societe->lire); if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire); if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire); @@ -183,14 +239,14 @@ class MenuLeft { if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire); if ($leftmenu=="prospects") $newmenu->add_submenu(DOL_URL_ROOT."/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=prospects&type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=prospects&type=p", $langs->trans("Contacts"), 1, $user->rights->societe->lire); // Clients $newmenu->add(DOL_URL_ROOT."/comm/index.php?leftmenu=customers", $langs->trans("Customers"), 0, $user->rights->societe->lire); $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 1, $user->rights->societe->creer); $newmenu->add_submenu(DOL_URL_ROOT."/comm/clients.php?leftmenu=customers", $langs->trans("List"), 1, $user->rights->societe->lire); - $newmenu->add_submenu(DOL_URL_ROOT."/comm/contact.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 1, $user->rights->societe->lire); // Contacts $newmenu->add(DOL_URL_ROOT."/contact/index.php?leftmenu=contacts", $langs->trans("Contacts"), 0, $user->rights->societe->lire); @@ -278,10 +334,10 @@ class MenuLeft { { $newmenu->add_submenu(DOL_URL_ROOT."/soc.php?leftmenu=suppliers&action=create&type=f",$langs->trans("NewSupplier"),1,$user->rights->societe->creer && $user->rights->fournisseur->lire); } - $newmenu->add_submenu(DOL_URL_ROOT."/fourn/index.php?leftmenu=suppliers", $langs->trans("List"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/fourn/liste.php?leftmenu=suppliers", $langs->trans("List"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire); if ($conf->societe->enabled) { - $newmenu->add_submenu(DOL_URL_ROOT."/fourn/contact.php?leftmenu=suppliers",$langs->trans("Contacts"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire); + $newmenu->add_submenu(DOL_URL_ROOT."/contact/index.php?leftmenu=suppliers&type=f",$langs->trans("Contacts"),1,$user->rights->societe->lire && $user->rights->fournisseur->lire); } if ($conf->facture->enabled) { diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index cac95c2ae26..0833f20ea53 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -98,13 +98,15 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Home").''; - // Members - if ($conf->adherent->enabled) + // Third parties + if (($conf->societe->enabled && $user->rights->societe->lire) + || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) { - $langs->load("members"); + $langs->load("companies"); + $langs->load("suppliers"); $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") { $class='class="tmenu" id="sel"'; } @@ -113,9 +115,10 @@ class MenuTop { $class = 'class="tmenu"'; } - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").''; + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("ThirdParties").''; } - + + // Products-Services if ($conf->produit->enabled || $conf->service->enabled) { @@ -141,24 +144,6 @@ class MenuTop { print ''.$chaine.''; } - // Supplier - if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire) - { - $langs->load("suppliers"); - - $class=""; - if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") - { - $class='class="tmenu" id="sel"'; - } - else - { - $class = 'class="tmenu"'; - } - - print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").''; - } - // Commercial if ($conf->commercial->enabled) { @@ -177,6 +162,25 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Commercial").''; } + + // Suppliers + if ($conf->fournisseur->enabled) + { + $langs->load("suppliers"); + + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "suppliers") + { + $class='class="tmenu" id="sel"'; + } + else + { + $class = 'class="tmenu"'; + } + + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Suppliers").''; + + } // Financial if ($conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled || $conf->caisse->enabled @@ -311,6 +315,24 @@ class MenuTop { print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("BugTracker").''; } + // Members + if ($conf->adherent->enabled) + { + $langs->load("members"); + + $class=""; + if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") + { + $class='class="tmenu" id="sel"'; + } + else + { + $class = 'class="tmenu"'; + } + + print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("Members").''; + } + print ''; } diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 7df1ac05b8a..5a1461cc709 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. ErrorSetACountryFirst=Set the country first ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited informations ? +MenuNewThirdParty=New third party MenuNewCompany=New company MenuNewCustomer=New customer MenuNewProspect=New prospect @@ -20,6 +21,8 @@ Company=Company CompanyName=Company name Companies=Companies ThirdParty=Third party +ThirdParties=Third parties +ThirdPartyAll=Third parties (all) ThirdPartyProspects=Prospects ThirdPartyCustomers=Customers ThirdPartyCustomersWithIdProf12=Customers with %s or %s @@ -114,6 +117,7 @@ LastProspect=Last ProspectToContact=Prospect to contact CompanyDeleted=Company "%s" deleted from database. ListOfContacts=List of contacts +ListOfProspectsContacts=List of prospect contacts ListOfCustomersContacts=List of customer contacts ListOfSuppliersContacts=List of supplier contacts ListOfCompanies=List of companies @@ -174,7 +178,7 @@ NoRIB=No RIB defined NoParentCompany=None ExportImport=Import-Export ExportCardToFormat=Export card to format -ContactNotLinkedToCompany=Contact not linked to any company +ContactNotLinkedToCompany=Contact not linked to any third party DolibarrLogin=Dolibarr login NoDolibarrAccess=No Dolibarr access ExportDataset_company_1=Companies/fundations and properties diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index 3a8985c3fc8..505fd65ee2b 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -81,6 +81,5 @@ MyInformations=My informations ExportDataset_user_1=Dolibarr's users and properties DomainUser=Domain user Reactivate=Reactivate -ThirdParty=Third party CreateInternalUserDesc=This form allows you to creat an user internal to your company/fundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card. InternalExternalDesc=An internal user is a user that is part of your company/fundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) diff --git a/htdocs/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang index c26c9e19500..d72899f0d72 100644 --- a/htdocs/langs/fr_BE/companies.lang +++ b/htdocs/langs/fr_BE/companies.lang @@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Le nom de soci ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre. ErrorSetACountryFirst=Choisissez le pays d'abord ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ? +MenuNewThirdParty=Nouveau tiers MenuNewCompany=Nouvelle société MenuNewCustomer=Nouveau client MenuNewProspect=Nouveau prospect @@ -20,6 +21,8 @@ Company=Soci CompanyName=Nom de société Companies=Sociétés ThirdParty=Tiers +ThirdParties=Tiers +ThirdPartyAll=Tiers (tous) ThirdPartyProspects=Prospects ThirdPartyCustomers=Clients ThirdPartyCustomersWithIdProf12=Clients de %s ou %s @@ -108,6 +111,7 @@ LastProspect=Dernier prospect ProspectToContact=Prospect à contacter CompanyDeleted=La société "%s" a été supprimée de la base. ListOfContacts=Liste des contacts +ListOfProspectsContacts=Liste des contacts prospects ListOfCustomersContacts=Liste des contacts clients ListOfSuppliersContacts=Liste des contacts fournisseurs ListOfCompanies=Liste des sociétés @@ -165,7 +169,7 @@ NoRIB=Aucun RIB d NoParentCompany=Aucune ExportImport=Import/Export ExportCardToFormat=Exporter la fiche au format -ContactNotLinkedToCompany=Contact lié à aucune société +ContactNotLinkedToCompany=Contact non lié à un tiers DolibarrLogin=Login Dolibarr NoDolibarrAccess=Pas d'accès à Dolibarr ExportDataset_company_1=Entreprises/Fondations et propriétés diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 0d068ef18b0..4909bfd4dbf 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -4,6 +4,7 @@ ErrorCompanyNameAlreadyExists=Le nom de soci ErrorPrefixAlreadyExists=Le préfixe %s existe déjà. Veuillez en choisir un autre. ErrorSetACountryFirst=Définissez d'abord le pays ConfirmDeleteCompany=Êtes-vous sûr de vouloir supprimer cette société et toutes les informations qui en dépendent ? +MenuNewThirdParty=Nouveau tiers MenuNewCompany=Nouvelle société MenuNewCustomer=Nouveau client MenuNewProspect=Nouveau prospect @@ -20,6 +21,8 @@ Company=Soci CompanyName=Raison sociale Companies=Sociétés ThirdParty=Tiers +ThirdParties=Tiers +ThirdPartyAll=Tiers (tous) ThirdPartyProspects=Prospets ThirdPartyCustomers=Clients ThirdPartyCustomersWithIdProf12=Clients avec %s ou %s @@ -115,6 +118,7 @@ ProspectToContact=Prospect CompanyDeleted=La société "%s" a été supprimée de la base. ListOfContacts=Liste des contacts ListOfCustomersContacts=Liste des contacts clients +ListOfProspectsContacts=Liste des contacts prospects ListOfSuppliersContacts=Liste des contacts fournisseurs ListOfCompanies=Liste des sociétés ShowCompany=Afficher société @@ -174,7 +178,7 @@ NoRIB=Aucun RIB d NoParentCompany=Aucune ExportImport=Import-Export ExportCardToFormat=Exporter fiche au format -ContactNotLinkedToCompany=Contact non lié à une société +ContactNotLinkedToCompany=Contact non lié à un tiers DolibarrLogin=Login Dolibarr NoDolibarrAccess=Pas d'accès Dolibarr ExportDataset_company_1=Tiers (sociétés/institutions) et attributs diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index c28a26974b6..5b568ea0ace 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -81,6 +81,5 @@ MyInformations=Mes informations ExportDataset_user_1=Utilisateurs Dolibarr et attributs DomainUser=Utilisateur du domaine Reactivate=Réactiver -ThirdParty=Tiers CreateInternalUserDesc=Cet écran permet de créer un utilisateur interne à votre société/institution. Pour créer un utilisateur externe (client, fournisseur, ...), utiliser le bouton 'Créer utilisateur Dolibarr' qui se trouve sur la fiche contact du tiers en question. InternalExternalDesc=Un utilisateur interne est un utilisateur appartenant à votre société/institution.
Un utilisateur externe est un utilisateur client, fournisseur ou autre.

Dans les 2 cas, les permissions utilisateurs définissent les droits d'accès mais l'utilisateur externe peut en plus avoir un gestionnaire de menu différent de l'utilisateur interne (Voir Accueil - Configuration - Affichage) diff --git a/htdocs/soc.php b/htdocs/soc.php index db6439036fb..3a847cc2402 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -318,7 +318,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] || } } - print ''.$load.$langs->trans('Address').''; diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index 55fa15527be..56ace403d92 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -173,13 +173,13 @@ div.tmenu table.tmenu { padding: 0px 0px 10px 0px; - margin: 0px 0px 0px 10px; + margin: 0px 0px 0px 6px; } a.tmenu:link { color: #234046; - padding: 0px 8px 0px 8px; + padding: 0px 5px 0px 5px; margin: 0px 1px 2px 1px; font: 12px helvetica, verdana, arial, sans-serif; font-weight: bold; @@ -187,7 +187,7 @@ a.tmenu:link a.tmenu:visited { color: #234046; - padding: 0px 8px 0px 8px; + padding: 0px 5px 0px 5px; margin: 0px 1px 2px 1px; border: 0px solid #b3c5cc; font: 12px helvetica, verdana, arial, sans-serif; @@ -196,7 +196,7 @@ a.tmenu:visited a.tmenu#sel { color: #234046; - padding: 0px 8px 0px 8px; + padding: 0px 5px 0px 5px; margin: 0px 0px 2px 0px; font: 12px helvetica, verdana, arial, sans-serif; font-weight: bold; @@ -209,7 +209,7 @@ a.tmenu#sel a.tmenu:hover { color: #234046; - padding: 0px 8px 0px 8px; + padding: 0px 5px 0px 5px; margin: 0px 1px 2px 1px; text-decoration: none; font: 12px helvetica, verdana, arial, sans-serif; @@ -220,7 +220,7 @@ a.tmenu:hover font.tmenudisabled { color: #93a5aa; - padding: 0px 8px 0px 8px; + padding: 0px 5px 0px 5px; margin: 0px 0px 2px 0px; font-weight:bold; font-size:12px;