repo-groups: make panel titles more consistent

rhodecode/templates/admin/integrations/list.mako

@@ -1,222 +1,222 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base.mako"/>
 
 <%def name="breadcrumbs_links()">
   %if c.repo:
     ${h.link_to('Settings',h.route_path('edit_repo', repo_name=c.repo.repo_name))}
   %elif c.repo_group:
     ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.route_path('repo_groups'))}
     &raquo;
     ${h.link_to(c.repo_group.group_name,h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name))}
   %else:
     ${h.link_to(_('Admin'),h.route_path('admin_home'))}
     &raquo;
     ${h.link_to(_('Settings'),h.route_path('admin_settings'))}
   %endif
   %if c.current_IntegrationType:
     &raquo;
     %if c.repo:
     ${h.link_to(_('Integrations'),
       request.route_path(route_name='repo_integrations_home',
                          repo_name=c.repo.repo_name))}
     %elif c.repo_group:
     ${h.link_to(_('Integrations'),
       request.route_path(route_name='repo_group_integrations_home',
                          repo_group_name=c.repo_group.group_name))}
     %else:
     ${h.link_to(_('Integrations'),
       request.route_path(route_name='global_integrations_home'))}
     %endif
     &raquo;
     ${c.current_IntegrationType.display_name}
   %else:
     &raquo;
     ${_('Integrations')}
   %endif
 </%def>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">
       %if c.repo:
         ${_('Current Integrations for Repository: {repo_name}').format(repo_name=c.repo.repo_name)}
       %elif c.repo_group:
