ui: owner icon is consistent width for better user experience

rhodecode/public/css/forms.less

@@ -1,411 +1,411 b''
 // forms.less
 // For use in RhodeCode applications;
 // see style guide documentation for guidelines.
 
 form.rcform {
 
     // reset for ie
     // using :not(#ie) prevents older browsers from applying these rules
     input[type="radio"],
     input[type="checkbox"] {
         padding: 0;
         border: none;
     }
     label { display: inline; border:none; padding:0; }
     .label { display: none; }
 
     max-width: 940px;
     line-height: normal;
     white-space: normal;
     font-size: @basefontsize;
     font-family: @text-light;
     color: @form-textcolor;
 
     fieldset,
     .buttons {
         clear: both;
         position: relative;
         display:block;
         width: 100%;
         min-height: 3em;
         margin-bottom: @form-vertical-margin;
         line-height: 1.2em;
 
         &:after { //clearfix
             content: "";
             clear: both;
             width: 100%;
             height: 1em;
         }
 
         .label:not(#ie) {
             display: inline;
             margin: 0 1em 0 .5em;
             line-height: 1em;
         }
     }
 
     legend {
         float: left;
         display: block;
         width: @legend-width;
         margin: 0;
         padding: 0 @padding 0 0;
     }
 
     .fields {
         float: left;
         display: block;
         width: 100%;
         max-width: 500px;
         margin: 0 0 @padding -@legend-width;
         padding: 0 0 0 @legend-width;
 
         .btn {
             display: inline-block;
             margin: 0 1em @padding 0;
         }
     }
 
     input,
     textarea {
         float: left;
         .box-sizing(content-box);
         padding: @input-padding;
         border: @border-thickness-inputs solid @grey4;
     }
 
     input {
         float: left;
         margin: 0 @input-padding 0 0;
         line-height: 1em;
     }
 
     input[type="text"],
     input[type="password"],
     textarea {
         float: left;
         min-width: 200px;
         margin: 0 1em @padding 0;
         color: @form-textcolor;
     }
 
     input[type="text"],
     input[type="password"] {
         height: 1em;
     }
 
     textarea {
         width: 100%;
         margin-top: -1em; //so it lines up with legend
         overflow: auto;
     }
 
     label:not(#ie) {
       cursor: pointer;
       display: inline-block;
       position: relative;
       background: white;
       border-radius: 4px;
       box-shadow: none;
 
       &:hover::after {
         opacity: 0.5;
       }
     }
 
     input[type="radio"]:not(#ie),
     input[type="checkbox"]:not(#ie) {
         // Hide the input, but have it still be clickable
         opacity: 0;
         float: left;
         height: 0;
         width: 0;
         margin: 0;
         padding: 0;
     }
     input[type='radio'] + label:not(#ie),
     input[type='checkbox'] + label:not(#ie) {
         margin: 0;
         clear: none;
     }
 
     input[type='radio'] + label:not(#ie) {
         .circle (@form-radio-width,white);
         float: left;
         display: inline-block;
         height: @form-radio-width;
         width: @form-radio-width;
         margin: 2px 6px 2px 0;
         border: 1px solid @grey4;
         background-color: white;
         box-shadow: none;
         text-indent: -9999px;
         transition: none;
 
         & + .label {
           float: left;
           margin-top: 7px
         }
     }
 
     input[type='radio']:checked + label:not(#ie) {
         margin: 0 4px 0 -2px;
         padding: 3px;
         border-style: double;
         border-color: white;
         border-width: thick;
         background-color: @rcblue;
         box-shadow: none;
     }
 
     input[type='checkbox'] + label:not(#ie) {
         float: left;
         width: @form-check-width;
         height: @form-check-width;
         margin: 0 5px 1em 0;
         border: 1px solid @grey3;
         .border-radius(@border-radius);
         background-color: white;
         box-shadow: none;
         text-indent: -9999px;
         transition: none;
 
         &:after {
             content: '';
             width: 9px;
             height: 5px;
             position: absolute;
             top: 4px;
             left: 4px;
             border: 3px solid @grey3;
             border-top: none;
             border-right: none;
             background: transparent;
             opacity: 0;
             transform: rotate(-45deg);
             filter: progid:DXImageTransform.Microsoft.Matrix(sizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476); /* IE6,IE7 */
 
             -ms-filter: "progid:DXImageTransform.Microsoft.Matrix(SizingMethod='auto expand', M11=0.7071067811865476, M12=-0.7071067811865475, M21=0.7071067811865475, M22=0.7071067811865476)"; /* IE8 */        }
 
         & + .label {
           float: left;
           margin-top: 5px
         }
     }
 
     input[type=checkbox]:not(#ie) {
       visibility: hidden;
       &:checked + label:after {
         opacity: 1;
       }
     }
 
     // center checkbox and label on a drop-down
     .drop-menu + select + input[type='checkbox'] + label:not(#ie) {
       margin-top:10px;
 
       & + .label {
         margin-top: 15px;
       }
     }
 
     .formlist {
         position: relative;
         float: left;
         margin:  0;
         padding: 0;
 
         li {
             list-style-type: none;
 
             &:after {
                 content: "";
                 float: left;
                 display: block;
                 height: @padding;
                 width: 100%;
             }
         }
     }
 
     .drop-menu {
         float: left;
 
         & + .last-item {
             margin: 0;
         }
 
         margin: 0 @input-padding 0 0;
     }
 
     .help-block,
     .error-message {
         display: block;
         clear: both;
         margin: @textmargin 0;
     }
 
     .error-message {
         margin-top: 5px;
     }
 
     input[type=submit] {
         &:extend(.btn-primary);
 
         &:hover {
             &:extend(.btn-primary:hover);
         }
     }
 
     input[type=reset] {
         &:extend(.btn-default);
 
         &:hover {
             &:extend(.btn-default:hover);
         }
     }
 
     select,
     option:checked {
         background-color: @rclightblue;
     }
 
 }
 
 .rcform-element {
 
     label { display: inline; border:none; padding:0; }
     .label { display: none; }
 
     label:not(#ie) {
       cursor: pointer;
       display: inline-block;
       position: relative;
       background: white;
       border-radius: 4px;
       box-shadow: none;
 
       &:hover::after {
         opacity: 0.5;
       }
     }
 
     input[type="radio"],
     input[type="checkbox"] {
         padding: 0;
         border: none;
     }
 
     input[type="radio"]:not(#ie),
     input[type="checkbox"]:not(#ie) {
         // Hide the input, but have it still be clickable
         opacity: 0;
         float: left;
         height: 0;
         width: 0;
         margin: 0;
         padding: 0;
     }
     input[type='radio'] + label:not(#ie),
     input[type='checkbox'] + label:not(#ie) {
         margin: 0;
         clear: none;
     }
 
     input[type='radio'] + label:not(#ie) {
         .circle (@form-radio-width,white);
         float: left;
         display: inline-block;
         height: @form-radio-width;
         width: @form-radio-width;
         margin: 2px 2px 2px 0;
         border: 1px solid @grey4;
         background-color: white;
         box-shadow: none;
         text-indent: -9999px;
         transition: none;
 
         & + .label {
           float: left;
           margin-top: 7px
         }
     }
 
     input[type='radio']:checked + label:not(#ie) {
         margin: 0 0px 0 -2px;
         padding: 3px;
         border-style: double;
         border-color: white;
         border-width: thick;
         background-color: @rcblue;
         box-shadow: none;
     }
 
     fieldset {
         .label:not(#ie) {
             display: inline;
             margin: 0 1em 0 .5em;
             line-height: 1em;
         }
     }
 
 }
 
 .badged-field {
     .user-badge {
-        line-height: 25px;
+        line-height: 18px;
         padding: .4em;
         border-radius: @border-radius;
         border-top: 1px solid @grey4;
         border-left: 1px solid @grey4;
         border-bottom: 1px solid @grey4;
         font-size: 14px;
         font-style: normal;
         color: @text-light;
         background: @grey7;
         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 {
     border: none;
 }
 
 // for forms which only display information
 .infoform {
     .fields {
         .field {
             label,
             .label,
             input,
             .input {
                 margin-top: 0;
                 margin-bottom: 0;
                 padding-top: 0;
                 padding-bottom: 0;
             }
         }
     }
 }
 
 .repo-type-radio input {
     margin: 0 0 0 0
 }
 .repo-type-radio label {
     padding-right: 15px;
 }

rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako

@@ -1,89 +1,89 b''
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Repository Group Settings: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name), request=request)}
         <div class="form">
             <!-- fields -->
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="group_name">${_('Group name')}:</label>
                     </div>
                     <div class="input">
                         ${c.form['repo_group_name'].render(css_class='medium', oid='group_name')|n}
                         ${c.form.render_error(request, c.form['repo_group_name'])|n}
                     </div>
                 </div>
 
                 <div class="field">
                     <div class="label">
                         <label for="repo_group">${_('Repository group')}:</label>
                     </div>
                     <div class="select">
                         ${c.form['repo_group'].render(css_class='medium', oid='repo_group')|n}
                         ${c.form.render_error(request, c.form['repo_group'])|n}
 
                         <p class="help-block">${_('Optional select a parent group to move this repository group into.')}</p>
                     </div>
                 </div>
 
                 <div class="field badged-field">
                     <div class="label">
                         <label for="repo_group_owner">${_('Owner')}:</label>
                     </div>
                     <div class="input">
                         <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)}
+                                ${base.gravatar(c.repo_group.user.email, user=c.repo_group.user,  tooltip=True)}
                             </div>
                             <div class="badge-input-wrap">
                                 ${c.form['repo_group_owner'].render(css_class='medium', oid='repo_group_owner')|n}
                             </div>
                         </div>
                         ${c.form.render_error(request, c.form['repo_group_owner'])|n}
                         <p class="help-block">${_('Change owner of this repository group.')}</p>
                     </div>
                 </div>
 
                 <div class="field">
                     <div class="label label-textarea">
                         <label for="repo_group_description">${_('Description')}:</label>
                     </div>
                     <div class="textarea text-area editor">
                         ${c.form['repo_group_description'].render(css_class='medium', oid='repo_group_description')|n}
                         ${c.form.render_error(request, c.form['repo_group_description'])|n}
 
                         <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
                         <span class="help-block">
                             % if c.visual.stylify_metatags:
                                 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
                             % else:
                                 ${_('Plain text format.')}
                             % endif
                         </span>
                         <span id="meta-tags-desc" style="display: none">
                             <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                             ${dt.metatags_help()}
                         </span>
                     </div>
                 </div>
 
                 <div class="buttons">
                   ${h.submit('save',_('Save'),class_="btn")}
                   ${h.reset('reset',_('Reset'),class_="btn")}
                 </div>
             </div>
         </div>
         ${h.end_form()}
     </div>
 </div>
 <script>
     $(document).ready(function(){
         UsersAutoComplete('repo_group_owner', '${c.rhodecode_user.user_id}');
     })
 </script>

rhodecode/templates/admin/repos/repo_edit_settings.mako

@@ -1,337 +1,337 b''
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Settings for Repository: %s') % c.rhodecode_db_repo.repo_name}</h3>
     </div>
     <div class="panel-body">
     ${h.secure_form(h.route_path('edit_repo', repo_name=c.rhodecode_db_repo.repo_name), request=request)}
     <div class="form">
         <!-- fields -->
         <div class="fields">
 
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${c.form['repo_name'].render(css_class='medium', oid='repo_name')|n}
                     ${c.form.render_error(request, c.form['repo_name'])|n}
 
                     <p class="help-block">${_('permalink id')}: `_${c.rhodecode_db_repo.repo_id}` <span><a href="#" onclick="$('#clone_id').toggle();return false">${_('what is that ?')}</a></span></p>
                     <p id="clone_id" style="display:none;">
                         ${_('URL by id')}: `${c.rhodecode_db_repo.clone_url(with_id=True)}` <br/>
                         ${_('''In case this repository is renamed or moved into another group the repository url changes.
                                Using above url guarantees that this repository will always be accessible under such url.
                                Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service.''')}</p>
                 </div>
            </div>
 
            <div class="field">
                 <div class="label">
                     <label for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="select">
                     ${c.form['repo_group'].render(css_class='medium', oid='repo_group')|n}
                     ${c.form.render_error(request, c.form['repo_group'])|n}
 
                     % if c.personal_repo_group:
                          <a class="btn" href="#" data-personal-group-name="${c.personal_repo_group.group_name}" data-personal-group-id="${c.personal_repo_group.group_id}" onclick="selectMyGroup(this); return false">
                              ${_('Select my personal group (`%(repo_group_name)s`)') % {'repo_group_name': c.personal_repo_group.group_name}}
                          </a>
                     % endif
                     <p class="help-block">${_('Optional select a group to put this repository into.')}</p>
                 </div>
            </div>
 
            % if c.rhodecode_db_repo.repo_type != 'svn':
            <% sync_link = h.literal(h.link_to('remote sync', h.route_path('edit_repo_remote', repo_name=c.repo_name))) %>
            <div class="field">
                <div class="label">
                    <label for="clone_uri">${_('Remote pull uri')}:</label>
                </div>
                <div class="input">
                    %if c.rhodecode_db_repo.clone_uri:
                     ## display, if we don't have any errors
                     % if not c.form['repo_clone_uri'].error:
                     <div id="clone_uri_hidden" class='text-as-placeholder'>
                         <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
                         <span class="link" id="edit_clone_uri">${_('edit')}</span>
                     </div>
                     % endif
 
                     ## alter field
                     <div id="alter_clone_uri" style="${'' if c.form['repo_clone_uri'].error else 'display: none'}">
                         ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri', placeholder=_('enter new value, or leave empty to remove'))|n}
                         ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
                         % if c.form['repo_clone_uri'].error:
                             ## we got error from form subit, means we modify the url
                             ${h.hidden('repo_clone_uri_change', 'MOD')}
                         % else:
                             ${h.hidden('repo_clone_uri_change', 'OLD')}
                         % endif
 
                         % if not c.form['repo_clone_uri'].error:
                         <span class="link" id="cancel_edit_clone_uri">${_('cancel')}</span>
                         % endif
 
                     </div>
                    %else:
                     ## not set yet, display form to set it
                     ${c.form['repo_clone_uri'].render(css_class='medium', oid='clone_uri')|n}
                     ${c.form.render_error(request, c.form['repo_clone_uri'])|n}
                     ${h.hidden('repo_clone_uri_change', 'NEW')}
                    %endif
                  <p id="alter_clone_uri_help_block" class="help-block">
                      ${_('http[s] url where from repository was imported. This field can used for doing {sync_link}.').format(sync_link=sync_link)|n} <br/>
                      ${_('This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display.')}
                  </p>
                </div>
             </div>
            <div class="field">
                <div class="label">
                    <label for="push_uri">${_('Remote push uri')}:</label>
                </div>
                <div class="input">
                    %if c.rhodecode_db_repo.push_uri:
                     ## display, if we don't have any errors
                     % if not c.form['repo_push_uri'].error:
                     <div id="push_uri_hidden" class='text-as-placeholder'>
                         <span id="push_uri_hidden_value">${c.rhodecode_db_repo.push_uri_hidden}</span>
                         <span class="link" id="edit_push_uri">${_('edit')}</span>
                     </div>
                     % endif
 
                     ## alter field
                     <div id="alter_push_uri" style="${'' if c.form['repo_push_uri'].error else 'display: none'}">
                         ${c.form['repo_push_uri'].render(css_class='medium', oid='push_uri', placeholder=_('enter new value, or leave empty to remove'))|n}
                         ${c.form.render_error(request, c.form['repo_push_uri'])|n}
                         % if c.form['repo_push_uri'].error:
                             ## we got error from form subit, means we modify the url
                             ${h.hidden('repo_push_uri_change', 'MOD')}
                         % else:
                             ${h.hidden('repo_push_uri_change', 'OLD')}
                         % endif
 
                         % if not c.form['repo_push_uri'].error:
                         <span class="link" id="cancel_edit_push_uri">${_('cancel')}</span>
                         % endif
 
                     </div>
                    %else:
                     ## not set yet, display form to set it
                     ${c.form['repo_push_uri'].render(css_class='medium', oid='push_uri')|n}
                     ${c.form.render_error(request, c.form['repo_push_uri'])|n}
                     ${h.hidden('repo_push_uri_change', 'NEW')}
                    %endif
                  <p id="alter_push_uri_help_block" class="help-block">
                      ${_('http[s] url to sync data back. This field can used for doing {sync_link}.').format(sync_link=sync_link)|n} <br/>
                      ${_('This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display.')}
                  </p>
                </div>
             </div>
            % else:
            ${h.hidden('repo_clone_uri', '')}
            ${h.hidden('repo_push_uri', '')}
            % endif
 
             <div class="field">
                 <div class="label">
                     <label for="repo_landing_commit_ref">${_('Landing commit')}:</label>
                 </div>
                 <div class="select">
                     ${c.form['repo_landing_commit_ref'].render(css_class='medium', oid='repo_landing_commit_ref')|n}
                     ${c.form.render_error(request, c.form['repo_landing_commit_ref'])|n}
                     <p class="help-block">${_('The default commit for file pages, downloads, full text search index, and README generation.')}</p>
                 </div>
             </div>
 
             <div class="field badged-field">
                 <div class="label">
                     <label for="repo_owner">${_('Owner')}:</label>
                 </div>
                 <div class="input">
                     <div class="badge-input-container">
                         <div class="user-badge">
-                            ${base.gravatar_with_user(c.rhodecode_db_repo.user.email or c.rhodecode_db_repo.user.username, show_disabled=not c.rhodecode_db_repo.user.active)}
+                            ${base.gravatar(c.rhodecode_db_repo.user.email or c.rhodecode_db_repo.user.username, user=c.rhodecode_db_repo.user,  tooltip=True)}
                         </div>
                         <div class="badge-input-wrap">
                             ${c.form['repo_owner'].render(css_class='medium', oid='repo_owner')|n}
                         </div>
                     </div>
                     ${c.form.render_error(request, c.form['repo_owner'])|n}
                     <p class="help-block">${_('Change owner of this repository.')}</p>
                 </div>
             </div>
 
             <div class="field">
                 <div class="label label-textarea">
                     <label for="repo_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${c.form['repo_description'].render(css_class='medium', oid='repo_description')|n}
                     ${c.form.render_error(request, c.form['repo_description'])|n}
 
                     <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
                     <span class="help-block">
                         % if c.visual.stylify_metatags:
                             ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
                         % else:
                             ${_('Plain text format.')}
                         % endif
                         ${_('Add a README file for longer descriptions')}
                     </span>
                     <span id="meta-tags-desc" style="display: none">
                         <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
                         ${dt.metatags_help()}
                     </span>
                 </div>
             </div>
 
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_private'].oid}">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_private'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_private'])|n}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_statistics'].oid}">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_statistics'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_statistics'])|n}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_downloads'].oid}">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_downloads'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_downloads'])|n}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="${c.form['repo_enable_locking'].oid}">${_('Enable automatic locking')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${c.form['repo_enable_locking'].render(css_class='medium')|n}
                     ${c.form.render_error(request, c.form['repo_enable_locking'])|n}
                     <span class="help-block">${_('Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user')}</span>
                 </div>
             </div>
 
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="field">
                     <div class="label">
                         <label for="${field.field_key_prefixed}">${(field.field_label or field.field_key)}:</label>
                     </div>
                     <div class="input input-medium">
                         ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
                         <span class="help-block">
                             key: ${field.field_key};
                             ${field.field_desc}
                         </span>
                     </div>
                  </div>
               %endfor
             %endif
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
             </div>
         </div>
     </div>
     ${h.end_form()}
   </div>
 </div>
 
 <script>
     $(document).ready(function () {
         var cloneUrl = function (
             alterButton, editButton, cancelEditButton,
             hiddenUrl, hiddenUrlValue, input, helpBlock, changedFlag) {
 
           var originalText = helpBlock.html();
           var obfuscatedUrl = hiddenUrlValue.html();
 
           var edit = function(e) {
             alterButton.show();
             editButton.hide();
             hiddenUrl.hide();
 
             //add the old value next to input for verification
             helpBlock.html("(" + obfuscatedUrl + ")" + "<br\>" + originalText);
             changedFlag.val('MOD');
           };
 
           var cancelEdit = function(e) {
             alterButton.hide();
             editButton.show();
             hiddenUrl.show();
 
             helpBlock.html(originalText);
             changedFlag.val('OLD');
             input.val('');
           };
 
           var initEvents = function() {
             editButton.on('click', edit);
             cancelEditButton.on('click', cancelEdit);
           };
 
           var setInitialState = function() {
             if (input.hasClass('error')) {
               alterButton.show();
               editButton.hide();
               hiddenUrl.hide();
             }
           };
 
           setInitialState();
           initEvents();
         };
 
 
         var alterButton = $('#alter_clone_uri');
         var editButton = $('#edit_clone_uri');
         var cancelEditButton = $('#cancel_edit_clone_uri');
         var hiddenUrl = $('#clone_uri_hidden');
         var hiddenUrlValue = $('#clone_uri_hidden_value');
         var input = $('#clone_uri');
         var helpBlock = $('#alter_clone_uri_help_block');
         var changedFlag = $('#repo_clone_uri_change');
         cloneUrl(
             alterButton, editButton, cancelEditButton, hiddenUrl,
             hiddenUrlValue, input, helpBlock, changedFlag);
 
         var alterButton = $('#alter_push_uri');
         var editButton = $('#edit_push_uri');
         var cancelEditButton = $('#cancel_edit_push_uri');
         var hiddenUrl = $('#push_uri_hidden');
         var hiddenUrlValue = $('#push_uri_hidden_value');
         var input = $('#push_uri');
         var helpBlock = $('#alter_push_uri_help_block');
         var changedFlag = $('#repo_push_uri_change');
         cloneUrl(
             alterButton, editButton, cancelEditButton, hiddenUrl,
             hiddenUrlValue, input, helpBlock, changedFlag);
 
         selectMyGroup = function(element) {
             $("#repo_group").val($(element).data('personalGroupId')).trigger("change");
         };
 
         UsersAutoComplete('repo_owner', '${c.rhodecode_user.user_id}');
     });
 </script>

rhodecode/templates/admin/user_groups/user_group_edit_settings.mako

@@ -1,191 +1,191 b''
 ## -*- coding: utf-8 -*-
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <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)}
         <div class="form">
             <!-- fields -->
                 <div class="fields">
                      <div class="field">
                         <div class="label">
                             <label for="users_group_name">${_('Group name')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('users_group_name',class_='medium')}
                         </div>
                      </div>
 
                     <div class="field badged-field">
                         <div class="label">
                             <label for="user">${_('Owner')}:</label>
                         </div>
                         <div class="input">
                             <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)}
