# HG changeset patch # User Marcin Kuzminski # Date 2016-06-18 00:09:41 # Node ID 48a40e43df96fe1ea19b0fc6731030645f2511e8 # Parent c6a3436d4e2ab8e29ed898f187ad85fd98889fb8 repos, repo groups, user groups: visually show what user is an owner, and if potentially he is disabled in the system. diff --git a/rhodecode/public/css/forms.less b/rhodecode/public/css/forms.less --- a/rhodecode/public/css/forms.less +++ b/rhodecode/public/css/forms.less @@ -269,6 +269,33 @@ form.rcform { } +.badged-field { + .user-badge { + line-height: 25px; + padding: 10px 5px; + border-radius: @border-radius; + border-top: 1px solid @rclightblue; + border-left: 1px solid @rclightblue; + border-bottom: 1px solid @rclightblue; + font-size: 14px; + font-style: normal; + color: @text-light; + display: inline-block; + vertical-align: top; + cursor: default; + margin-right: -2px; + } + .badge-input-container { + display: flex; + position: relative; + } + .user-disabled { + text-decoration: line-through; + } + .badge-input-wrap { + display: inline-block; + } +} // for situations where we wish to display the form value but not the form input input.input-valuedisplay { diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html --- a/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html +++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html @@ -1,4 +1,6 @@ ## -*- coding: utf-8 -*- +<%namespace name="base" file="/base/base.html"/> +

${_('Settings for Repository Group: %s') % c.repo_group.name}

@@ -16,15 +18,25 @@ ${h.text('group_name',class_='medium')}
-
+ +
- ${h.text('user', class_="medium", autocomplete="off")} - ${_('Change Repository Group Owner.')} +
+
+ ${base.gravatar_with_user(c.repo_group.user.email, show_disabled=not c.repo_group.user.active)} +
+
+ ${h.text('user', class_="medium", autocomplete="off")} +
+
+ +

${_('Change owner of this repository group.')}

+
diff --git a/rhodecode/templates/admin/repos/repo_edit_settings.html b/rhodecode/templates/admin/repos/repo_edit_settings.html --- a/rhodecode/templates/admin/repos/repo_edit_settings.html +++ b/rhodecode/templates/admin/repos/repo_edit_settings.html @@ -1,3 +1,6 @@ +## -*- coding: utf-8 -*- +<%namespace name="base" file="/base/base.html"/> +

${_('Settings for Repository: %s') % c.repo_info.repo_name}

@@ -69,15 +72,25 @@

${_('Default commit for files page, downloads, whoosh and readme')}

-
+ +
- ${h.text('user', class_="medium", autocomplete="off")} -

${_('Change owner of this repository.')}

+
+
+ ${base.gravatar_with_user(c.repo_info.user.email, show_disabled=not c.repo_info.user.active)} +
+
+ ${h.text('user', class_="medium", autocomplete="off")} +
+
+ +

${_('Change owner of this repository.')}

-
+
+
diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_settings.html b/rhodecode/templates/admin/user_groups/user_group_edit_settings.html --- a/rhodecode/templates/admin/user_groups/user_group_edit_settings.html +++ b/rhodecode/templates/admin/user_groups/user_group_edit_settings.html @@ -1,3 +1,6 @@ +## -*- coding: utf-8 -*- +<%namespace name="base" file="/base/base.html"/> +

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

@@ -15,15 +18,25 @@ ${h.text('users_group_name',class_='medium')}
-
+ +
- ${h.text('user', class_="medium", autocomplete="off")} - ${_('Change owner of this user group.')} +
+
+ ${base.gravatar_with_user(c.user_group.user.email, show_disabled=not c.user_group.user.active)} +
+
+ ${h.text('user', class_="medium", autocomplete="off")} +
+
+ +

${_('Change owner of this user group.')}

-
+
+