From 3d6849dfea49d009368a90dab84f2731028954db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2020 17:27:08 +0100 Subject: [PATCH] Fix label of tabs --- htdocs/admin/user.php | 6 ++++-- htdocs/admin/usergroup.php | 2 ++ htdocs/core/lib/usergroups.lib.php | 4 ++-- htdocs/langs/en_US/admin.lang | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index 56602502715..fb15a57a87e 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -147,13 +147,13 @@ dol_fiche_head($head, 'card', $langs->trans("MenuUsersAndGroups"), -1, 'user'); print ''; print ''; -print ''; +print ''; print ''; print ''."\n"; print ''; -// Mail required for members +// Mail required for users print ''; print ''; @@ -206,6 +206,8 @@ else dol_print_error($db); } +print load_fiche_titre($langs->trans("UsersDocModules"), '', ''); + print '
'.$langs->trans("Description").''.$langs->trans("Parameter").' '.$langs->trans("Value").'
'.$langs->trans("UserMailRequired").'
'; print ''; print ''; diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index 43910bedb56..4f556ff19b3 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -152,6 +152,8 @@ else dol_print_error($db); } +print load_fiche_titre($langs->trans("GroupsDocModules"), '', ''); + print '
'.$langs->trans("Name").'
'; print ''; print ''; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index a234f4ed5e0..a6fc287d0cf 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -268,12 +268,12 @@ function user_admin_prepare_head() $h++; $head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][1] = $langs->trans("ExtraFields")." (".$langs->trans("Users").")"; $head[$h][2] = 'attributes'; $h++; $head[$h][0] = DOL_URL_ROOT.'/user/admin/group_extrafields.php'; - $head[$h][1] = $langs->trans("ExtraFields")." ".$langs->trans("Groups"); + $head[$h][1] = $langs->trans("ExtraFields")." (".$langs->trans("Groups").")"; $head[$h][2] = 'attributes_group'; $h++; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4c9772a16e5..b1eb3778af8 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1264,6 +1264,8 @@ RuleForGeneratedPasswords=Rules to generate and validate passwords DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page UsersSetup=Users module setup UserMailRequired=Email required to create a new user +UsersDocModules=Document templates for documents generated from user record +GroupsDocModules=Document templates for documents generated from a group record ##### HRM setup ##### HRMSetup=HRM module setup ##### Company setup #####
'.$langs->trans("Name").'