# HG changeset patch # User Marcin Kuzminski # Date 2020-02-07 11:13:35 # Node ID 60646747d33e1dc8876b0aed600969f9951dbec7 # Parent aed576283e0bef71c00ab20806726dbc478395f3 users/user-groups: added context of what we're editing. - Before panel titles didn't show names of edited objects which could be confusing and lead to editing wrong users or user groups. diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako --- a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako +++ b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako @@ -18,7 +18,11 @@
-

${_('User Group: %s') % c.user_group.users_group_name}

+

+ + ${h.link_to_group(c.user_group.users_group_name)} + - ${_('Advanced')} +

${base.dt_info_panel(elems)} diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako --- a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako +++ b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako @@ -2,7 +2,11 @@
-

${_('User Group Permissions')}

+

+ + ${h.link_to_group(c.user_group.users_group_name)} + - ${_('Access Permissions')} +

${h.secure_form(h.route_path('edit_user_group_perms_update', user_group_id=c.user_group.users_group_id), request=request)} diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako --- a/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako +++ b/rhodecode/templates/admin/user_groups/user_group_edit_settings.mako @@ -3,7 +3,11 @@
-

${_('User Group: %s') % c.user_group.users_group_name}

+

+ + ${h.link_to_group(c.user_group.users_group_name)} + - ${_('Settings')} +

${h.secure_form(h.route_path('user_groups_update', user_group_id=c.user_group.users_group_id), id='edit_user_group', request=request)} diff --git a/rhodecode/templates/admin/users/user_edit_advanced.mako b/rhodecode/templates/admin/users/user_edit_advanced.mako --- a/rhodecode/templates/admin/users/user_edit_advanced.mako +++ b/rhodecode/templates/admin/users/user_edit_advanced.mako @@ -25,7 +25,10 @@
-

${_('User: {}').format(c.user.username)}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Access Permissions')} +

diff --git a/rhodecode/templates/admin/users/user_edit_audit.mako b/rhodecode/templates/admin/users/user_edit_audit.mako --- a/rhodecode/templates/admin/users/user_edit_audit.mako +++ b/rhodecode/templates/admin/users/user_edit_audit.mako @@ -4,8 +4,10 @@
-

${_('User Audit Logs')} - - ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)} +

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Audit Logs')} + (${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)})

${_('Download as JSON')}
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako --- a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako +++ b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako @@ -1,6 +1,11 @@ +<%namespace name="base" file="/base/base.mako"/> +
-

${_('Authentication Tokens')}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Authentication Tokens')} +

diff --git a/rhodecode/templates/admin/users/user_edit_caches.mako b/rhodecode/templates/admin/users/user_edit_caches.mako --- a/rhodecode/templates/admin/users/user_edit_caches.mako +++ b/rhodecode/templates/admin/users/user_edit_caches.mako @@ -2,7 +2,10 @@
-

${_('Caches')}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Caches')} +

diff --git a/rhodecode/templates/admin/users/user_edit_emails.mako b/rhodecode/templates/admin/users/user_edit_emails.mako --- a/rhodecode/templates/admin/users/user_edit_emails.mako +++ b/rhodecode/templates/admin/users/user_edit_emails.mako @@ -2,7 +2,10 @@

-

${_('Additional Email Addresses')}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Additional Email Addresses')} +

diff --git a/rhodecode/templates/admin/users/user_edit_groups.mako b/rhodecode/templates/admin/users/user_edit_groups.mako --- a/rhodecode/templates/admin/users/user_edit_groups.mako +++ b/rhodecode/templates/admin/users/user_edit_groups.mako @@ -1,9 +1,12 @@ ## -*- coding: utf-8 -*- - +<%namespace name="base" file="/base/base.mako"/>
-

${_('User groups administration')}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('User groups administration')} +

diff --git a/rhodecode/templates/admin/users/user_edit_ips.mako b/rhodecode/templates/admin/users/user_edit_ips.mako --- a/rhodecode/templates/admin/users/user_edit_ips.mako +++ b/rhodecode/templates/admin/users/user_edit_ips.mako @@ -1,6 +1,11 @@ +<%namespace name="base" file="/base/base.mako"/> +
-

${_('Custom IP Whitelist')}

+

+ ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')} +  - ${_('Custom IP Whitelist')} +

diff --git a/rhodecode/templates/admin/users/user_edit_profile.mako b/rhodecode/templates/admin/users/user_edit_profile.mako --- a/rhodecode/templates/admin/users/user_edit_profile.mako +++ b/rhodecode/templates/admin/users/user_edit_profile.mako @@ -2,7 +2,10 @@