New: Some pages can link to wiki help pages

This commit is contained in:
Laurent Destailleur 2009-03-09 10:51:42 +00:00
parent 567100671b
commit f3cfea66e1
4 changed files with 30 additions and 16 deletions

View File

@ -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 '<br>';

View File

@ -35,7 +35,7 @@ if (! $user->admin)
* View
*/
llxHeader();
llxHeader('','','EN:Restores|FR:Restaurations|ES:Restauraciones');
print_fiche_titre($langs->trans("Restore"),'','setup');
print '<br>';

View File

@ -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);
}
?>

View File

@ -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 "<!-- End Bookmarks -->\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 '<div class="help">';
print '<a class="help" target="_blank" href="';