# HG changeset patch # User Mads Kiilerich # Date 2015-07-23 00:52:29 # Node ID 88c6d393f2d5d77c16011a62990bb8e8103923e1 # Parent 82ea8d67fc622ad1d9b9795a53c78a113aa340a9 admin: rename 'Delegated Admin' to what it usually is known as: 'Admin' diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html @@ -15,7 +15,7 @@ ${h.form(url('edit_repo_group_perms', gr %for r2p in c.repo_group.repo_group_to_perm: ##forbid revoking permission from yourself, except if you're an super admin - %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin: + %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin: ${h.radio('u_perm_%s' % r2p.user.username,'group.none')} ${h.radio('u_perm_%s' % r2p.user.username,'group.read')} ${h.radio('u_perm_%s' % r2p.user.username,'group.write')} @@ -35,7 +35,7 @@ ${h.form(url('edit_repo_group_perms', gr %endif - %else: + %else: ${h.radio('u_perm_%s' % r2p.user.username,'group.none', disabled="disabled")} ${h.radio('u_perm_%s' % r2p.user.username,'group.read', disabled="disabled")} ${h.radio('u_perm_%s' % r2p.user.username,'group.write', disabled="disabled")} @@ -44,8 +44,8 @@ ${h.form(url('edit_repo_group_perms', gr ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} - ${_('Delegated Admin')} - %endif + ${_('Admin')} + %endif %endfor diff --git a/kallithea/templates/admin/user_groups/user_group_edit_perms.html b/kallithea/templates/admin/user_groups/user_group_edit_perms.html --- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html +++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html @@ -15,7 +15,7 @@ ${h.form(url('edit_user_group_perms', id %for r2p in c.user_group.user_user_group_to_perm: ##forbid revoking permission from yourself, except if you're an super admin - %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin: + %if c.authuser.user_id != r2p.user.user_id or c.authuser.is_admin: ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.none')} ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read')} ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write')} @@ -35,7 +35,7 @@ ${h.form(url('edit_user_group_perms', id %endif - %else: + %else: ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.none', disabled="disabled")} ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.read', disabled="disabled")} ${h.radio('u_perm_%s' % r2p.user.username,'usergroup.write', disabled="disabled")} @@ -44,8 +44,8 @@ ${h.form(url('edit_user_group_perms', id ${h.gravatar(r2p.user.email, cls="perm-gravatar", size=14)} ${r2p.user.username if r2p.user.username != 'default' else _('Default')} - ${_('Delegated Admin')} - %endif + ${_('Admin')} + %endif %endfor