From 4e2546bb19e51914ac842bf3254c838e101998b8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Nov 2007 20:05:57 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20On=20d=E9place=20l'entr=E9=20menu=20tri?= =?UTF-8?q?ggers=20dans=20les=20infos=20systemes=20car=20il=20n'y=20a=20ri?= =?UTF-8?q?en=20=E0=20configurer=20la.=20Ce=20n'est=20qu'informatif=20et?= =?UTF-8?q?=20=E0=20destination=20de=20l'administrateur=20systeme.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/admin/pre.inc.php | 2 -- htdocs/admin/system/pre.inc.php | 4 ++-- htdocs/includes/menus/barre_left/eldy_backoffice.php | 2 +- htdocs/includes/menus/barre_left/eldy_frontoffice.php | 2 +- htdocs/includes/menus/barre_left/empty.php | 6 +++--- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/htdocs/admin/pre.inc.php b/htdocs/admin/pre.inc.php index b4db041210a..3ed09543559 100644 --- a/htdocs/admin/pre.inc.php +++ b/htdocs/admin/pre.inc.php @@ -54,8 +54,6 @@ function llxHeader($head = "", $title="", $help_url='') $menu->add(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts")); - $menu->add(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); - $menu->add(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security")); $menu->add(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails")); diff --git a/htdocs/admin/system/pre.inc.php b/htdocs/admin/system/pre.inc.php index 9801db63567..528266c4c48 100644 --- a/htdocs/admin/system/pre.inc.php +++ b/htdocs/admin/system/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -46,6 +45,7 @@ function llxHeader($head = "", $urlp = "") // Dolibarr $menu->add(DOL_URL_ROOT."/admin/system/dolibarr.php", "Dolibarr"); $menu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters")); + $menu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); $menu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About")); // OS diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index c256d9ed506..c12a01cc26e 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -132,7 +132,6 @@ class MenuLeft { if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts")); - if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits")); @@ -142,6 +141,7 @@ class MenuLeft { $newmenu->add(DOL_URL_ROOT."/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo")); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),2); + if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers"),2); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About"),2); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS")); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer")); diff --git a/htdocs/includes/menus/barre_left/eldy_frontoffice.php b/htdocs/includes/menus/barre_left/eldy_frontoffice.php index 6b21cd8755f..211645fa439 100644 --- a/htdocs/includes/menus/barre_left/eldy_frontoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_frontoffice.php @@ -134,7 +134,6 @@ class MenuLeft { if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts")); - if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails")); if ($leftmenu=="setup") $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits")); @@ -144,6 +143,7 @@ class MenuLeft { $newmenu->add(DOL_URL_ROOT."/admin/system/index.php?leftmenu=system", $langs->trans("SystemInfo")); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/dolibarr.php", $langs->trans("Dolibarr"),1); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/constall.php", $langs->trans("AllParameters"),2); + if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers"),2); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/about.php", $langs->trans("About"),2); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/os.php", $langs->trans("OS")); if ($leftmenu=="system") $newmenu->add_submenu(DOL_URL_ROOT."/admin/system/web.php", $langs->trans("WebServer")); diff --git a/htdocs/includes/menus/barre_left/empty.php b/htdocs/includes/menus/barre_left/empty.php index 84e28c60ca4..aae59caf512 100644 --- a/htdocs/includes/menus/barre_left/empty.php +++ b/htdocs/includes/menus/barre_left/empty.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2006-2007 Laurent Destailleur * * 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 @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /** @@ -65,8 +64,9 @@ class MenuLeft { $newmenu->add_submenu(DOL_URL_ROOT."/admin/ihm.php", $langs->trans("GUISetup")); $newmenu->add_submenu(DOL_URL_ROOT."/admin/boxes.php", $langs->trans("Boxes")); $newmenu->add_submenu(DOL_URL_ROOT."/admin/delais.php",$langs->trans("Alerts")); - $newmenu->add_submenu(DOL_URL_ROOT."/admin/triggers.php", $langs->trans("Triggers")); $newmenu->add_submenu(DOL_URL_ROOT."/admin/perms.php", $langs->trans("Security")); + $newmenu->add_submenu(DOL_URL_ROOT."/admin/mails.php", $langs->trans("EMails")); + $newmenu->add_submenu(DOL_URL_ROOT."/admin/limits.php", $langs->trans("Limits")); $newmenu->add_submenu(DOL_URL_ROOT."/admin/dict.php", $langs->trans("DictionnarySetup")); $newmenu->add_submenu(DOL_URL_ROOT."/admin/const.php", $langs->trans("OtherSetup")); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 72b9f5f5430..8d932cd09d8 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -469,7 +469,7 @@ SystemAreaForAdminOnly=This area is available for administrator users only. None CompanyFundationDesc=Edit on this page all known information of the company or fundation you need to manage DisplayDesc=You can choose here all parameters related to the Dolibarr look and feel TriggersAvailable=Triggers available -TriggersDesc=Triggers are components that modify, once activated, the behaviour of Dolibarr workflow. They add new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggersDesc=Triggers are files that, once copied into directory htdocs/includes/triggers, modify the behaviour of Dolibarr workflow. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password DictionnaryDesc=Define here all reference datas. You can complete predefined value with yours ConstDesc=All other parameters not available in previous pages diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 5ece246921b..5fc925f277b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -469,7 +469,7 @@ SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type a CompanyFundationDesc=Éditer sur cette page toutes les informations connues sur la société ou association que vous devez gérer DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr TriggersAvailable=Triggers disponibles -TriggersDesc=Les triggers sont des composants qui, une fois activés, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat...). +TriggersDesc=Les triggers sont des fichiers qui, une fois déposés dans le répertoire htdocs/includes/triggers, modifient le comportement du workflow de Dolibarr. Ils réalisent des actions supplémentaires, déclenchées par les événements Dolibarr (création société, validation facture, clôture contrat...). GeneratedPasswordDesc=Definissez ici quelle règle vous voulez utilisez pour générer les mots de passe quand vous demander à fabriquer un nouveau mot de passe DictionnaryDesc=Definissez ici les données de référence. Vous pouvez compléter/modifier les données prédéfinies avec les votres ConstDesc=Tout autre parametre non editable dans les pages précédentes