permissions: unified looks and buttons on permission pages....
dan -
r2980:5cb2321a default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -409,6 +409,7
409 display: block;
409 display: block;
410 height: 16px;
410 height: 16px;
411 padding: 8px; //must add up to td height (28px)
411 padding: 8px; //must add up to td height (28px)
412 width: 120px; // set width
412
413
413 &:hover {
414 &:hover {
414 background-color: @grey5;
415 background-color: @grey5;
@@ -13,8 +13,8
13 <th class="td-radio">${_('Write')}</th>
13 <th class="td-radio">${_('Write')}</th>
14 <th class="td-radio">${_('Admin')}</th>
14 <th class="td-radio">${_('Admin')}</th>
15 <th class="td-owner">${_('User/User Group')}</th>
15 <th class="td-owner">${_('User/User Group')}</th>
16 <th></th>
16 <th class="td-action"></th>
17 <th></th>
17 <th class="td-action"></th>
18 </tr>
18 </tr>
19 ## USERS
19 ## USERS
20 %for _user in c.repo_group.permissions():
20 %for _user in c.repo_group.permissions():
@@ -36,9 +36,16
36 %endif
36 %endif
37 </td>
37 </td>
38 <td></td>
38 <td></td>
39 <td>
39 <td class="quick_repo_menu">
40 % if c.rhodecode_user.is_admin:
40 % if c.rhodecode_user.is_admin:
41 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
41 <i class="icon-more"></i>
42 <div class="menu_items_container" style="display: none;">
43 <ul class="menu_items">
44 <li>
45 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
46 </li>
47 </ul>
48 </div>
42 % endif
49 % endif
43 </td>
50 </td>
44 </tr>
51 </tr>
@@ -67,17 +74,24
67 %if _user.username != h.DEFAULT_USER:
74 %if _user.username != h.DEFAULT_USER:
68 <span class="btn btn-link btn-danger revoke_perm"
75 <span class="btn btn-link btn-danger revoke_perm"
69 member="${_user.user_id}" member_type="user">
76 member="${_user.user_id}" member_type="user">
70 ${_('Revoke')}
77 ${_('Remove')}
71 </span>
78 </span>
72 %endif
79 %endif
73 </td>
80 </td>
74 <td>
81 <td class="quick_repo_menu">
75 % if c.rhodecode_user.is_admin:
82 % if c.rhodecode_user.is_admin:
76 % if _user.username == h.DEFAULT_USER:
83 <i class="icon-more"></i>
77 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
84 <div class="menu_items_container" style="display: none;">
78 % else:
85 <ul class="menu_items">
79 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
86 <li>
80 % endif
87 % if _user.username == h.DEFAULT_USER:
88 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-groups-permissions'))}
89 % else:
90 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
91 % endif
92 </li>
93 </ul>
94 </div>
81 % endif
95 % endif
82 </td>
96 </td>
83 %else:
97 %else:
@@ -101,9 +115,16
101 </span>
115 </span>
102 </td>
116 </td>
103 <td></td>
117 <td></td>
104 <td>
118 <td class="quick_repo_menu">
105 % if c.rhodecode_user.is_admin:
119 % if c.rhodecode_user.is_admin:
106 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
120 <i class="icon-more"></i>
121 <div class="menu_items_container" style="display: none;">
122 <ul class="menu_items">
123 <li>
124 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-groups-permissions'))}
125 </li>
126 </ul>
127 </div>
107 % endif
128 % endif
108 </td>
129 </td>
109 %endif
130 %endif
@@ -131,12 +152,19
131 <td class="td-action">
152 <td class="td-action">
132 <span class="btn btn-link btn-danger revoke_perm"
153 <span class="btn btn-link btn-danger revoke_perm"
133 member="${_user_group.users_group_id}" member_type="user_group">
154 member="${_user_group.users_group_id}" member_type="user_group">
134 ${_('Revoke')}
155 ${_('Remove')}
135 </span>
156 </span>
136 </td>
157 </td>
137 <td>
158 <td class="quick_repo_menu">
138 % if c.rhodecode_user.is_admin:
159 % if c.rhodecode_user.is_admin:
139 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
160 <i class="icon-more"></i>
161 <div class="menu_items_container" style="display: none;">
162 <ul class="menu_items">
163 <li>
164 ${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'))}
165 </li>
166 </ul>
167 </div>
140 % endif
168 % endif
141 </td>
169 </td>
142 </tr>
170 </tr>
@@ -185,5 +213,6
185 });
213 });
186 $('.revoke_perm').on('click', function(e){
214 $('.revoke_perm').on('click', function(e){
187 markRevokePermInput($(this), 'group');
215 markRevokePermInput($(this), 'group');
188 })
216 });
217 quick_repo_menu();
189 </script>
218 </script>
@@ -13,8 +13,8
13 <th class="td-radio">${_('Write')}</th>
13 <th class="td-radio">${_('Write')}</th>
14 <th class="td-radio">${_('Admin')}</th>
14 <th class="td-radio">${_('Admin')}</th>
15 <th class="td-owner">${_('User/User Group')}</th>
15 <th class="td-owner">${_('User/User Group')}</th>
16 <th></th>
16 <th class="td-action"></th>
17 <th></th>
17 <th class="td-action"></th>
18 </tr>
18 </tr>
19 ## USERS
19 ## USERS
20 %for _user in c.rhodecode_db_repo.permissions():
20 %for _user in c.rhodecode_db_repo.permissions():
@@ -35,9 +35,16
35 %endif
35 %endif
36 </td>
36 </td>
37 <td></td>
37 <td></td>
38 <td>
38 <td class="quick_repo_menu">
39 % if c.rhodecode_user.is_admin:
39 % if c.rhodecode_user.is_admin:
40 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
40 <i class="icon-more"></i>
41 <div class="menu_items_container" style="display: none;">
42 <ul class="menu_items">
43 <li>
44 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
45 </li>
46 </ul>
47 </div>
41 % endif
48 % endif
42 </td>
49 </td>
43 </tr>
50 </tr>
@@ -52,9 +59,16
52 ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
59 ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
53 ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
60 ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
54 <td></td>
61 <td></td>
55 <td>
62 <td class="quick_repo_menu">
56 % if c.rhodecode_user.is_admin:
63 % if c.rhodecode_user.is_admin:
57 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
64 <i class="icon-more"></i>
65 <div class="menu_items_container" style="display: none;">
66 <ul class="menu_items">
67 <li>
68 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
69 </li>
70 </ul>
71 </div>
58 % endif
72 % endif
59 </td>
73 </td>
60 </tr>
74 </tr>
@@ -89,17 +103,24
89 %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None:
103 %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None:
90 <span class="btn btn-link btn-danger revoke_perm"
104 <span class="btn btn-link btn-danger revoke_perm"
91 member="${_user.user_id}" member_type="user">
105 member="${_user.user_id}" member_type="user">
92 ${_('Revoke')}
106 ${_('Remove')}
93 </span>
107 </span>
94 %endif
108 %endif
95 </td>
109 </td>
96 <td>
110 <td class="quick_repo_menu">
97 % if c.rhodecode_user.is_admin:
111 % if c.rhodecode_user.is_admin:
98 % if _user.username == h.DEFAULT_USER:
112 <i class="icon-more"></i>
99 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
113 <div class="menu_items_container" style="display: none;">
100 % else:
114 <ul class="menu_items">
101 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
115 <li>
102 % endif
116 % if _user.username == h.DEFAULT_USER:
117 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
118 % else:
119 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
120 % endif
121 </li>
122 </ul>
123 </div>
103 % endif
124 % endif
104 </td>
125 </td>
105 </tr>
126 </tr>
@@ -126,12 +147,19
126 <td class="td-action">
147 <td class="td-action">
127 <span class="btn btn-link btn-danger revoke_perm"
148 <span class="btn btn-link btn-danger revoke_perm"
128 member="${_user_group.users_group_id}" member_type="user_group">
149 member="${_user_group.users_group_id}" member_type="user_group">
129 ${_('Revoke')}
150 ${_('Remove')}
130 </span>
151 </span>
131 </td>
152 </td>
132 <td>
153 <td class="quick_repo_menu">
133 % if c.rhodecode_user.is_admin:
154 % if c.rhodecode_user.is_admin:
134 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
155 <i class="icon-more"></i>
156 <div class="menu_items_container" style="display: none;">
157 <ul class="menu_items">
158 <li>
159 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
160 </li>
161 </ul>
162 </div>
135 % endif
163 % endif
136 </td>
164 </td>
137 </tr>
165 </tr>
@@ -169,4 +197,5
169 $('.revoke_perm').on('click', function(e){
197 $('.revoke_perm').on('click', function(e){
170 markRevokePermInput($(this), 'repository');
198 markRevokePermInput($(this), 'repository');
171 });
199 });
200 quick_repo_menu();
172 </script>
201 </script>
@@ -13,8 +13,8
13 <th class="td-radio">${_('Write')}</th>
13 <th class="td-radio">${_('Write')}</th>
14 <th class="td-radio">${_('Admin')}</th>
14 <th class="td-radio">${_('Admin')}</th>
15 <th>${_('User/User Group')}</th>
15 <th>${_('User/User Group')}</th>
16 <th></th>
16 <th class="td-action"></th>
17 <th></th>
17 <th class="td-action"></th>
18 </tr>
18 </tr>
19 ## USERS
19 ## USERS
20 %for _user in c.user_group.permissions():
20 %for _user in c.user_group.permissions():
@@ -38,9 +38,16
38 </span>
38 </span>
39 </td>
39 </td>
40 <td></td>
40 <td></td>
41 <td>
41 <td class="quick_repo_menu">
42 % if c.rhodecode_user.is_admin:
42 % if c.rhodecode_user.is_admin:
43 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
43 <i class="icon-more"></i>
44 <div class="menu_items_container" style="display: none;">
45 <ul class="menu_items">
46 <li>
47 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
48 </li>
49 </ul>
50 </div>
44 % endif
51 % endif
45 </td>
52 </td>
46 </tr>
53 </tr>
@@ -69,17 +76,24
69 %if _user.username != h.DEFAULT_USER:
76 %if _user.username != h.DEFAULT_USER:
70 <span class="btn btn-link btn-danger revoke_perm"
77 <span class="btn btn-link btn-danger revoke_perm"
71 member="${_user.user_id}" member_type="user">
78 member="${_user.user_id}" member_type="user">
72 ${_('Revoke')}
79 ${_('Remove')}
73 </span>
80 </span>
74 %endif
81 %endif
75 </td>
82 </td>
76 <td>
83 <td class="quick_repo_menu">
77 % if c.rhodecode_user.is_admin:
84 % if c.rhodecode_user.is_admin:
78 % if _user.username == h.DEFAULT_USER:
85 <i class="icon-more"></i>
79 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
86 <div class="menu_items_container" style="display: none;">
80 % else:
87 <ul class="menu_items">
81 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
88 <li>
82 % endif
89 % if _user.username == h.DEFAULT_USER:
90 ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='user-groups-permissions'))}
91 % else:
92 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
93 % endif
94 </li>
95 </ul>
96 </div>
83 % endif
97 % endif
84 </td>
98 </td>
85 %else:
99 %else:
@@ -103,9 +117,16
103 </span>
117 </span>
104 </td>
118 </td>
105 <td></td>
119 <td></td>
106 <td>
120 <td class="quick_repo_menu">
107 % if c.rhodecode_user.is_admin:
121 % if c.rhodecode_user.is_admin:
108 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
122 <i class="icon-more"></i>
123 <div class="menu_items_container" style="display: none;">
124 <ul class="menu_items">
125 <li>
126 ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='user-groups-permissions'))}
127 </li>
128 </ul>
129 </div>
109 % endif
130 % endif
110 </td>
131 </td>
111 %endif
132 %endif
@@ -133,12 +154,19
133 <td class="td-action">
154 <td class="td-action">
134 <span class="btn btn-link btn-danger revoke_perm"
155 <span class="btn btn-link btn-danger revoke_perm"
135 member="${_user_group.users_group_id}" member_type="user_group">
156 member="${_user_group.users_group_id}" member_type="user_group">
136 ${_('Revoke')}
157 ${_('Remove')}
137 </span>
158 </span>
138 </td>
159 </td>
139 <td>
160 <td class="quick_repo_menu">
140 % if c.rhodecode_user.is_admin:
161 % if c.rhodecode_user.is_admin:
141 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
162 <i class="icon-more"></i>
163 <div class="menu_items_container" style="display: none;">
164 <ul class="menu_items">
165 <li>
166 ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='user-groups-permissions'))}
167 </li>
168 </ul>
169 </div>
142 % endif
170 % endif
143 </td>
171 </td>
144 </tr>
172 </tr>
@@ -174,4 +202,5
174 $('.revoke_perm').on('click', function(e){
202 $('.revoke_perm').on('click', function(e){
175 markRevokePermInput($(this), 'usergroup');
203 markRevokePermInput($(this), 'usergroup');
176 });
204 });
205 quick_repo_menu()
177 </script>
206 </script>
Comments 0
You need to be logged in to leave comments. Login now