This commit is contained in:
Laurent Destailleur 2021-03-25 08:37:59 +01:00
parent 99496e365f
commit c30c6bcf43
3 changed files with 8 additions and 5 deletions

View File

@ -2073,8 +2073,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$btnUser = '<!-- div for user link --> $btnUser = '<!-- div for user link -->
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block"> <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.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown"> <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
'.$userImage.' '.$userImage.'<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<!-- User image --> <!-- User image -->

View File

@ -2452,6 +2452,7 @@ div.mainmenu.website {
// End of part to add more div class css // End of part to add more div class css
} // End test if $dol_hide_topmenu ?> } // End test if $dol_hide_topmenu ?>
.tmenuimage { .tmenuimage {
padding:0 0 0 0 !important; padding:0 0 0 0 !important;
margin:0 0px 0 0 !important; margin:0 0px 0 0 !important;
@ -2464,6 +2465,9 @@ div.mainmenu.website {
display: none; display: none;
<?php } ?> <?php } ?>
} }
a.tmenuimage:hover {
text-decoration: none;
}
a.tmenuimage { a.tmenuimage {
display: block; display: block;
} }

View File

@ -1963,7 +1963,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Ref/ID // Ref/ID
if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
print '<td>'; print '<td>';
print $object->id; print $object->id;
print '</td>'; print '</td>';
@ -1971,13 +1971,13 @@ if ($action == 'create' || $action == 'adduserldap') {
} }
// Civility // Civility
print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">'; print '<tr><td class="titlefieldcreate"><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code'); print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
print '</td></tr>'; print '</td></tr>';
// Lastname // Lastname
print "<tr>"; print "<tr>";
print '<td class="titlefield fieldrequired">'.$langs->trans("Lastname").'</td>'; print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Lastname").'</td>';
print '<td>'; print '<td>';
if ($caneditfield && !$object->ldap_sid) { if ($caneditfield && !$object->ldap_sid) {
print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">'; print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';