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

Option to hide version

Browse Source
This commit is contained in:
Laurent Destailleur 2017-03-21 11:37:03 +01:00
parent 75da1bac69
commit 5231fbf1e3
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/main.inc.php
View File

@ -1390,7 +1390,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$logouttext=''; $logouttext='';
if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{ {
$logouthtmltext=$appli.'<br>'; //$logouthtmltext=$appli.'<br>';
if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
{ {
$logouthtmltext.=$langs->trans("Logout").'<br>'; $logouthtmltext.=$langs->trans("Logout").'<br>';
@ -1467,8 +1467,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if ($helpbaseurl && $helppage) if ($helpbaseurl && $helppage)
{ {
$text=''; $text='';
$title=''; $title=$appli.'<br>';
//$text.='<div id="blockvmenuhelpwiki" class="blockvmenuhelp">';
$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage'); $title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;'; if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
$text.='<a class="help" target="_blank" href="'; $text.='<a class="help" target="_blank" href="';
@ -1631,32 +1630,35 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n"; print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
// Version // Version
$doliurl='http://www.dolibarr.org'; if (empty($conf->global->MAIN_HIDE_VERSION)) // Version is already on help picto and on login page.
//local communities {
if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr'; $doliurl='https://www.dolibarr.org';
if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es'; //local communities
if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de'; if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';
if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it'; if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es';
if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr'; if (preg_match('/de/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.de';
if (preg_match('/it/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.it';
$appli=constant('DOL_APPLICATION_TITLE'); if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.gr';
if (! empty($conf->global->MAIN_APPLICATION_TITLE))
{ $appli=constant('DOL_APPLICATION_TITLE');
$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl=''; if (! empty($conf->global->MAIN_APPLICATION_TITLE))
if (preg_match('/\d\.\d/', $appli)) {
{ $appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core if (preg_match('/\d\.\d/', $appli))
} {
else $appli.=" ".DOL_VERSION; if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core
} }
else $appli.=" ".DOL_VERSION; else $appli.=" ".DOL_VERSION;
print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">'; }
if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">'; else $appli.=" ".DOL_VERSION;
else print '<span class="help">'; print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
print $appli; if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
if ($doliurl) print '</a>'; else print '<span class="help">';
else print '</span>'; print $appli;
print '</div>'."\n"; if ($doliurl) print '</a>';
else print '</span>';
print '</div>'."\n";
}
// Link to bugtrack // Link to bugtrack
if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))