diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index f1d243d5514..d2c0a9ef288 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -754,8 +754,11 @@ else * Affichage onglets */ $head = user_prepare_head($fuser); + + $title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); + $title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; - dol_fiche_head($head, 'user', $langs->trans("User")); + dol_fiche_head($head, 'user', $title); /* @@ -1299,13 +1302,15 @@ else else { print ''; - if ($user->admin && ($fuser->entity!=0)) // On ne modifie pas le superadmin + if ($user->admin && $fuser->entity!=0) // On ne modifie pas le superadmin { print $form->selectyesno('admin',$fuser->admin,1); } else { - print ''.yn($fuser->admin); + $yn = yn($fuser->admin); + print ''; + print $html->textwithwarning($yn,$langs->trans("DontChangeSuperAdmin")); } print ''; } @@ -1321,13 +1326,14 @@ else { print $langs->trans("DomainUser"); } - else if ($fuser->entity!=0) + if ($fuser->admin && !$fuser->entity) { - print $langs->trans("Internal"); + print $langs->trans("SuperAdministrator"); + print ' '.img_picto($langs->trans("SuperAdministrator"),"redstar"); } else { - print $langs->trans("SuperAdmin"); + print $langs->trans("Internal"); } print ''; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index b576f3e4b6a..e8b39042c61 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -251,8 +251,12 @@ else // Nom print ''.$langs->trans("Name").''; - print ''.$group->nom.''; - print "\n"; + print ''.$group->nom; + if (!$group->entity) + { + print img_redstar($langs->trans("GlobalGroup")); + } + print "\n"; // Note print ''.$langs->trans("Note").''; @@ -369,7 +373,7 @@ else print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; if ($obj->admin && !$obj->entity) { - print img_picto($langs->trans("SuperAdministrator"),'redstar'); + print img_redstar($langs->trans("SuperAdministrator")); } else if ($obj->admin) { @@ -417,8 +421,12 @@ else print ''; print ''; - print ''; - print "\n"; + print '\n"; print ''; print '"; print ''; diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 985fcc99207..5c899facf01 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -154,8 +154,12 @@ if ($_GET["id"]) // Nom print ''; - print ''; - print "\n"; + print '\n"; // Note print ''; diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 87d64385179..51bc91d612e 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -101,7 +101,7 @@ if ($resql) print "
'.$langs->trans("Name").'
'; + if (!$group->entity) + { + print img_redstar($langs->trans("GlobalGroup")); + } + print "
'.$langs->trans("Note").''; if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_USER) diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 3c07753efa4..9abdff0d5eb 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -91,7 +91,7 @@ if ($resql) print ''.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; if (!$obj->entity) { - print img_picto($langs->trans("GlobalGroup"),'redstar'); + print img_redstar($langs->trans("GlobalGroup")); } print "'.dol_print_date($obj->datec,"day").'
'.$langs->trans("Name").''.$fgroup->nom.'
'.$fgroup->nom.''; + if (!$obj->entity) + { + print img_redstar($langs->trans("GlobalGroup")); + } + print "
'.$langs->trans("Note").'rowid\">".img_object($langs->trans("ShowUser"),"user")." ".$obj->firstname." ".$obj->name.""; if ($obj->admin && !$obj->entity) { - print img_picto($langs->trans("SuperAdministrator"),'redstar'); + print img_redstar($langs->trans("SuperAdministrator")); } else if ($obj->admin) { diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 6af5512efab..aafe4705126 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -100,7 +100,7 @@ if ($result) print ''.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; if ($obj->admin && !$obj->entity) { - print img_picto($langs->trans("SuperAdministrator"),'redstar'); + print img_redstar($langs->trans("SuperAdministrator")); } else if ($obj->admin) { diff --git a/htdocs/user/info.php b/htdocs/user/info.php index 6a6d1f8ecdc..68d4f4b068c 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -51,7 +51,10 @@ $fuser->info($_GET["id"]); $head = user_prepare_head($fuser); -dol_fiche_head($head, 'info', $langs->trans("User")); +$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); +$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; + +dol_fiche_head($head, 'info', $title); print '
'; diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 9b036c6933c..af2c24b0194 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -92,8 +92,10 @@ $form = new Form($db); */ $head = user_prepare_head($fuser); -dol_fiche_head($head, 'ldap', $langs->trans("User")); +$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); +$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; +dol_fiche_head($head, 'ldap', $title); /* diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 398a36a8486..76c6b632cfa 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -82,7 +82,10 @@ if ($id) { $head = user_prepare_head($fuser); - dol_fiche_head($head, 'note', $langs->trans("User")); + $title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); + $title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; + + dol_fiche_head($head, 'note', $title); if ($msg) print '
'.$msg.'
'; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 29c9619ff00..c20740a11c7 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -113,7 +113,10 @@ llxHeader(); */ $head = user_prepare_head($fuser); -dol_fiche_head($head, 'guisetup', $langs->trans("User")); +$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); +$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; + +dol_fiche_head($head, 'guisetup', $title); print ''; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index b598dbb267e..7148b50afb7 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -94,7 +94,10 @@ $fuser->getrights(); */ $head = user_prepare_head($fuser); -dol_fiche_head($head, 'rights', $langs->trans("User")); +$title = $fuser->admin ? $langs->trans("Administrator") : $langs->trans("User"); +$title = !$fuser->entity ? $langs->trans("SuperAdministrator") : $title; + +dol_fiche_head($head, 'rights', $title); $db->begin();