From 9dba1ee3fa109dd5112f7510511b8091f8113284 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 24 Aug 2009 17:11:30 +0000 Subject: [PATCH] New: Link to wiki help --- htdocs/comm/action/fiche.php | 3 ++- htdocs/comm/action/index.php | 3 ++- htdocs/comm/action/listactions.php | 28 +++++++++++++++------------- htdocs/comm/mailing/fiche.php | 3 ++- htdocs/comm/mailing/index.php | 3 ++- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 243f7d809a8..1a16ad113fd 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -419,7 +419,8 @@ if ($_POST["action"] == 'update') * View */ -llxHeader(); +$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'; +llxHeader('',$langs->trans("Agenda"),$help_url); $html = new Form($db); $htmlactions = new FormActions($db); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 8b3edff6c0e..25058d3feeb 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -104,7 +104,8 @@ if ($action=='delete_action') * View */ -llxHeader('','','EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'); +$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'; +llxHeader('',$langs->trans("Agenda"),$help_url); $form=new Form($db); diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 0fb1127828b..c1f683f7478 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -25,7 +25,7 @@ \brief Page liste des actions commerciales \version $Id$ */ - + require_once("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/contact.class.php"); require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php"); @@ -63,12 +63,12 @@ if ($page == -1) { $page = 0 ; } $limit = $conf->liste_limit; $offset = $limit * $page ; if (! $sortorder) -{ +{ $sortorder="ASC"; if ($status == 'todo') $sortorder="DESC"; if ($status == 'done') $sortorder="DESC"; } -if (! $sortfield) +if (! $sortfield) { $sortfield="a.percent"; if ($status == 'todo') $sortfield="a.datep"; @@ -97,7 +97,9 @@ if (! empty($_POST["viewcal"])) * View */ -llxHeader(); +$help_url='EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda'; +llxHeader('',$langs->trans("Agenda"),$help_url); + $form=new Form($db); $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,"; @@ -125,7 +127,7 @@ if ($_GET["type"]) $sql.= " AND c.id = ".$_GET["type"]; if ($_REQUEST["time"] == "today") $sql.= " AND date_format(a.datep, '%d%m%Y') = ".strftime("%d%m%Y",time()); if ($status == 'done') { $sql.= " AND a.percent = 100"; } if ($status == 'todo') { $sql.= " AND a.percent < 100"; } -if ($filtera > 0 || $filtert > 0 || $filterd > 0) +if ($filtera > 0 || $filtert > 0 || $filterd > 0) { $sql.= " AND ("; if ($filtera > 0) $sql.= " a.fk_user_author = ".$filtera; @@ -143,7 +145,7 @@ if ($resql) { $actionstatic=new ActionComm($db); $societestatic=new Societe($db); - + $num = $db->num_rows($resql); $title=$langs->trans("DoneAndToDoActions"); @@ -171,9 +173,9 @@ if ($resql) { print_barre_liste($langs->trans($title), $page, $_SERVER["PHP_SELF"], $param,$sortfield,$sortorder,'',$num); } - + //print '
'; - + if ($canedit) { print '
'; @@ -203,7 +205,7 @@ if ($resql) print ''; print $form->select_users($filtert,'usertodo',1,'',!$canedit); print ''; - + print ''; print ''; //print ' '; @@ -215,8 +217,8 @@ if ($resql) print ''; print '

'; } - - + + $i = 0; print ""; print ''; @@ -231,11 +233,11 @@ if ($resql) print_liste_field_titre($langs->trans("DoneBy"),$_SERVER["PHP_SELF"],"ud.login",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder); print "\n"; - + $contactstatic = new Contact($db); $now=gmmktime(); $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; - + $var=true; while ($i < min($num,$limit)) { diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 9ad0ea3334d..e283e8a436f 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -471,7 +471,8 @@ if (! empty($_POST["cancel"])) * View */ -llxHeader('',$langs->trans("Mailing"),'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'); +$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'; +llxHeader('',$langs->trans("Mailing"),$help_url); $html = new Form($db); $htmlother = new FormOther($db); diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 5bd494fd8d8..47b6e340fc5 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -38,7 +38,8 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) * View */ -llxHeader('','Mailing'); +$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing'; +llxHeader('','EMailing',$help_url); print_fiche_titre($langs->trans("MailingArea"));