diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index c4f2a00e7af..dcb561f5e3b 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -41,7 +41,7 @@ $formfile = new FormFile($db); * Affichage page */ -llxHeader(); +llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'); print_fiche_titre($langs->trans("Backup"),'','setup'); print '
'; diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php index 216b35bf531..1500201d3aa 100644 --- a/htdocs/admin/tools/dolibarr_import.php +++ b/htdocs/admin/tools/dolibarr_import.php @@ -35,7 +35,7 @@ if (! $user->admin) * View */ -llxHeader(); +llxHeader('','','EN:Restores|FR:Restaurations|ES:Restauraciones'); print_fiche_titre($langs->trans("Restore"),'','setup'); print '
'; diff --git a/htdocs/admin/tools/pre.inc.php b/htdocs/admin/tools/pre.inc.php index 6f05f6e9ff9..359fec61fc9 100644 --- a/htdocs/admin/tools/pre.inc.php +++ b/htdocs/admin/tools/pre.inc.php @@ -24,17 +24,17 @@ require("../../main.inc.php"); -function llxHeader($head = "", $urlp = "") +function llxHeader($head = '', $title='', $help_url='') { global $langs; $langs->load("admin"); - + top_menu($head); - + $menu = new Menu(); - + $menu->add(DOL_URL_ROOT."/admin/tools/index.php", "SystemTools"); $menu->add_submenu(DOL_URL_ROOT."/admin/tools/dolibarr_export.php", $langs->trans("Backup")); $menu->add_submenu(DOL_URL_ROOT."/admin/tools/dolibarr_import.php", $langs->trans("Restore")); @@ -42,8 +42,8 @@ function llxHeader($head = "", $urlp = "") if (function_exists('eaccelerator_info')) $menu->add_submenu(DOL_URL_ROOT."/admin/tools/eaccelerator.php", $langs->trans("EAccelerator")); $menu->add_submenu(DOL_URL_ROOT."/admin/tools/listevents.php", $langs->trans("Audit")); $menu->add_submenu(DOL_URL_ROOT."/admin/tools/purge.php", $langs->trans("Purge")); - - left_menu($menu->liste); + + left_menu($menu->liste, $help_url); } ?> diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6e9def767b9..1964f638794 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -832,9 +832,11 @@ function top_menu($head, $title='', $target='') /** * \brief Affiche barre de menu gauche - * \param menu_array Tableau des entrees de menu - * \param helppagename Url pour le lien aide ('' par defaut) - * \param moresearchform Formulaire de recherche permanant supplementaire + * \param menu_array Tableau des entrees de menu + * \param helppagename Name of wiki page for help ('' by default). + * Syntax is: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage + * or http://server/url + * \param moresearchform Formulaire de recherche permanant supplementaire */ function left_menu($menu_array, $helppagename='', $moresearchform='') { @@ -929,7 +931,7 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') print "\n"; } - // Lien vers l'aide en ligne (uniquement si langue fr_FR) + // Link to Dolibarr wiki pages if ($helppagename) { $langs->load("help"); @@ -943,15 +945,27 @@ function left_menu($menu_array, $helppagename='', $moresearchform='') } else { - // If relatvie URL - if ($langs->defaultlang == "fr_FR") + // If relative URL + $helppage=$langs->trans($helppagename); // By default + + if (eregi('^es',$langs->defaultlang)) { $helpbaseurl='http://wiki.dolibarr.org/index.php/%s'; + if (eregi('ES:([^|]+)',$helppage,$reg)) $helppage=$reg[1]; + } + elseif (eregi('^fr',$langs->defaultlang)) + { + $helpbaseurl='http://wiki.dolibarr.org/index.php/%s'; + if (eregi('FR:([^|]+)',$helppage,$reg)) $helppage=$reg[1]; + } + else + { + $helpbaseurl='http://wiki.dolibarr.org/index.php/%s'; + if (eregi('EN:([^|]+)',$helppage,$reg)) $helppage=$reg[1]; } - $helppage=$langs->trans($helppagename); } - if ($helpbaseurl) + if ($helpbaseurl && $helppage) { print '
'; print '