diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 129fcebced4..126b95dbf81 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -160,14 +160,11 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio } +/* + * View + */ -/* ************************************************************************** */ -/* */ -/* Mode affichage */ -/* */ -/* ************************************************************************** */ - -llxHeader(); +llxHeader('',$langs->trans("Subscriptions"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $html = new Form($db); diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 87e3fd88ef6..07367ef80ea 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -136,10 +136,10 @@ if ($allowinsertbankafter && $_POST["action"] == '2bank' && $_POST["rowid"] !='' /* - * Affichage page + * View */ -llxHeader(); +llxHeader('',$langs->trans("ListOfSubscriptions"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); if ($msg) print $msg.'
'; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 82746794158..2c0b3c206ec 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -612,7 +612,7 @@ if ($user->rights->adherent->creer && $_POST["action"] == 'confirm_add_spip' && * View */ -llxHeader(); +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $html = new Form($db); diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 56152b6b3f7..268142ee435 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -37,7 +37,7 @@ $langs->load("members"); * View */ -llxHeader($langs->trans("Members"),'','EN:Fundations|FR:Adherents|ES:Miembros'); +llxHeader('',$langs->trans("Members"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $staticmember=new Adherent($db); $statictype=new AdherentType($db); diff --git a/htdocs/adherents/info.php b/htdocs/adherents/info.php index 8742334128d..90973a5b891 100644 --- a/htdocs/adherents/info.php +++ b/htdocs/adherents/info.php @@ -39,20 +39,16 @@ if (!$user->rights->adherent->lire) /* - * Visualisation de la fiche - * + * View */ -llxHeader(); +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $adh = new Adherent($db); $adh->id=$_GET["id"]; $adh->fetch($_GET["id"]); $adh->info($_GET["id"]); -/* - * Affichage onglets - */ $head = member_prepare_head($adh); dol_fiche_head($head, 'info', $langs->trans("Member"), 0, 'user'); diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php index 8fd322e7690..588a4207bb3 100644 --- a/htdocs/adherents/ldap.php +++ b/htdocs/adherents/ldap.php @@ -101,7 +101,7 @@ if ($_GET["action"] == 'dolibarr2ldap') * View */ -llxHeader(); +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $html = new Form($db); diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index ec7147fa887..a5538215665 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -65,7 +65,7 @@ if ($_REQUEST["button_removefilter"]) * View */ -llxHeader(); +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $form=new Form($db); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 125fa203539..3081088c0e3 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -65,11 +65,11 @@ if ($_POST["action"] == 'update' && $user->rights->adherent->creer && ! $_POST[" -/******************************************************************************/ -/* Affichage fiche */ -/******************************************************************************/ +/* + * View + */ -llxHeader(); +llxHeader('',$langs->trans("Member"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $html = new Form($db); diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php index 0ae2b94b391..d331aed5438 100644 --- a/htdocs/adherents/options.php +++ b/htdocs/adherents/options.php @@ -18,10 +18,11 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/** \file htdocs/adherents/options.php - \ingroup adherent - \brief Page de configuratin des champs optionnels - \version $Id$ +/** + * \file htdocs/adherents/options.php + * \ingroup adherent + * \brief Page de configuratin des champs optionnels + * \version $Id$ */ require("./pre.inc.php"); @@ -104,8 +105,7 @@ if ($_GET["action"] == 'delete' && $user->rights->adherent->configurer) * View */ -llxHeader(); - +llxHeader('',$langs->trans("OptionalFieldsSetup"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); print_titre($langs->trans("OptionalFieldsSetup")); diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index 546426211d2..05eabb1c932 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -31,7 +31,7 @@ function llxHeader($head = '', $title='', $help_url='') $langs->load("members"); - top_menu($head); + top_menu($head, $title); $menu = new Menu(); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index c151005438a..c6286d55bf8 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -110,7 +110,7 @@ if ($user->rights->adherent->configurer && $_GET["action"] == 'commentaire') * View */ -llxHeader(); +llxHeader('',$langs->trans("MembersTypeSetup"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); $form=new Form($db); diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php index cdafba70c89..6accafca68b 100644 --- a/htdocs/admin/ldap.php +++ b/htdocs/admin/ldap.php @@ -69,10 +69,10 @@ if ($_GET["action"] == 'setvalue' && $user->admin) /* - * Visu + * View */ -llxHeader(); +llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index b6009e3d11b..fb248becb72 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -78,7 +78,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) * Visu */ -llxHeader(); +llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php index 1caf859830e..b175d5cc9ce 100644 --- a/htdocs/admin/ldap_groups.php +++ b/htdocs/admin/ldap_groups.php @@ -66,10 +66,10 @@ if ($_GET["action"] == 'setvalue' && $user->admin) /* - * Visu + * View */ -llxHeader(); +llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index ea0a320ba7e..240380569d2 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -89,10 +89,10 @@ if ($_GET["action"] == 'setvalue' && $user->admin) /* - * Visu + * View */ -llxHeader(); +llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php index 1f5ca3a0a07..4acb9c2c5e9 100644 --- a/htdocs/admin/ldap_users.php +++ b/htdocs/admin/ldap_users.php @@ -21,11 +21,11 @@ */ /** - \file htdocs/admin/ldap_users.php - \ingroup ldap - \brief Page d'administration/configuration du module Ldap - \version $Id$ -*/ + * \file htdocs/admin/ldap_users.php + * \ingroup ldap + * \brief Page d'administration/configuration du module Ldap + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -80,7 +80,7 @@ if ($_GET["action"] == 'setvalue' && $user->admin) * Visu */ -llxHeader(); +llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:Módulo_LDAP'); $head = ldap_prepare_head(); diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index bc3f250d931..9f295e76ac6 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -56,7 +56,7 @@ if ($_POST["action"]=='update') * View */ -$wikihelp='EN:Installation_/_Upgrade|FR:Installation_/_Mise_a_jour|ES:Instalación_/_Actualización'; +$wikihelp='EN:Installation_/_Upgrade|FR:Installation_/_Mise_a_jour|ES:Instalaci&omodulon_/_Actualizaci&omodulon'; llxHeader($langs->trans("Upgrade"),'',$wikihelp); print_fiche_titre($langs->trans("Upgrade"),'','setup'); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index dcd88887bba..e04571a8bf6 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -104,7 +104,7 @@ if ($action=='delete_action') * View */ -llxHeader('','','EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda'); +llxHeader('','','EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'); $form=new Form($db); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index e49326dd665..1c1e9ee7df2 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -60,6 +60,7 @@ $search_email=isset($_GET["search_email"])?$_GET["search_email"]:$_POST["search_ /* * Actions */ + if ($_GET["action"] == 'add') { $modulename=$_GET["module"]; @@ -149,10 +150,10 @@ if ($_POST["button_removefilter"]) /* - * Liste des destinataires + * View */ -llxHeader("","",$langs->trans("MailCard")); +llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'); $html = new Form($db); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 691bca8e454..073c4a7eccb 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -471,7 +471,7 @@ if (! empty($_POST["cancel"])) * View */ -llxHeader("","","Fiche Mailing"); +llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'); $html = new Form($db); $htmlother = new FormOther($db); diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 4005f169b40..5bd494fd8d8 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -18,11 +18,11 @@ */ /** - \file htdocs/comm/mailing/index.php - \ingroup mailing - \brief Page accueil de la zone mailing - \version $Id$ -*/ + * \file htdocs/comm/mailing/index.php + * \ingroup mailing + * \brief Page accueil de la zone mailing + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); @@ -91,12 +91,12 @@ while (($file = readdir($handle))!==false) if (! $conf->$key->enabled || (! $user->admin && $mailmodule->require_admin)) { $qualified=0; - //print "Les prérequis d'activation du module mailing ne sont pas respectés. Il ne sera pas actif"; + //print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif"; break; } } - // Si le module mailing est qualifié + // Si le module mailing est qualifi� if ($qualified) { $var = !$var; diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php index 160615fcf64..5d1dc23f567 100644 --- a/htdocs/comm/mailing/info.php +++ b/htdocs/comm/mailing/info.php @@ -39,7 +39,7 @@ accessforbidden(); * View */ -llxHeader(); +llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'); $html = new Form($db); diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 41b4dea90bc..41c41e19de4 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -18,17 +18,17 @@ */ /** - \file htdocs/comm/mailing/liste.php - \ingroup mailing - \brief Liste des mailings - \version $Id$ -*/ + * \file htdocs/comm/mailing/liste.php + * \ingroup mailing + * \brief Liste des mailings + * \version $Id$ + */ require("./pre.inc.php"); if (!$user->rights->mailing->lire) accessforbidden(); -// Sécurité accés client +// S�curit� acc�s client if ($user->societe_id > 0) { $action = ''; @@ -54,7 +54,7 @@ $sref=isset($_GET["sref"])?$_GET["sref"]:$_POST["sref"]; * View */ -llxHeader(); +llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'); $sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec"; diff --git a/htdocs/comm/mailing/pre.inc.php b/htdocs/comm/mailing/pre.inc.php index 9392ce6b15c..c12fc7289c1 100644 --- a/htdocs/comm/mailing/pre.inc.php +++ b/htdocs/comm/mailing/pre.inc.php @@ -32,30 +32,30 @@ $langs->load("mails"); $langs->load("exports"); -function llxHeader($head = "", $title = "") +function llxHeader($head = "", $title = "", $help_url="") { global $user, $conf, $langs; - + top_menu($head, $title); - + $menu = new Menu(); - + if ($user->rights->mailing->lire) { $menu->add(DOL_URL_ROOT."/comm/mailing/index.php", $langs->trans("Mailings")); } - + if ($user->rights->mailing->creer) { $menu->add_submenu(DOL_URL_ROOT."/comm/mailing/fiche.php?action=create", $langs->trans("NewMailing")); } - + if ($user->rights->mailing->lire) { $menu->add_submenu(DOL_URL_ROOT."/comm/mailing/liste.php", $langs->trans("List")); } - - left_menu($menu->liste); + + left_menu($menu->liste, $help_url); } ?> diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 66b8cb33761..0292baf4c42 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -193,7 +193,7 @@ if ($_REQUEST['action'] == 'builddoc') * View */ -llxHeader(); +llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones'); $html=new Form($db); $formfile = new FormFile($db); diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 1f62547fc75..44a8d6ac9d0 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -15,17 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * */ /** \file htdocs/compta/dons/index.php \ingroup don \brief Page accueil espace don - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -35,10 +31,10 @@ $langs->load("donations"); /* - * Affichage + * View */ - -llxHeader(); + +llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones'); $donstatic=new Don($db); @@ -49,7 +45,7 @@ $sql.= " ORDER BY d.fk_statut"; $result = $db->query($sql); -if ($result) +if ($result) { $num = $db->num_rows(); $i = 0; @@ -63,7 +59,7 @@ if ($result) } $db->free($result); } else { - dol_print_error($db); + dol_print_error($db); } print_fiche_titre($langs->trans("DonationsArea")); diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 4961d3db3c4..2bf798bac86 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -15,16 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ */ /** \file htdocs/compta/dons/liste.php \ingroup don \brief Page de liste des dons - \version $Revision$ + \version $Id$ */ require("./pre.inc.php"); @@ -48,10 +45,10 @@ $pagenext = $page + 1; /* - * Affichage + * View */ - -llxHeader(); + +llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones'); $donstatic=new Don($db); @@ -68,16 +65,16 @@ if ($statut >= 0) $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit, $offset); $result = $db->query($sql); -if ($result) +if ($result) { $num = $db->num_rows($result); $i = 0; - + if ($statut >= 0) { print_barre_liste($libelle[$statut], $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); } - else + else { print_barre_liste($langs->trans("Donation"), $page, "liste.php", "&statut=$statut&sortorder=$sortorder&sortfield=$sortfield"); } @@ -97,7 +94,7 @@ if ($result) print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),"liste.php","d.statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); print "\n"; - + $var=True; while ($i < $num) { diff --git a/htdocs/compta/dons/pre.inc.php b/htdocs/compta/dons/pre.inc.php index 1d2878f78e5..8ace0a5f949 100644 --- a/htdocs/compta/dons/pre.inc.php +++ b/htdocs/compta/dons/pre.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2001-2003 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -38,28 +38,28 @@ $libelle[2] = $langs->trans("DonationsPayed"); $libelle[3] = $langs->trans("DonationsReceived"); -function llxHeader($head = "") +function llxHeader($head = "", $title="", $help_url="") { global $user, $conf, $langs; - + $langs->load("donations"); - - top_menu($head); - + + top_menu($head,$title); + $menu = new Menu(); - + $menu->add(DOL_URL_ROOT."/compta/dons/",$langs->trans("Donations")); $menu->add_submenu(DOL_URL_ROOT."/compta/dons/fiche.php?action=create",$langs->trans("NewDonation")); $menu->add_submenu(DOL_URL_ROOT."/compta/dons/liste.php",$langs->trans("List")); $menu->add_submenu(DOL_URL_ROOT."/compta/dons/stats.php",$langs->trans("Statistics")); - + if ($conf->banque->enabled) { $langs->load("banks"); $menu->add(DOL_URL_ROOT."/compta/bank/index.php",$langs->trans("Bank")); } - - left_menu($menu->liste); + + left_menu($menu->liste, $help_url); } ?> diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 272ecba8379..1d1981f7d2e 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -33,7 +33,7 @@ $langs->load("donations"); * View */ -llxHeader(); +llxHeader('',$langs->trans("Donations"),'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Subvenciones'); print_fiche_titre($langs->trans("Statistics")); diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index 493bc697100..f4730dab63d 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -190,7 +190,7 @@ if ($_POST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->societe * View */ -llxHeader(); +llxHeader('',$langs->trans("Contacts"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $form = new Form($db); $formcompany = new FormCompany($db); diff --git a/htdocs/contact/index.php b/htdocs/contact/index.php index 6f5455193a5..8a5c400378e 100644 --- a/htdocs/contact/index.php +++ b/htdocs/contact/index.php @@ -100,7 +100,7 @@ if ($search_priv < 0) $search_priv=''; * View */ -llxHeader($langs->trans("Contacts"),'','EN:Third_Parties|FR:Tiers|ES:Empresas'); +llxHeader('',$langs->trans("Contacts"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $form=new Form($db); diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php index e7549134c4d..183193bb360 100644 --- a/htdocs/contact/info.php +++ b/htdocs/contact/info.php @@ -42,7 +42,7 @@ $result = restrictedArea($user, 'contact',$contactid,'socpeople'); * View */ -llxHeader(); +llxHeader('',$langs->trans("Contacts"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $contact = new Contact($db); diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 417a66d186e..a7f28bd965f 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -79,7 +79,7 @@ if ($_GET["action"] == 'dolibarr2ldap') * View */ -llxHeader(); +llxHeader('',$langs->trans("Contacts"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $form = new Form($db); diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index aeabfbd7949..eaf0f1eab0f 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -70,16 +70,13 @@ if ($user->rights->societe->contact->creer) * View */ -llxHeader(); +llxHeader('',$langs->trans("Contacts"),'EN:Module_Third_Parties|FR:Module_Tiers|ES:Módulo_Empresas'); $form = new Form($db); $contact = new Contact($db); $contact->fetch($_GET["id"], $user); -/* - * Affichage onglets - */ $head = contact_prepare_head($contact); dol_fiche_head($head, 'perso', $langs->trans("Contact"), 0, 'contact'); diff --git a/htdocs/contact/pre.inc.php b/htdocs/contact/pre.inc.php index 6fa8618baaf..757471d0356 100644 --- a/htdocs/contact/pre.inc.php +++ b/htdocs/contact/pre.inc.php @@ -33,7 +33,7 @@ function llxHeader($head = '', $title='', $help_url='') $langs->load("companies"); $langs->load("commercial"); - top_menu($head); + top_menu($head,$title); $menu = new Menu(); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 1f650889f91..398e413ffb6 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -244,13 +244,13 @@ if ($step == 2 && $action == 'select_model') /* - * Affichage Pages des Etapes + * View */ if ($step == 1 || ! $datatoexport) { - llxHeader('',$langs->trans("NewExport")); + llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); /* * Affichage onglets @@ -323,7 +323,7 @@ if ($step == 1 || ! $datatoexport) if ($step == 2 && $datatoexport) { - llxHeader('',$langs->trans("NewExport")); + llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); /* @@ -464,7 +464,7 @@ if ($step == 3 && $datatoexport) { asort($array_selected); - llxHeader('',$langs->trans("NewExport")); + llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); /* * Affichage onglets @@ -638,7 +638,7 @@ if ($step == 4 && $datatoexport) { asort($array_selected); - llxHeader('',$langs->trans("NewExport")); + llxHeader('',$langs->trans("NewExport"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); /* * Affichage onglets diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index bafa000cb92..70fb90bd313 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -41,7 +41,7 @@ $export->load_arrays($user); * View */ -llxHeader('',$langs->trans("ExportsArea")); +llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); print_fiche_titre($langs->trans("ExportsArea")); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 0cab43114ce..865f685e70f 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -250,7 +250,7 @@ $objmodelimport=new ModeleImports(); if ($step == 1 || ! $datatoimport) { - llxHeader('',$langs->trans("NewImport")); + llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); /* * Affichage onglets @@ -323,7 +323,7 @@ if ($step == 1 || ! $datatoimport) if ($step == 2 && $datatoimport) { - llxHeader('',$langs->trans("NewImport")); + llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); /* * Affichage onglets @@ -510,7 +510,7 @@ if ($step == 3 && $datatoimport) var_dump($array_match_file_to_database); - llxHeader('',$langs->trans("NewImport")); + llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); /* * Affichage onglets @@ -729,7 +729,7 @@ if ($step == 4 && $datatoimport) { asort($array_match_file_to_database); - llxHeader('',$langs->trans("NewImport")); + llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); /* * Affichage onglets diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 7d70a97c3af..ab42a221f0e 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -39,7 +39,7 @@ $import->load_arrays($user); * View */ -llxHeader('',$langs->trans("ImportArea")); +llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports|ES:Módulo_Importaciones'); print_fiche_titre($langs->trans("ImportArea")); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 0ad3bdf7b69..e7b67fb3c4d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1050,7 +1050,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') print '">'; print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' '; print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help'); - if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; + //if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')'; print ''; print ''; } diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 69877390f2b..cf4dd760c4f 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -55,10 +55,10 @@ $result = restrictedArea($user, 'projet', $projetid); /* -* View -*/ + * View + */ -llxHeader("",$langs->trans("Referers")); +llxHeader("",$langs->trans("Referers"),"EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"); $form = new Form($db); @@ -156,33 +156,33 @@ foreach ($listofreferent as $key => $value) { $var=true; $total = 0; - for ($i = 0; $ifetch($elementarray[$i]); + for ($i = 0; $ifetch($elementarray[$i]); - $var=!$var; - print ""; - print ""; + $var=!$var; + print ""; + print ""; print $element->getNomUrl(1); print "\n"; - $date=$element->date; + $date=$element->date; if (empty($date)) $date=$element->datep; if (empty($date)) $date=$element->date_contrat; print ''.dol_print_date($date,'day').''; - print ''.(isset($element->total_ht)?price($element->total_ht):' ').''; - print ''.$element->getLibStatut(5).''; - print ''; + print ''.(isset($element->total_ht)?price($element->total_ht):' ').''; + print ''.$element->getLibStatut(5).''; + print ''; - $total = $total + $element->total_ht; - } + $total = $total + $element->total_ht; + } - print ''.$langs->trans("Number").': '.$i.''; - print ''.$langs->trans("TotalHT").' : '.price($total).''; - print ' '; - print ''; + print ''.$langs->trans("Number").': '.$i.''; + print ''.$langs->trans("TotalHT").' : '.price($total).''; + print ' '; + print ''; } - print ""; + print ""; /* * Barre d'action @@ -193,11 +193,11 @@ foreach ($listofreferent as $key => $value) { if ($key == 'propal' && $conf->propal->enabled && $user->rights->propale->creer) { - print ''.$langs->trans("AddProp").''; + print ''.$langs->trans("AddProp").''; } if ($key == 'order' && $conf->commande->enabled && $user->rights->commande->creer) { - print ''.$langs->trans("AddCustomerOrder").''; + print ''.$langs->trans("AddCustomerOrder").''; } if ($key == 'invoice' && $conf->facture->enabled && $user->rights->facture->creer) { diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php index fcf7702c5b7..deb25bcaf17 100644 --- a/htdocs/projet/fiche.php +++ b/htdocs/projet/fiche.php @@ -138,7 +138,7 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == "yes" && * View */ -llxHeader("",$langs->trans("Project"),"Projet"); +llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"); $html = new Form($db); diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 3d5238d193e..d123e0ccc2e 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -41,7 +41,7 @@ if ($user->societe_id > 0) * View */ -llxHeader("",$langs->trans("Projects"),"EN:Projects|FR:Projet|ES:Proyectos"); +llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"); $text=$langs->trans("Projects"); if ($_REQUEST["mode"]=='mine') $text=$langs->trans("MyProjects"); diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index 15baee0f062..04c4aa13f80 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -63,7 +63,7 @@ $pagenext = $page + 1; * View */ -llxHeader(); +llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"); $projectstatic = new Project($db); $userstatic = new User($db);