diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less --- a/rhodecode/public/css/navigation.less +++ b/rhodecode/public/css/navigation.less @@ -409,6 +409,7 @@ display: block; height: 16px; padding: 8px; //must add up to td height (28px) + width: 120px; // set width &:hover { background-color: @grey5; diff --git a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako --- a/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako +++ b/rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako @@ -13,8 +13,8 @@ ${_('Write')} ${_('Admin')} ${_('User/User Group')} - - + + ## USERS %for _user in c.repo_group.permissions(): @@ -36,9 +36,16 @@ %endif - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} + + % endif @@ -67,17 +74,24 @@ %if _user.username != h.DEFAULT_USER: - ${_('Revoke')} + ${_('Remove')} %endif - + % if c.rhodecode_user.is_admin: - % if _user.username == h.DEFAULT_USER: - ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))} - % else: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} - % endif + + % endif %else: @@ -101,9 +115,16 @@ - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} + + % endif %endif @@ -131,12 +152,19 @@ - ${_('Revoke')} + ${_('Remove')} - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))} + + % endif @@ -185,5 +213,6 @@ }); $('.revoke_perm').on('click', function(e){ markRevokePermInput($(this), 'group'); - }) + }); + quick_repo_menu(); diff --git a/rhodecode/templates/admin/repos/repo_edit_permissions.mako b/rhodecode/templates/admin/repos/repo_edit_permissions.mako --- a/rhodecode/templates/admin/repos/repo_edit_permissions.mako +++ b/rhodecode/templates/admin/repos/repo_edit_permissions.mako @@ -13,8 +13,8 @@ ${_('Write')} ${_('Admin')} ${_('User/User Group')} - - + + ## USERS %for _user in c.rhodecode_db_repo.permissions(): @@ -35,9 +35,16 @@ %endif - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} + + % endif @@ -52,9 +59,16 @@ ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)} ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')} - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))} + + % endif @@ -89,17 +103,24 @@ %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None: - ${_('Revoke')} + ${_('Remove')} %endif - + % if c.rhodecode_user.is_admin: - % if _user.username == h.DEFAULT_USER: - ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))} - % else: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} - % endif + + % endif @@ -126,12 +147,19 @@ - ${_('Revoke')} + ${_('Remove')} - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))} + + % endif @@ -169,4 +197,5 @@ $('.revoke_perm').on('click', function(e){ markRevokePermInput($(this), 'repository'); }); + quick_repo_menu(); diff --git a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako --- a/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako +++ b/rhodecode/templates/admin/user_groups/user_group_edit_perms.mako @@ -13,8 +13,8 @@ ${_('Write')} ${_('Admin')} ${_('User/User Group')} - - + + ## USERS %for _user in c.user_group.permissions(): @@ -38,9 +38,16 @@ - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} + + % endif @@ -69,17 +76,24 @@ %if _user.username != h.DEFAULT_USER: - ${_('Revoke')} + ${_('Remove')} %endif - + % if c.rhodecode_user.is_admin: - % if _user.username == h.DEFAULT_USER: - ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))} - % else: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} - % endif + + % endif %else: @@ -103,9 +117,16 @@ - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))} + + % endif %endif @@ -133,12 +154,19 @@ - ${_('Revoke')} + ${_('Remove')} - + % if c.rhodecode_user.is_admin: - ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))} + + % endif @@ -174,4 +202,5 @@ $('.revoke_perm').on('click', function(e){ markRevokePermInput($(this), 'usergroup'); }); + quick_repo_menu()