-        ${_('Current Integrations for repository group: {repo_group_name}').format(repo_group_name=c.repo_group.group_name)}
+        ${_('Repository Group Integrations: {}').format(c.repo_group.group_name)}</h3>
       %else:
           ${_('Current Integrations')}
       %endif
       </h3>
   </div>
   <div class="panel-body">
 
     <%
     integration_type = c.current_IntegrationType and c.current_IntegrationType.display_name or ''
 
     if c.repo:
       create_url = h.route_path('repo_integrations_new', repo_name=c.repo.repo_name)
     elif c.repo_group:
       create_url = h.route_path('repo_group_integrations_new', repo_group_name=c.repo_group.group_name)
     else:
       create_url = h.route_path('global_integrations_new')
     %>
     <p class="pull-right">
       <a href="${create_url}" class="btn btn-small btn-success">${_(u'Create new integration')}</a>
     </p>
 
     <table class="rctable integrations">
       <thead>
         <tr>
             <th><a href="?sort=enabled:${c.rev_sort_dir}">${_('Enabled')}</a></th>
             <th><a href="?sort=name:${c.rev_sort_dir}">${_('Name')}</a></th>
             <th colspan="2"><a href="?sort=integration_type:${c.rev_sort_dir}">${_('Type')}</a></th>
             <th><a href="?sort=scope:${c.rev_sort_dir}">${_('Scope')}</a></th>
             <th>${_('Actions')}</th>
             <th></th>
         </tr>
       </thead>
       <tbody>
   %if not c.integrations_list:
         <tr>
           <td colspan="7">
 
             %if c.repo:
               ${_('No {type} integrations for repo {repo} exist yet.').format(type=integration_type, repo=c.repo.repo_name)}
             %elif c.repo_group:
               ${_('No {type} integrations for repogroup {repogroup} exist yet.').format(type=integration_type, repogroup=c.repo_group.group_name)}
             %else:
               ${_('No {type} integrations exist yet.').format(type=integration_type)}
             %endif
 
             %if c.current_IntegrationType:
             <%
             if c.repo:
               create_url = h.route_path('repo_integrations_create', repo_name=c.repo.repo_name, integration=c.current_IntegrationType.key)
             elif c.repo_group:
               create_url = h.route_path('repo_group_integrations_create', repo_group_name=c.repo_group.group_name, integration=c.current_IntegrationType.key)
             else:
               create_url = h.route_path('global_integrations_create', integration=c.current_IntegrationType.key)
             %>
             %endif
 
             <a href="${create_url}">${_(u'Create one')}</a>
           </td>
         </tr>
   %endif
   %for IntegrationType, integration in c.integrations_list:
         <tr id="integration_${integration.integration_id}">
           <td class="td-enabled">
             %if integration.enabled:
             <div class="flag_status approved pull-left"></div>
             %else:
             <div class="flag_status rejected pull-left"></div>
             %endif
           </td>
           <td class="td-description">
             ${integration.name}
           </td>
           <td class="td-icon">
             %if integration.integration_type in c.available_integrations:
             <div class="integration-icon">
               ${c.available_integrations[integration.integration_type].icon()|n}
             </div>
             %else:
               ?
             %endif
           </td>
           <td class="td-type">
             ${integration.integration_type}
           </td>
           <td class="td-scope">
             %if integration.repo:
             <a href="${h.route_path('repo_summary', repo_name=integration.repo.repo_name)}">
               ${_('repo')}:${integration.repo.repo_name}
             </a>
             %elif integration.repo_group:
             <a href="${h.route_path('repo_group_home', repo_group_name=integration.repo_group.group_name)}">
               ${_('repogroup')}:${integration.repo_group.group_name}
               %if integration.child_repos_only:
               ${_('child repos only')}
               %else:
               ${_('cascade to all')}
               %endif
             </a>
             %else:
               %if integration.child_repos_only:
               ${_('top level repos only')}
               %else:
               ${_('global')}
               %endif
           </td>
           %endif
           <td class="td-action">
           %if not IntegrationType:
           ${_('unknown integration')}
           %else:
             <%
             if c.repo:
               edit_url = request.route_path('repo_integrations_edit',
                                             repo_name=c.repo.repo_name,
                                             integration=integration.integration_type,
                                             integration_id=integration.integration_id)
             elif c.repo_group:
               edit_url = request.route_path('repo_group_integrations_edit',
                                             repo_group_name=c.repo_group.group_name,
                                             integration=integration.integration_type,
                                             integration_id=integration.integration_id)
             else:
               edit_url = request.route_path('global_integrations_edit',
                                            integration=integration.integration_type,
                                            integration_id=integration.integration_id)
             %>
             <div class="grid_edit">
               <a href="${edit_url}">${_('Edit')}</a>
             </div>
             <div class="grid_delete">
               <a href="${edit_url}"
                  class="btn btn-link btn-danger delete_integration_entry"
                  data-desc="${integration.name}"
                  data-uid="${integration.integration_id}">
                   ${_('Delete')}
               </a>
             </div>
           %endif
           </td>
         </tr>
     %endfor
       <tr id="last-row"></tr>
       </tbody>
     </table>
     <div class="integrations-paginator">
       <div class="pagination-wh pagination-left">
       ${c.integrations_list.pager('$link_previous ~2~ $link_next')}
       </div>
     </div>
   </div>
 </div>
 <script type="text/javascript">
   var delete_integration = function(entry) {
     if (confirm("Confirm to remove this integration: "+$(entry).data('desc'))) {
       var request = $.ajax({
         type: "POST",
         url: $(entry).attr('href'),
         data: {
           'delete': 'delete',
           'csrf_token': CSRF_TOKEN
         },
         success: function(){
           location.reload();
         },
         error: function(data, textStatus, errorThrown){
           alert("Error while deleting entry.\nError code {0} ({1}). URL: {2}".format(data.status,data.statusText,$(entry)[0].url));
         }
       });
     };
   };
 
   $('.delete_integration_entry').on('click', function(e){
     e.preventDefault();
     delete_integration(this);
   });
 </script>
  No newline at end of file

rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako

