engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

repos, repo groups, user groups: visually show what user is an owner, and if

Browse source 
potentially he is disabled in the system.
This commit is contained in:
Marcin Kuzminski 2016-06-18 02:09:41 +02:00
parent 2687022328
commit c1da5a8ad4
4 changed files with 76 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rhodecode/public/css/forms.less
View file

@ -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 {

18
rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html
View file

@ -1,4 +1,6 @@
## -*- coding: utf-8 -*-
<%namespace name="base" file="/base/base.html"/>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Settings for Repository Group: %s') % c.repo_group.name}</h3>
@ -16,15 +18,25 @@
${h.text('group_name',class_='medium')}
</div>
</div>
<div class="field">
<div class="field badged-field">
<div class="label">
<label for="user">${_('Owner')}:</label>
</div>
<div class="input">
${h.text('user', class_="medium", autocomplete="off")}
<span class="help-block">${_('Change Repository Group Owner.')}</span>
<div class="badge-input-container">
<div class="user-badge">
${base.gravatar_with_user(c.repo_group.user.email, show_disabled=not c.repo_group.user.active)}
</div>
<div class="badge-input-wrap">
${h.text('user', class_="medium", autocomplete="off")}
</div>
</div>
<form:error name="user"/>
<p class="help-block">${_('Change owner of this repository group.')}</p>
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="group_description">${_('Description')}:</label>

21
rhodecode/templates/admin/repos/repo_edit_settings.html
View file

@ -1,3 +1,6 @@
## -*- coding: utf-8 -*-
<%namespace name="base" file="/base/base.html"/>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('Settings for Repository: %s') % c.repo_info.repo_name}</h3>
@ -69,15 +72,25 @@
<p class="help-block">${_('Default commit for files page, downloads, whoosh and readme')}</p>
</div>
</div>
<div class="field">
<div class="field badged-field">
<div class="label">
<label for="user">${_('Owner')}:</label>
</div>
<div class="input">
${h.text('user', class_="medium", autocomplete="off")}
<p class="help-block">${_('Change owner of this repository.')}</p>
<div class="badge-input-container">
<div class="user-badge">
${base.gravatar_with_user(c.repo_info.user.email, show_disabled=not c.repo_info.user.active)}
</div>
<div class="badge-input-wrap">
${h.text('user', class_="medium", autocomplete="off")}
</div>
</div>
<form:error name="user"/>
<p class="help-block">${_('Change owner of this repository.')}</p>
</div>
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="repo_description">${_('Description')}:</label>

21
rhodecode/templates/admin/user_groups/user_group_edit_settings.html
View file

@ -1,3 +1,6 @@
## -*- coding: utf-8 -*-
<%namespace name="base" file="/base/base.html"/>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
@ -15,15 +18,25 @@
${h.text('users_group_name',class_='medium')}
</div>
</div>
<div class="field">
<div class="field badged-field">
<div class="label">
<label for="user">${_('Owner')}:</label>
</div>
<div class="input">
${h.text('user', class_="medium", autocomplete="off")}
<span class="help-block">${_('Change owner of this user group.')}</span>
<div class="badge-input-container">
<div class="user-badge">
${base.gravatar_with_user(c.user_group.user.email, show_disabled=not c.user_group.user.active)}
</div>
<div class="badge-input-wrap">
${h.text('user', class_="medium", autocomplete="off")}
</div>
</div>
<form:error name="user"/>
<p class="help-block">${_('Change owner of this user group.')}</p>
</div>
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="user_group_description">${_('Description')}:</label>