Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX option MAIN_OPTIMIZEFORTEXTBROWSER

Browse Source
This commit is contained in:
Laurent Destailleur
2020-02-26 20:11:42 +01:00
parent 8f8a733d7b
commit 8b1fff202b
1 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
htdocs/main.inc.php
View File

@@ -1841,40 +1841,50 @@ function top_menu_user()
} }
else $appli .= " ".DOL_VERSION; else $appli .= " ".DOL_VERSION;
$btnUser = '<!-- div for user link --> if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block"> $btnUser = '<!-- div for user link -->
<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown"> <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
'.$userImage.' <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span> '.$userImage.'
</a> <span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
<div class="dropdown-menu"> </a>
<!-- User image --> <div class="dropdown-menu">
<div class="user-header"> <!-- User image -->
'.$userDropDownImage.' <div class="user-header">
'.$userDropDownImage.'
<p> <p>
'.$profilName.'<br> '.$profilName.'<br>
<small class="classfortooltip" title="'.$langs->trans("PreviousConnexion").'" ><i class="fa fa-user-clock"></i> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'</small><br> <small class="classfortooltip" title="'.$langs->trans("PreviousConnexion").'" ><i class="fa fa-user-clock"></i> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'</small><br>
<small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small> <small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small>
</p> </p>
</div> </div>
<!-- Menu Body --> <!-- Menu Body -->
<div class="user-body">'.$dropdownBody.'</div> <div class="user-body">'.$dropdownBody.'</div>
<!-- Menu Footer--> <!-- Menu Footer-->
<div class="user-footer"> <div class="user-footer">
<div class="pull-left"> <div class="pull-left">
'.$profilLink.' '.$profilLink.'
</div> </div>
<div class="pull-right"> <div class="pull-right">
'.$logoutLink.' '.$logoutLink.'
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
</div> </div>
</div>'; </div>';
} else {
$btnUser = '<!-- div for user link -->
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">
'.$userImage.'
<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
</a>
</div>';
}
if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) // This may be set by some pages that use different jquery version to avoid errors if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) // This may be set by some pages that use different jquery version to avoid errors
{ {