Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
b7d5f16da2
1 changed files with 12 additions and 12 deletions
|
|
@ -1743,7 +1743,7 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
|
||||
// Color user
|
||||
if (isModEnabled('agenda')) {
|
||||
print '<tr><td class="titlefield">'.$langs->trans("ColorUser").'</td>';
|
||||
print '<tr><td class="titlefieldmax45">'.$langs->trans("ColorUser").'</td>';
|
||||
print '<td>';
|
||||
print $formother->showColor($object->color, '');
|
||||
print '</td>';
|
||||
|
|
@ -1752,8 +1752,8 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
|
||||
// Categories
|
||||
if (isModEnabled('category') && $user->hasRight("categorie", "read")) {
|
||||
print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
|
||||
print '<td colspan="3">';
|
||||
print '<tr><td>'.$langs->trans("Categories").'</td>';
|
||||
print '<td>';
|
||||
print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
|
@ -1762,7 +1762,7 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
if (getDolGlobalInt('MAIN_MULTILANGS')) {
|
||||
$langs->load("languages");
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
print '<tr><td class="titlefield">';
|
||||
print '<tr><td>';
|
||||
print $form->textwithpicto($langs->trans("DefaultLang"), $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
|
||||
print '</td><td>';
|
||||
//$s=picto_from_langcode($object->default_lang);
|
||||
|
|
@ -1859,16 +1859,16 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
|
||||
print '<br>';
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="border tableforfield centpercent">';
|
||||
print '<table class="noborder tableforfield centpercent">';
|
||||
|
||||
print '<tr class="liste_titre"><td class="liste_titre">';
|
||||
print img_picto('', 'security', 'class="paddingleft pictofixedwidth"').$langs->trans("Credentials");
|
||||
print '</td>';
|
||||
print '<td class="liste_titre"></td>';
|
||||
print '<tr class="liste_titre"><th class="liste_titre">';
|
||||
print img_picto('', 'security', 'class="paddingleft pictofixedwidth"').$langs->trans("Security");
|
||||
print '</th>';
|
||||
print '<th class="liste_titre"></th>';
|
||||
print '</tr>';
|
||||
|
||||
// Date login validity
|
||||
print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("RangeOfLoginValidity").'</td>';
|
||||
print '<tr class="nooddeven"><td class="titlefieldmax45">'.$langs->trans("RangeOfLoginValidity").'</td>';
|
||||
print '<td>';
|
||||
if ($object->datestartvalidity) {
|
||||
print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
|
||||
|
|
@ -1883,7 +1883,7 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
|
||||
// Alternative email for OAUth2 login
|
||||
if (!empty($object->email_oauth2) && preg_match('/googleoauth/', $dolibarr_main_authentication)) {
|
||||
print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("AlternativeEmailForOAuth2").'</td>';
|
||||
print '<tr class="nooddeven"><td class="titlefieldmiddle">'.$langs->trans("AlternativeEmailForOAuth2").'</td>';
|
||||
print '<td>';
|
||||
print dol_print_email($object->email_oauth2);
|
||||
print '</td>';
|
||||
|
|
@ -1938,7 +1938,7 @@ if ($action == 'create' || $action == 'adduserldap') {
|
|||
}
|
||||
|
||||
if (dol_string_nohtmltag($valuetoshow)) { // If there is a real visible content to show
|
||||
print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("Password").'</td>';
|
||||
print '<tr class="nooddeven"><td class="titlefieldmiddle">'.$langs->trans("Password").'</td>';
|
||||
print '<td class="wordbreak">';
|
||||
print $valuetoshow;
|
||||
print "</td>";
|
||||
|
|
|
|||
Loading…
Reference in a new issue