diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 1126bd859..3d439a134 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -75,7 +75,7 @@ update_user_list(); update_selection_content(); $(".icon-help-circled").tipTip({ - 'maxWidth':'650px', + 'maxWidth':'700px', 'fadeIn': '1000', }); @@ -565,10 +565,13 @@ $(".icon-help-circled").tipTip({

{'Status'|@translate} + title="

+
{'user_status_webmaster'|translate}{'Has access to all administration functionnalities. Can manage both configuration and content.'|translate}
+
{'user_status_admin'|translate}{'Has access to administration. Can only manage content: photos/albums/users/tags/groups.'|translate}
+
{'user_status_normal'|translate}{'No access to administration, can see private content with appropriate permissions.'|translate}
+
{'user_status_generic'|translate}{'Can be shared by several individuals without conflict (they cannot change the password).'|translate}
+
{'user_status_guest'|translate}{'Equivalent to deactivation. The user is still in the list, but can no longer log in.'|translate}
+

@@ -2331,4 +2334,23 @@ Advanced filter .selectable .user-container-select { border: none; } + +.tooltip-status-content { + text-align:left; + font-size:14px; +} +.tooltip-status-row { + margin-top:10px; + margin-bottom: 20px; + padding: 0 10px; +} +.tooltip-col1 { + display:inline-block; + width:150px; + vertical-align: top; +} +.tooltip-col2 { + display:inline-block; + max-width:500px; +} diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 3aa25b32c..3e0e146d3 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1234,3 +1234,8 @@ $lang['Filters'] = 'Filters'; $lang['Synchronization'] = 'Synchronization'; $lang['Activated plugin list'] = 'Activated plugin list'; $lang['No plugin activated'] = 'No plugin activated'; +$lang['Has access to all administration functionnalities. Can manage both configuration and content.'] = 'Has access to all administration functionnalities. Can manage both configuration and content.'; +$lang['Has access to administration. Can only manage content: photos/albums/users/tags/groups.'] = 'Has access to administration. Can only manage content: photos/albums/users/tags/groups.'; +$lang['No access to administration, can see private content with appropriate permissions.'] = 'No access to administration, can see private content with appropriate permissions.'; +$lang['Can be shared by several individuals without conflict (they cannot change the password).'] = 'Can be shared by several individuals without conflict (they cannot change the password).'; +$lang['Equivalent to deactivation. The user is still in the list, but can no longer log in.'] = 'Equivalent to deactivation. The user is still in the list, but can no longer log in.'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 7e7de7807..8678f8506 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1236,3 +1236,8 @@ $lang['Filters'] = 'Filtres'; $lang['Synchronization'] = 'Synchronisation'; $lang['Activated plugin list'] = 'Liste des plugins activés'; $lang['No plugin activated'] = 'Aucun plugin activé'; +$lang['Has access to all administration functionnalities. Can manage both configuration and content.'] = 'Accède à toutes les fonctionnalités d\'administration, en contenu et en configuration.'; +$lang['Has access to administration. Can only manage content: photos/albums/users/tags/groups.'] = 'Accède à l\'administration, mais uniquement sur le contenu : photos/albums/utilisateurs/tags/groupes.'; +$lang['No access to administration, can see private content with appropriate permissions.'] = 'Pas d\'accès à l\'administration. Peut accéder au contenu privé s\'il en a les permissions.'; +$lang['Can be shared by several individuals without conflict (they cannot change the password).'] = 'Partageable entre plusieurs personnes sans rentrer en conflit (mot de passe non modifiable).'; +$lang['Equivalent to deactivation. The user is still in the list, but can no longer log in.'] = 'Équivalent à une désactivation. L\'utilisateur est toujours dans la liste mais ne peut plus se connecter.';