diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 54e6b5ce1ef..7a817f90e46 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2294,7 +2294,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
{
global $langs, $conf, $db, $hookmanager, $user, $mysoc;
global $dolibarr_main_authentication, $dolibarr_main_demo;
- global $menumanager;
+ global $menumanager, $form;
// Return empty in some case
if ($conf->browser->name == 'textbrowser') {
@@ -2392,12 +2392,13 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$tz = (int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
$dropdownBody .= '
'.$langs->trans("ClientTZ").': '.($tz ? ($tz >= 0 ? '+' : '').$tz : '');
- $dropdownBody .= ' ('.$_SESSION['dol_tz_string'].')';
+ $dropdownBody .= ' ('.$_SESSION['dol_tz_string'].')';
//$dropdownBody .= ' '.$langs->trans("DaylingSavingTime").': ';
//if ($_SESSION['dol_dst'] > 0) $dropdownBody .= yn(1);
//else $dropdownBody .= yn(0);
- $dropdownBody .= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
+ $dropdownBody .= '
'.$langs->trans("Browser").': '.ucfirst($conf->browser->name).($conf->browser->version ? ' '.$conf->browser->version : '');
+ $dropdownBody .= $form->textwithpicto('', dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']), 1, 'help', 'valignmiddle', 0, 3, 'useragent');
$dropdownBody .= '
'.$langs->trans("Layout").': '.$conf->browser->layout;
$dropdownBody .= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
if ($conf->browser->layout == 'phone') {
@@ -2537,7 +2538,6 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
';
- //if ($conf->theme != 'md') {
$btnUser .= '
jQuery("#topmenu-login-dropdown .dropdown-toggle").on("click", function(event) {
console.log("Click on #topmenu-login-dropdown .dropdown-toggle");
@@ -2547,14 +2547,19 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
jQuery("#topmenulogincompanyinfo-btn").on("click", function() {
console.log("Click on #topmenulogincompanyinfo-btn");
+ if (!jQuery("#topmenuloginmoreinfo").is(\':hidden\')) {
+ jQuery("#topmenuloginmoreinfo").slideToggle();
+ }
jQuery("#topmenulogincompanyinfo").slideToggle();
});
jQuery("#topmenuloginmoreinfo-btn").on("click", function() {
console.log("Click on #topmenuloginmoreinfo-btn");
+ if (!jQuery("#topmenulogincompanyinfo").is(\':hidden\')) {
+ jQuery("#topmenulogincompanyinfo").slideToggle();
+ }
jQuery("#topmenuloginmoreinfo").slideToggle();
});';
- //}
$btnUser .= '
});