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

Merge pull request #2104 from frederic34/patch-10

Browse Source 
Rearrange Help Block in left menu
This commit is contained in:
Laurent Destailleur 2014-11-27 23:19:18 +01:00
commit e6d200d83a
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/main.inc.php
View File

@ -1629,8 +1629,11 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print "<!-- End Bookmarks -->\n";
}
//Dolibarr version
$doliurl='http://www.dolibarr.org';
print "\n";
print "<!-- Begin Help Block-->\n";
print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
//Dolibarr version
$doliurl='http://www.dolibarr.org';
//local communities
if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
@ -1650,11 +1653,11 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
else $appli.=" ".DOL_VERSION;
}
else $appli.=" ".DOL_VERSION;
print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
print '<div class="blockvmenuhelp">';
if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
print $appli;
if ($doliurl) print '</a>';
print '</div>';
print '</div>'."\n";
// Link to Dolibarr wiki pages
if ($helppagename && empty($conf->global->MAIN_HELP_DISABLELINK))
@ -1674,7 +1677,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
// Link to help pages
if ($helpbaseurl && $helppage)
{
print '<div id="blockvmenuhelp" class="blockvmenuhelp">';
print '<div class="blockvmenuhelp">';
print '<a class="help" target="_blank" title="'.$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
if ($mode == 'wiki') print ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
print '" href="';
@ -1685,7 +1688,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
print $langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
//if ($mode == 'wiki') print ' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
print '</a>';
print '</div>';
print '</div>'."\n";
}
}
@ -1702,14 +1705,16 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
$bugbaseurl.=urlencode($langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."\n");
$bugbaseurl.=urlencode($langs->trans("PHP").": ".version_php()."\n");
$bugbaseurl.=urlencode($langs->trans("Url").": ".$_SERVER["REQUEST_URI"]."\n");
print '<div id="blockvmenubugtracker" class="blockvmenuhelp"><a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a></div>';
print '<div class="blockvmenuhelp"><a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a></div>';
}
print "\n";
print "</div>\n";
print "<!-- End left menu -->\n";
print "</div>\n";
print "<!-- End Help Block-->\n";
print "\n";
print "\n";
print "</div>\n";
print "<!-- End left menu -->\n";
print "\n";
// Execute hook printLeftBlock
$parameters=array();