From 3c0a8c8b1964a2a8564e1068ed592e0a0e20f462 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 7 Feb 2020 12:13:35 +0100
Subject: [PATCH] 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.
---
 .../admin/user_groups/user_group_edit_advanced.mako        | 6 +++++-
 .../templates/admin/user_groups/user_group_edit_perms.mako | 6 +++++-
 .../admin/user_groups/user_group_edit_settings.mako        | 6 +++++-
 rhodecode/templates/admin/users/user_edit_advanced.mako    | 5 ++++-
 rhodecode/templates/admin/users/user_edit_audit.mako       | 6 ++++--
 rhodecode/templates/admin/users/user_edit_auth_tokens.mako | 7 ++++++-
 rhodecode/templates/admin/users/user_edit_caches.mako      | 5 ++++-
 rhodecode/templates/admin/users/user_edit_emails.mako      | 5 ++++-
 rhodecode/templates/admin/users/user_edit_groups.mako      | 7 +++++--
 rhodecode/templates/admin/users/user_edit_ips.mako         | 7 ++++++-
 rhodecode/templates/admin/users/user_edit_profile.mako     | 5 ++++-
 rhodecode/templates/admin/users/user_edit_ssh_keys.mako    | 7 ++++++-
 .../templates/admin/users/user_edit_ssh_keys_generate.mako | 7 ++++++-
 rhodecode/templates/base/base.mako                         | 4 ++--
 14 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako b/rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako
index 67483ffe..269b27bb 100644
--- 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 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Advanced')}
+        </h3>
     </div>
     <div class="panel-body">
         ${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
index 616458e0..e92ad149 100644
--- 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 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group Permissions')}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Access Permissions')}
+        </h3>
     </div>
     <div class="panel-body">
         ${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
index 5df1783a..8c00a2bf 100644
--- 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 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
+        <h3 class="panel-title">
+            <i class="icon-user-group" title="${_('User group')}"></i>
+            ${h.link_to_group(c.user_group.users_group_name)}
+            - ${_('Settings')}
+        </h3>
     </div>
     <div class="panel-body">
     ${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
index 18e75db2..06430f6b 100644
--- a/rhodecode/templates/admin/users/user_edit_advanced.mako
+++ b/rhodecode/templates/admin/users/user_edit_advanced.mako
@@ -25,7 +25,10 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User: {}').format(c.user.username)}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('Access Permissions')}
+        </h3>
     </div>
     <div class="panel-body">
         <table class="rctable">
diff --git a/rhodecode/templates/admin/users/user_edit_audit.mako b/rhodecode/templates/admin/users/user_edit_audit.mako
index 5fe0e011..324f4f81 100644
--- a/rhodecode/templates/admin/users/user_edit_audit.mako
+++ b/rhodecode/templates/admin/users/user_edit_audit.mako
@@ -4,8 +4,10 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('User Audit Logs')} -
-      ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Audit Logs')}
+          (${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)})
       </h3>
       <a href="${h.route_path('edit_user_audit_logs_download', user_id=c.user.user_id)}" class="panel-edit">${_('Download as JSON')}</a>
     </div>
diff --git a/rhodecode/templates/admin/users/user_edit_auth_tokens.mako b/rhodecode/templates/admin/users/user_edit_auth_tokens.mako
index 1c7f60cd..8240d5ba 100644
--- 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"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('Authentication Tokens')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Authentication Tokens')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="apikeys_wrap">
diff --git a/rhodecode/templates/admin/users/user_edit_caches.mako b/rhodecode/templates/admin/users/user_edit_caches.mako
index 11cd9fc2..28b7c081 100644
--- a/rhodecode/templates/admin/users/user_edit_caches.mako
+++ b/rhodecode/templates/admin/users/user_edit_caches.mako
@@ -2,7 +2,10 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Caches')}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('Caches')}
+        </h3>
     </div>
     <div class="panel-body">
     <p>
diff --git a/rhodecode/templates/admin/users/user_edit_emails.mako b/rhodecode/templates/admin/users/user_edit_emails.mako
index febb5ccb..15a4905d 100644
--- a/rhodecode/templates/admin/users/user_edit_emails.mako
+++ b/rhodecode/templates/admin/users/user_edit_emails.mako
@@ -2,7 +2,10 @@
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Additional Email Addresses')}</h3>
+        <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Additional Email Addresses')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="emails_wrap">
diff --git a/rhodecode/templates/admin/users/user_edit_groups.mako b/rhodecode/templates/admin/users/user_edit_groups.mako
index c69a65ca..65d49b29 100644
--- 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"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('User groups administration')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('User groups administration')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="fields">
diff --git a/rhodecode/templates/admin/users/user_edit_ips.mako b/rhodecode/templates/admin/users/user_edit_ips.mako
index 106ab688..56dcb8a4 100644
--- 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"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Custom IP Whitelist')}</h3>
+        <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('Custom IP Whitelist')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="ips_wrap">
diff --git a/rhodecode/templates/admin/users/user_edit_profile.mako b/rhodecode/templates/admin/users/user_edit_profile.mako
index ae0cd29e..0e4766a0 100644
--- a/rhodecode/templates/admin/users/user_edit_profile.mako
+++ b/rhodecode/templates/admin/users/user_edit_profile.mako
@@ -2,7 +2,10 @@
 
 <div class="panel panel-default user-profile">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('User Profile')}</h3>
+        <h3 class="panel-title">
+            ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+            &nbsp;- ${_('User Profile')}
+        </h3>
     </div>
     <div class="panel-body">
         <div class="user-profile-content">
diff --git a/rhodecode/templates/admin/users/user_edit_ssh_keys.mako b/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
index 24e18cdc..8a1753fa 100644
--- a/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
+++ b/rhodecode/templates/admin/users/user_edit_ssh_keys.mako
@@ -1,6 +1,11 @@
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-      <h3 class="panel-title">${_('SSH Keys')}</h3>
+      <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('SSH Keys')}
+      </h3>
     </div>
     <div class="panel-body">
         <div class="sshkeys_wrap">
diff --git a/rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako b/rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako
index b2ac0256..12556076 100644
--- a/rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako
+++ b/rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako
@@ -1,6 +1,11 @@
+<%namespace name="base" file="/base/base.mako"/>
+
 <div class="panel panel-default">
     <div class="panel-heading">
-         <h3 class="panel-title">${_('New SSH Key generation')}</h3>
+         <h3 class="panel-title">
+          ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
+          &nbsp;- ${_('New SSH Key generation')}
+         </h3>
     </div>
     <div class="panel-body">
         %if c.ssh_enabled and c.ssh_key_generator_enabled:
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
index 9935d065..0ef3d106 100644
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -230,13 +230,13 @@
 </%def>
 
 
-<%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False)">
+<%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False, _class='rc-user')">
   <%
       email = h.email_or_none(contact)
       rc_user = h.discover_user(contact)
   %>
 
-  <div class="rc-user">
+  <div class="${_class}">
     ${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)}
     <span class="${('user user-disabled' if show_disabled else 'user')}"> ${h.link_to_user(rc_user or contact)}</span>
   </div>