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

Some fix on MAIN_TOP_MENU_DROPDOWN option

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-22 11:49:10 +01:00
parent c43cf843a9
commit 3b4ea82741
3 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/main.inc.php
View File

@ -1712,8 +1712,15 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
} }
/**
function top_menu_user(user $user, $langs){ * Build the tooltip on user login
*
* @param user $user User object
* @param Translate $langs Language object
* @return string HTML content
*/
function top_menu_user(User $user, Translate $langs)
{
global $langs, $conf, $db, $hookmanager, $user; global $langs, $conf, $db, $hookmanager, $user;
global $dolibarr_main_authentication, $dolibarr_main_demo; global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager; global $menumanager;
@ -1726,8 +1733,6 @@ function top_menu_user(user $user, $langs){
} }
$dropdownBody = ''; $dropdownBody = '';
$dropdownBody.= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>'; $dropdownBody.= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
$dropdownBody.= '<div id="topmenuloginmoreinfo" >'; $dropdownBody.= '<div id="topmenuloginmoreinfo" >';
@ -1745,6 +1750,7 @@ function top_menu_user(user $user, $langs){
$type=($user->socid?$langs->trans("External").$company:$langs->trans("Internal")); $type=($user->socid?$langs->trans("External").$company:$langs->trans("Internal"));
$dropdownBody.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type; $dropdownBody.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
$dropdownBody.= '<br><b>' . $langs->trans("Status").'</b>: '.$user->getLibStatut(0); $dropdownBody.= '<br><b>' . $langs->trans("Status").'</b>: '.$user->getLibStatut(0);
$dropdownBody.= '<br>';
$dropdownBody.= '<br><u>'.$langs->trans("Connection").'</u>'; $dropdownBody.= '<br><u>'.$langs->trans("Connection").'</u>';
$dropdownBody.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"]; $dropdownBody.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.$_SERVER["REMOTE_ADDR"];
@ -1792,7 +1798,7 @@ function top_menu_user(user $user, $langs){
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu"> <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu">
<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle" data-toggle="dropdown"> <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle" data-toggle="dropdown">
'.$userImage.' '.$userImage.'
<span class="hidden-xs">'.($user->firstname ? $user->firstname : $user->login).'</span> <span class="hidden-xs maxwidth200">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 11).'</span>
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<!-- User image --> <!-- User image -->

2
htdocs/theme/eldy/dropdown.css.php
View File

@ -79,6 +79,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
height: 175px; height: 175px;
padding: 10px; padding: 10px;
text-align: center; text-align: center;
white-space: normal;
} }
.dropdown-user-image { .dropdown-user-image {
@ -166,4 +167,3 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
background-color: #f4f4f4; background-color: #f4f4f4;
border-color: #ddd; border-color: #ddd;
} }

2
htdocs/theme/eldy/global.inc.php
View File

@ -1879,7 +1879,6 @@ div.login_block_other { padding-top: 0; text-align: right; }
} }
.atoplogin, .atoplogin:hover { .atoplogin, .atoplogin:hover {
color: #<?php echo $colortextbackhmenu; ?> !important; color: #<?php echo $colortextbackhmenu; ?> !important;
font-weight: normal !important;
} }
.login_block_getinfo { .login_block_getinfo {
text-align: center; text-align: center;
@ -5714,6 +5713,7 @@ div.tabsElem a.tab {
} }
.login_block_elem { .login_block_elem {
padding: 0 !important; padding: 0 !important;
height: 38px;
} }
li.tmenu, li.tmenusel { li.tmenu, li.tmenusel {
min-width: 32px; min-width: 32px;