@@ -1,65 +1,65 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <%
  elems = [
     (_('Repository Group ID'), c.repo_group.group_id, '', ''),
     (_('Owner'), lambda:base.gravatar_with_user(c.repo_group.user.email), '', ''),
     (_('Created on'), h.format_date(c.repo_group.created_on), '', ''),
     (_('Is Personal Group'), c.repo_group.personal or False, '', ''),
 
     (_('Total repositories'), c.repo_group.repositories_recursive_count, '', ''),
     (_('Top level repositories'), c.repo_group.repositories.count(), '', c.repo_group.repositories.all()),
 
     (_('Children groups'), c.repo_group.children.count(), '', c.repo_group.children.all()),
  ]
 %>
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository Group: %s') % c.repo_group.group_name}</h3>
+        <h3 class="panel-title">${_('Repository Group Advanced: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${base.dt_info_panel(elems)}
     </div>
 
 </div>
 
 <div class="panel panel-danger">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Delete repository group')}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_group_advanced_delete', repo_group_name=c.repo_group.group_name), request=request)}
             <table class="display">
 
                 <tr>
                     <td>
                         ${_ungettext('This repository group includes %s children repository group.', 'This repository group includes %s children repository groups.', c.repo_group.children.count()) % c.repo_group.children.count()}
                     </td>
                     <td>
                     </td>
                     <td>
                     </td>
                 </tr>
                 <tr>
                     <td>
                         ${_ungettext('This repository group includes %s repository.', 'This repository group includes %s repositories.', c.repo_group.repositories_recursive_count) % c.repo_group.repositories_recursive_count}
                     </td>
                     <td>
                     </td>
                     <td>
                     </td>
                 </tr>
 
             </table>
             <div style="margin: 0 0 20px 0" class="fake-space"></div>
 
             <button class="btn btn-small btn-danger" type="submit"
                 onclick="return confirm('${_('Confirm to delete this group: %s') % (c.repo_group.group_name)}');">
                 ${_('Delete this repository group')}
             </button>
         ${h.end_form()}
     </div>
 </div>
 
 

rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako

