lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Better link to help wiki

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-18 11:40:33 +00:00
parent 5d47ed6e83
commit 0c74892580
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/main.lang
View File

@ -74,6 +74,8 @@ No=No
All=All All=All
Home=Home Home=Home
Help=Help Help=Help
OnlineHelp=Online help
PageWiki=Wiki page
Always=Always Always=Always
Never=Never Never=Never
Under=under Under=under

2
htdocs/langs/fr_FR/main.lang
View File

@ -73,6 +73,8 @@ No=Non
All=Tout All=Tout
Home=Accueil Home=Accueil
Help=Aide Help=Aide
OnlineHelp=Aide en ligne
PageWiki=Page Wiki
Always=Toujours Always=Toujours
Never=Jamais Never=Jamais
Under=sous Under=sous

17
htdocs/main.inc.php
View File

@ -769,9 +769,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<!-- Includes for PWC (Used for confirm popup) -->'."\n"; print '<!-- Includes for PWC (Used for confirm popup) -->'."\n";
// PWC css // PWC css
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/alert.css">'."\n"; print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/alert.css">'."\n";
// Scriptaculous used by PWC
// print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/effects.js"></script>'."\n";
// print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/controls.js"></script>'."\n";
// PWC js // PWC js
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window.js"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/pwc/window.js"></script>'."\n";
} }
@ -824,7 +821,7 @@ function top_menu($head, $title='', $target='')
/* /*
* Barre de menu superieure * Top menu
*/ */
print "\n".'<!-- Start top horizontal menu -->'."\n"; print "\n".'<!-- Start top horizontal menu -->'."\n";
print '<div class="tmenu">'."\n"; print '<div class="tmenu">'."\n";
@ -1006,10 +1003,11 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
// If complete URL // If complete URL
$helpbaseurl='%s'; $helpbaseurl='%s';
$helppage=$helppagename; $helppage=$helppagename;
$mode='local';
} }
else else
{ {
// If relative URL // If WIKI URL
$helppage=''; $helppage='';
if (eregi('^es',$langs->defaultlang)) if (eregi('^es',$langs->defaultlang))
{ {
@ -1026,17 +1024,22 @@ function left_menu($menu_array, $helppagename='', $moresearchform='')
$helpbaseurl='http://wiki.dolibarr.org/index.php/%s'; $helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
if (eregi('EN:([^|]+)',$helppagename,$reg)) $helppage=$reg[1]; if (eregi('EN:([^|]+)',$helppagename,$reg)) $helppage=$reg[1];
} }
$mode='wiki';
} }
// Link to help pages // Link to help pages
if ($helpbaseurl && $helppage) if ($helpbaseurl && $helppage)
{ {
print '<div class="help">'; print '<div class="help">';
print '<a class="help" target="_blank" title="'.$langs->trans("GoToHelpPage").'" href="'; print '<a class="help" target="_blank" title="'.$langs->trans("GoToHelpPage");
if ($mode == 'wiki') print ' - '.$langs->trans("PageWiki").' '.$helppage;
print '" href="';
print sprintf($helpbaseurl,$helppage); print sprintf($helpbaseurl,$helppage);
print '">'; print '">';
print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' '; print img_picto('',DOL_URL_ROOT.'/theme/common/helpdoc.png','',1).' ';
print $langs->trans("Help").'</a>'; print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
if ($mode == 'wiki') print ' ('.dol_trunc($helppage,8).')';
print '</a>';
print '</div>'; print '</div>';
} }
} }