+                                    ${base.gravatar(c.user_group.user.email, user=c.user_group.user,  tooltip=True)}
                                 </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 class="field">
                         <div class="label label-textarea">
                             <label for="user_group_description">${_('Description')}:</label>
                         </div>
                         <div class="textarea textarea-small editor">
                             ${h.textarea('user_group_description',cols=23,rows=5,class_="medium")}
                             <span class="help-block">${_('Short, optional description for this user group.')}</span>
                         </div>
                      </div>
                      <div class="field">
                         <div class="label label-checkbox">
                             <label for="users_group_active">${_('Active')}:</label>
                         </div>
                         <div class="checkboxes">
                             ${h.checkbox('users_group_active',value=True)}
                         </div>
                      </div>
 
                      <div class="field">
                         <div class="label label-checkbox">
                             <label for="users_group_active">${_('Add members')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('user_group_add_members', placeholder="user/usergroup", class_="medium")}
                         </div>
                      </div>
 
                     <input type="hidden" name="__start__" value="user_group_members:sequence"/>
                     <table id="group_members_placeholder" class="rctable group_members">
                         <tr>
                           <th>${_('Username')}</th>
                           <th>${_('Action')}</th>
                         </tr>
 
                         % if c.group_members_obj:
                           % for user in c.group_members_obj:
                             <tr>
                               <td id="member_user_${user.user_id}" class="td-author">
                                 <div class="group_member">
                                   ${base.gravatar(user.email, 16, user=user, tooltip=True)}
                                   <span class="username user">${h.link_to(h.person(user), h.route_path('user_edit',user_id=user.user_id))}</span>
                                   <input type="hidden" name="__start__" value="member:mapping">
                                   <input type="hidden" name="member_user_id" value="${user.user_id}">
                                   <input type="hidden" name="type" value="existing" id="member_${user.user_id}">
                                   <input type="hidden" name="__end__" value="member:mapping">
                                 </div>
                               </td>
                               <td class="">
                                 <div class="usergroup_member_remove action_button" onclick="removeUserGroupMember(${user.user_id}, true)" style="visibility: visible;">
                                     <i class="icon-remove"></i>
                                 </div>
                               </td>
                             </tr>
                           % endfor
 
                         % else:
                           <tr><td colspan="2">${_('No members yet')}</td></tr>
                         % endif
                      </table>
                     <input type="hidden" name="__end__" value="user_group_members:sequence"/>
 
                      <div class="buttons">
                        ${h.submit('Save',_('Save'),class_="btn")}
                      </div>
                 </div>
         </div>
     ${h.end_form()}
     </div>
 </div>
 <script>
     $(document).ready(function(){
         $("#group_parent_id").select2({
             'containerCssClass': "drop-menu",
             'dropdownCssClass': "drop-menu-dropdown",
             'dropdownAutoWidth': true
         });
 
         removeUserGroupMember = function(userId){
             $('#member_'+userId).val('remove');
             $('#member_user_'+userId).addClass('to-delete');
         };
 
         $('#user_group_add_members').autocomplete({
             serviceUrl: pyroutes.url('user_autocomplete_data'),
             minChars:2,
             maxHeight:400,
             width:300,
             deferRequestBy: 300, //miliseconds
             showNoSuggestionNotice: true,
             params: { user_groups:true },
             formatResult: autocompleteFormatResult,
             lookupFilter: autocompleteFilterResult,
             onSelect: function(element, suggestion){
 
                 function addMember(user, fromUserGroup) {
                     var gravatar = user.icon_link;
                     var username = user.value_display;
                     var userLink = pyroutes.url('user_edit', {"user_id": user.id});
                     var uid = user.id;
 
                     if (fromUserGroup) {
                         username = username +" "+ _gettext('(from usergroup {0})'.format(fromUserGroup))
                     }
 
                     var elem = $(
                         ('<tr>'+
                           '<td id="member_user_{6}" class="td-author td-author-new-entry">'+
                             '<div class="group_member">'+
                               '<img class="gravatar" src="{0}" height="16" width="16">'+
                               '<span class="username user"><a href="{1}">{2}</a></span>'+
                               '<input type="hidden" name="__start__" value="member:mapping">'+
                               '<input type="hidden" name="member_user_id" value="{3}">'+
                               '<input type="hidden" name="type" value="new" id="member_{4}">'+
                               '<input type="hidden" name="__end__" value="member:mapping">'+
                             '</div>'+
                           '</td>'+
                           '<td class="td-author-new-entry">'+
                             '<div class="usergroup_member_remove action_button" onclick="removeUserGroupMember({5}, true)" style="visibility: visible;">'+
                                 '<i class="icon-remove"></i>'+
                             '</div>'+
                           '</td>'+
                         '</tr>').format(gravatar, userLink, username,
                                 uid, uid, uid, uid)
                     );
                     $('#group_members_placeholder').append(elem)
                 }
 
                 if (suggestion.value_type == 'user_group') {
                     $.getJSON(
                         pyroutes.url('user_group_members_data',
                                     {'user_group_id': suggestion.id}),
                         function(data) {
                             $.each(data.members, function(idx, user) {
                                 addMember(user, suggestion.value)
                             });
                         }
                     );
                 } else if (suggestion.value_type == 'user') {
                     addMember(suggestion, null);
                 }
                 $('#user_group_add_members').val('')
             }
         });
 
 
         UsersAutoComplete('user', '${c.rhodecode_user.user_id}');
     })
 </script>