From 288ce5c55381ed511c10605b9d5d02729d47f402 Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Tue, 12 Mar 2019 14:00:26 +0100 Subject: [PATCH] add more info --- htdocs/main.inc.php | 61 +++++++++++++++++------------ htdocs/theme/eldy/_dropdown.css.php | 25 ++++++++++-- htdocs/theme/eldy/_global.css.php | 3 +- htdocs/theme/md/style.css.php | 5 +++ 4 files changed, 63 insertions(+), 31 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index eed717a611a..33cad2ca38e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1732,13 +1732,17 @@ function top_menu_user(user $user, $langs){ $userImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1); $userDropDownImage = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1); } - - // login infos + $dropdownBody = ''; + + + $dropdownBody.= ''.$langs->trans("ShowMoreInfos").''; + $dropdownBody.= '
'; + + // login infos if (!empty($user->admin)){ $dropdownBody.= '
' . $langs->trans("Administrator").': '.yn($user->admin); } - if (! empty($user->socid) ) // Add thirdparty for external users { $thirdpartystatic = new Societe($db); @@ -1749,25 +1753,23 @@ function top_menu_user(user $user, $langs){ $type=($user->socid?$langs->trans("External").$company:$langs->trans("Internal")); $dropdownBody.= '
' . $langs->trans("Type") . ': ' . $type; $dropdownBody.= '
' . $langs->trans("Status").': '.$user->getLibStatut(0); - - - $dropdownBody.= '
'; - $dropdownBody.= '
'.$langs->trans("Connection").''; - $dropdownBody.= '
'.$langs->trans("IPAddress").': '.$_SERVER["REMOTE_ADDR"]; - if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody.= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')'; - $dropdownBody.= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)'); - $dropdownBody.= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser'); - $dropdownBody.= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser'); - $dropdownBody.= '
'.$langs->trans("CurrentTheme").': '.$conf->theme; - $dropdownBody.= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name; - $s=picto_from_langcode($langs->getDefaultLang()); - $dropdownBody.= '
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang(); - $dropdownBody.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')'; - $dropdownBody.= '
'.$langs->trans("Layout").': '.$conf->browser->layout; - $dropdownBody.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight']; - if ($conf->browser->layout == 'phone') $dropdownBody.= '
'.$langs->trans("Phone").': '.$langs->trans("Yes"); - if (! empty($_SESSION["disablemodules"])) $dropdownBody.= '
'.$langs->trans("DisabledModules").':
'.join(', ', explode(',', $_SESSION["disablemodules"])); + $dropdownBody.= '
'.$langs->trans("Connection").''; + $dropdownBody.= '
'.$langs->trans("IPAddress").': '.$_SERVER["REMOTE_ADDR"]; + if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody.= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')'; + $dropdownBody.= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)'); + $dropdownBody.= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser'); + $dropdownBody.= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser'); + $dropdownBody.= '
'.$langs->trans("CurrentTheme").': '.$conf->theme; + $dropdownBody.= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name; + $langFlag=picto_from_langcode($langs->getDefaultLang()); + $dropdownBody.= '
'.$langs->trans("CurrentUserLanguage").': '.($langFlag?$langFlag.' ':'').$langs->getDefaultLang(); + $dropdownBody.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')'; + $dropdownBody.= '
'.$langs->trans("Layout").': '.$conf->browser->layout; + $dropdownBody.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight']; + if ($conf->browser->layout == 'phone') $dropdownBody.= '
'.$langs->trans("Phone").': '.$langs->trans("Yes"); + if (! empty($_SESSION["disablemodules"])) $dropdownBody.= '
'.$langs->trans("DisabledModules").':
'.join(', ', explode(',', $_SESSION["disablemodules"])); + $dropdownBody.= '
'; // Execute hook $parameters=array('user'=>$user, 'langs' => $langs); @@ -1784,14 +1786,14 @@ function top_menu_user(user $user, $langs){ - $logoutLink =''.$langs->trans("Logout").''; + $logoutLink =' '.$langs->trans("Logout").''; $profilLink =''.$langs->trans("Card").''; $profilName = $user->getFullName($langs).' ('.$user->login.')'; if($user->admin){ - $profilName = ' '.$profilName; + $profilName = ' '.$profilName; } $btnUser = ' @@ -1807,7 +1809,7 @@ function top_menu_user(user $user, $langs){

'.$profilName.' -
'.dol_print_date(time()).$user->date_creation.' +
'.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'

@@ -1822,11 +1824,13 @@ function top_menu_user(user $user, $langs){
'.$logoutLink.'
+
- + $("#topmenuloginmoreinfo-btn").on("click", function() { + $("#topmenuloginmoreinfo").slideToggle(); + }); + +}); + '; diff --git a/htdocs/theme/eldy/_dropdown.css.php b/htdocs/theme/eldy/_dropdown.css.php index b5575273227..bbca607aa21 100644 --- a/htdocs/theme/eldy/_dropdown.css.php +++ b/htdocs/theme/eldy/_dropdown.css.php @@ -6,7 +6,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> */ -.open>.dropdown-menu { +.open>.dropdown-menu{ /*, #topmenu-login-dropdown:hover .dropdown-menu*/ display: block; } @@ -43,7 +43,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> * MENU Dropdown */ -.tmenu .open.dropdown, .login_block .open.dropdown{ +.tmenu .open.dropdown, .login_block .open.dropdown, .tmenu .open.dropdown, .login_block .dropdown:hover{ background: rgba(0, 0, 0, 0.1); } .tmenu .dropdown-menu, .login_block .dropdown-menu { @@ -100,7 +100,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> padding: 10px; } -.dropdown-menu > .user-footer:after { +.user-footer:after { clear: both; } @@ -108,8 +108,25 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> padding: 15px; border-bottom: 1px solid #f4f4f4; border-top: 1px solid #dddddd; + white-space: normal; } +#topmenu-login-dropdown{ +padding: 0 5px 0 5px; +} + +#topmenuloginmoreinfo-btn{ + display: block; + text-aling: right; + color:#666; + cursor: pointer; +} + +#topmenuloginmoreinfo{ + display: none; + clear: both; + font-size: 0.9em; +} .button-top-menu-dropdown { display: inline-block; @@ -133,7 +150,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> border-radius: 4px; } -.dropdown-menu > .user-footer .button-top-menu-dropdown { +.user-footer .button-top-menu-dropdown { color: #666666; border-radius: 0; -webkit-box-shadow: none; diff --git a/htdocs/theme/eldy/_global.css.php b/htdocs/theme/eldy/_global.css.php index 3b881b4e34b..7b44846f2c6 100644 --- a/htdocs/theme/eldy/_global.css.php +++ b/htdocs/theme/eldy/_global.css.php @@ -1818,7 +1818,8 @@ div.login_block { } div.login_block a { - color: #; + color: #; + display: inline-block; } div.login_block table { display: inline; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fbee7633173..d4af08104d9 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1229,6 +1229,7 @@ div.login_block { /* border-right: none ! important; */ top: inherit !important; } + .side-nav { browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?> @@ -1986,6 +1987,10 @@ table.login_table_securitycode tr td { } +.atoplogin.dropdown .dropdown-menu { + display: none; +} + div.login_block { border-right: 1px solid rgba(0,0,0,0.3); padding-top: 5px;