ui: make super admin named consistently across ui.
Bartlomiej Wolynczyk -
r4134:cc0663d2 default
Not Reviewed
Show More
Add another comment
TODOs: 0 unresolved 0 Resolved
COMMENTS: 0 General 0 Inline
@@ -29,7 +29,7
29 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
29 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
30 ${h.link_to_user(_user.username)}
30 ${h.link_to_user(_user.username)}
31 %if getattr(_user, 'admin_row', None):
31 %if getattr(_user, 'admin_row', None):
32 (${_('super admin')})
32 (${_('super-admin')})
33 %endif
33 %endif
34 %if getattr(_user, 'owner_row', None):
34 %if getattr(_user, 'owner_row', None):
35 (${_('owner')})
35 (${_('owner')})
@@ -28,7 +28,7
28 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
28 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
29 ${h.link_to_user(_user.username)}
29 ${h.link_to_user(_user.username)}
30 %if getattr(_user, 'admin_row', None):
30 %if getattr(_user, 'admin_row', None):
31 (${_('super admin')})
31 (${_('super-admin')})
32 %endif
32 %endif
33 %if getattr(_user, 'owner_row', None):
33 %if getattr(_user, 'owner_row', None):
34 (${_('owner')})
34 (${_('owner')})
@@ -30,7 +30,7
30 <span class="user">
30 <span class="user">
31 ${h.link_to_user(_user.username)}
31 ${h.link_to_user(_user.username)}
32 %if getattr(_user, 'admin_row', None):
32 %if getattr(_user, 'admin_row', None):
33 (${_('super admin')})
33 (${_('super-admin')})
34 %endif
34 %endif
35 %if getattr(_user, 'owner_row', None):
35 %if getattr(_user, 'owner_row', None):
36 (${_('owner')})
36 (${_('owner')})
@@ -106,7 +106,7
106 </div>
106 </div>
107 <div class="field">
107 <div class="field">
108 <div class="label-text">
108 <div class="label-text">
109 ${_('Super Admin')}:
109 ${_('Super-admin')}:
110 </div>
110 </div>
111 <div class="input user-checkbox">
111 <div class="input user-checkbox">
112 ${h.checkbox('admin',value=True)}
112 ${h.checkbox('admin',value=True)}
@@ -84,7 +84,7
84 { data: {"_": "active",
84 { data: {"_": "active",
85 "sort": "active"}, title: "${_('Active')}", className: "td-active" },
85 "sort": "active"}, title: "${_('Active')}", className: "td-active" },
86 { data: {"_": "admin",
86 { data: {"_": "admin",
87 "sort": "admin"}, title: "${_('Super admin')}", className: "td-admin" },
87 "sort": "admin"}, title: "${_('Super-admin')}", className: "td-admin" },
88 { data: {"_": "extern_type",
88 { data: {"_": "extern_type",
89 "sort": "extern_type"}, title: "${_('Auth type')}", className: "td-type" },
89 "sort": "extern_type"}, title: "${_('Auth type')}", className: "td-type" },
90 { data: {"_": "action",
90 { data: {"_": "action",
@@ -91,7 +91,7
91 <div class="title-content">
91 <div class="title-content">
92 <div class="title-main">
92 <div class="title-main">
93 % if c.is_super_admin:
93 % if c.is_super_admin:
94 ${_('Super Admin Panel')}
94 ${_('Super-admin Panel')}
95 % else:
95 % else:
96 ${_('Delegated Admin Panel')}
96 ${_('Delegated Admin Panel')}
97 % endif
97 % endif
@@ -101,7 +101,7
101
101
102 <ul id="context-pages" class="navigation horizontal-list">
102 <ul id="context-pages" class="navigation horizontal-list">
103
103
104 ## super admin case
104 ## super-admin case
105 % if c.is_super_admin:
105 % if c.is_super_admin:
106 <li class="${h.is_active('audit_logs', active)}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
106 <li class="${h.is_active('audit_logs', active)}"><a href="${h.route_path('admin_audit_logs')}">${_('Admin audit logs')}</a></li>
107 <li class="${h.is_active('repositories', active)}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
107 <li class="${h.is_active('repositories', active)}"><a href="${h.route_path('repos')}">${_('Repositories')}</a></li>
@@ -86,7 +86,7
86 <td class="td-tags">
86 <td class="td-tags">
87 %if val[0]:
87 %if val[0]:
88 %if not val_lbl:
88 %if not val_lbl:
89 ## super admin case
89 ## super-admin case
90 True
90 True
91 %else:
91 %else:
92 <span class="perm_tag admin">${val_lbl}.admin</span>
92 <span class="perm_tag admin">${val_lbl}.admin</span>
@@ -142,7 +142,7
142 ${glob(_('User group default permission'), get_section_perms('usergroup.', permissions[section]), 'usergroup',
142 ${glob(_('User group default permission'), get_section_perms('usergroup.', permissions[section]), 'usergroup',
143 edit_url=None, edit_global_url=h.route_path('admin_permissions_object'))}
143 edit_url=None, edit_global_url=h.route_path('admin_permissions_object'))}
144
144
145 ${glob(_('Super admin'), get_section_perms('hg.admin', permissions[section]),
145 ${glob(_('Super-admin'), get_section_perms('hg.admin', permissions[section]),
146 edit_url=h.route_path('user_edit', user_id=c.user.user_id, _anchor='admin'), edit_global_url=None)}
146 edit_url=h.route_path('user_edit', user_id=c.user.user_id, _anchor='admin'), edit_global_url=None)}
147
147
148 ${glob(_('Inherit permissions'), get_section_perms('hg.inherit_default_perms.', permissions[section]),
148 ${glob(_('Inherit permissions'), get_section_perms('hg.inherit_default_perms.', permissions[section]),
@@ -81,7 +81,7
81 <p>
81 <p>
82 <strong>Exception ID: <code><a href="${c.exception_id_url}">${c.exception_id}</a></code> </strong> <br/>
82 <strong>Exception ID: <code><a href="${c.exception_id_url}">${c.exception_id}</a></code> </strong> <br/>
83
83
84 Super Admins can see detailed traceback information from this exception by checking the below Exception ID.<br/>
84 Super-admins can see detailed traceback information from this exception by checking the below Exception ID.<br/>
85 Please include the above link for further details of this exception.
85 Please include the above link for further details of this exception.
86 </p>
86 </p>
87 </div>
87 </div>
Comments 0
You need to be logged in to leave comments. Login now