@@ -1,219 +1,219 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title">${_('Repository Group Permissions')}</h3>
+        <h3 class="panel-title">${_('Repository Group Permissions: {}').format(c.repo_group.name)}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_group_perms_update', repo_group_name=c.repo_group.group_name), request=request)}
         <table id="permissions_manage" class="rctable permissions">
             <tr>
                 <th class="td-radio">${_('None')}</th>
                 <th class="td-radio">${_('Read')}</th>
                 <th class="td-radio">${_('Write')}</th>
                 <th class="td-radio">${_('Admin')}</th>
                 <th class="td-owner">${_('User/User Group')}</th>
                 <th class="td-action"></th>
                 <th class="td-action"></th>
             </tr>
             ## USERS
             %for _user in c.repo_group.permissions():
                 ## super admin/owner row
                 %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                     <tr class="perm_admin_row">
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.read', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.write', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.admin', 'repository.admin', disabled="disabled")}</td>
                         <td class="td-user">
                             ${base.gravatar(_user.email, 16)}
                                 ${h.link_to_user(_user.username)}
                                 %if getattr(_user, 'admin_row', None):
                                     (${_('super admin')})
                                 %endif
                                 %if getattr(_user, 'owner_row', None):
                                     (${_('owner')})
                                 %endif
                         </td>
                         <td></td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
                                 <div class="menu_items_container" style="display: none;">
                                 <ul class="menu_items">
                                   <li>
                                      ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
                                   </li>
                                 </ul>
                                 </div>
                             % endif
                         </td>
                     </tr>
                 %else:
                     <tr>
                         ##forbid revoking permission from yourself, except if you're an super admin
                         %if c.rhodecode_user.user_id != _user.user_id or c.rhodecode_user.is_admin:
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.none', checked=_user.permission=='group.none')}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.read', checked=_user.permission=='group.read')}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.write', checked=_user.permission=='group.write')}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.admin', checked=_user.permission=='group.admin')}</td>
                         <td class="td-user">
                             ${base.gravatar(_user.email, 16)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
                                     ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                 % else:
                                     ${h.link_to_user(_user.username)}
                                     %if getattr(_user, 'duplicate_perm', None):
                                         (${_('inactive duplicate')})
                                     %endif
                                 % endif
                             </span>
                         </td>
                         <td class="td-action">
                             %if _user.username != h.DEFAULT_USER:
                                 <span  class="btn btn-link btn-danger revoke_perm"
                                   member="${_user.user_id}" member_type="user">
                                 ${_('Remove')}
                                 </span>
                             %endif
                         </td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
                                 <div class="menu_items_container" style="display: none;">
                                 <ul class="menu_items">
                                   <li>
                                     % if _user.username == h.DEFAULT_USER:
                                         ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-groups-permissions'))}
                                     % else:
                                         ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
                                     % endif
                                   </li>
                                 </ul>
                                 </div>
                             % endif
                         </td>
                         %else:
                             ## special case for currently logged-in user permissions, we make sure he cannot take his own permissions
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.none', disabled="disabled")}</td>
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.read', disabled="disabled")}</td>
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.write', disabled="disabled")}</td>
                             <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'group.admin', disabled="disabled")}</td>
                             <td class="td-user">
                                 ${base.gravatar(_user.email, 16)}
                                 <span class="user">
                                     % if _user.username == h.DEFAULT_USER:
                                         ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
                                     % else:
                                         ${h.link_to_user(_user.username)}
                                         %if getattr(_user, 'duplicate_perm', None):
                                             (${_('inactive duplicate')})
                                         %endif
                                     % endif
                                     <span class="user-perm-help-text">(${_('delegated admin')})</span>
                                 </span>
                             </td>
                             <td></td>
                             <td class="quick_repo_menu">
                                 % if c.rhodecode_user.is_admin:
                                     <i class="icon-more"></i>
                                     <div class="menu_items_container" style="display: none;">
                                     <ul class="menu_items">
                                       <li>
                                          ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
                                       </li>
                                     </ul>
                                     </div>
                                 % endif
                             </td>
                         %endif
                     </tr>
                 %endif
             %endfor
 
             ## USER GROUPS
             %for _user_group in c.repo_group.permission_user_groups(with_members=True):
                 <tr id="id${id(_user_group.users_group_name)}">
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.none', checked=_user_group.permission=='group.none')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.read', checked=_user_group.permission=='group.read')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.write', checked=_user_group.permission=='group.write')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'group.admin', checked=_user_group.permission=='group.admin')}</td>
                     <td class="td-componentname">
                         <i class="icon-user-group"></i>
                         %if c.is_super_admin:
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
                          </a>
                         %else:
                          ${h.link_to_group(_user_group.users_group_name)}
                         %endif
                         (${_('members')}: ${len(_user_group.members)})
                     </td>
                     <td class="td-action">
                         <span  class="btn btn-link btn-danger revoke_perm"
                               member="${_user_group.users_group_id}" member_type="user_group">
                         ${_('Remove')}
                         </span>
                     </td>
                     <td class="quick_repo_menu">
                         % if c.rhodecode_user.is_admin:
                             <i class="icon-more"></i>
                             <div class="menu_items_container" style="display: none;">
                             <ul class="menu_items">
                               <li>
                                  ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-groups-permissions'))}
                               </li>
                             </ul>
                             </div>
                         % endif
                     </td>
                 </tr>
             %endfor
 
             <tr class="new_members" id="add_perm_input"></tr>
             <tr>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td>
                     <span id="add_perm" class="link">
                         ${_('Add user/user group')}
                     </span>
                 </td>
                 <td></td>
             </tr>
         </table>
 
         <div class="fields">
             <div class="field">
                <div class="label label-radio">
                    ${_('Apply to children')}:
                </div>
                <div class="radios">
                    ${h.radio('recursive', 'none', label=_('None'), checked="checked")}
                    ${h.radio('recursive', 'groups', label=_('Repository Groups'))}
                    ${h.radio('recursive', 'repos', label=_('Repositories'))}
                    ${h.radio('recursive', 'all', label=_('Both'))}
                <span class="help-block">${_('Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen.')}</span>
                </div>
             </div>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn btn-primary")}
           ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
         </div>
         ${h.end_form()}
     </div>
 </div>
 <script type="text/javascript">
     $('#add_perm').on('click', function(e){
         addNewPermInput($(this), 'group');
     });
     $('.revoke_perm').on('click', function(e){
         markRevokePermInput($(this), 'group');
     });
     quick_repo_menu();
 </script>

rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako

@@ -1,95 +1,95 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 Group: %s') % c.repo_group.name}</h3>
+        <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)}
                             </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">${_('Plain text format with support of {metatags}').format(metatags=metatags_url)|n}</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="repo_group_enable_locking">${_('Enable Repository Locking')}:</label>
                     </div>
                     <div class="checkboxes">
                         ${c.form['repo_group_enable_locking'].render(css_class='medium', oid='repo_group_enable_locking')|n}
                         ${c.form.render_error(request, c.form['repo_group_enable_locking'])|n}
 
                         <span class="help-block">${_('Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user.')}</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>