Mercurial > kallithea
annotate rhodecode/templates/admin/users/users.html @ 2375:bc2d8c03c050 beta
Implemented #467 Journal logs comments on changesets
- added created/updated user action to journal
- added created/updated users group action journal
- added ip adresses to most of action_log calls to track IP changes
- rewrote action_parser to simpler and more efficient solution
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 03 Jun 2012 00:40:14 +0200 |
parents | f91d3f9b7230 |
children | e5f4085f72f1 |
rev | line source |
---|---|
216
c8162373f214
Cleaned the way based was used to generate submenu for admin, now it's much more clear to use submenu. Cleaned admin and added comment to middleware
Marcin Kuzminski <marcin@python-works.com>
parents:
182
diff
changeset
|
1 ## -*- coding: utf-8 -*- |
127
20dc7a5eb748
Html changes and cleanups, made folders for html templates, implemented tags and branches pages
Marcin Kuzminski <marcin@python-works.com>
parents:
105
diff
changeset
|
2 <%inherit file="/base/base.html"/> |
216
c8162373f214
Cleaned the way based was used to generate submenu for admin, now it's much more clear to use submenu. Cleaned admin and added comment to middleware
Marcin Kuzminski <marcin@python-works.com>
parents:
182
diff
changeset
|
3 |
44 | 4 <%def name="title()"> |
619
a1ec653f5f95
#38 updated RhodeCode titles
Marcin Kuzminski <marcin@python-works.com>
parents:
581
diff
changeset
|
5 ${_('Users administration')} - ${c.rhodecode_name} |
44 | 6 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
7 |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
8 <%def name="breadcrumbs_links()"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
9 ${h.link_to(_('Admin'),h.url('admin_home'))} » ${_('Users')} |
44 | 10 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
11 |
44 | 12 <%def name="page_nav()"> |
182
11e8eb5a92e3
new way of menu generation for base, and all admin pages
Marcin Kuzminski <marcin@python-works.com>
parents:
174
diff
changeset
|
13 ${self.menu('admin')} |
44 | 14 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
15 |
44 | 16 <%def name="main()"> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
17 <div class="box"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
18 <!-- box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
19 <div class="title"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
20 ${self.breadcrumbs()} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
21 <ul class="links"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
22 <li> |
1472
aaec08ad9daf
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
Augusto Herrmann <augusto.herrmann@planejamento.gov.br>
parents:
1266
diff
changeset
|
23 <span>${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}</span> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
24 </li> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1827
diff
changeset
|
25 |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1827
diff
changeset
|
26 </ul> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
27 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
28 <!-- end box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
29 <div class="table"> |
219
64e1125fc479
html + css changes, added icons and etc.
Marcin Kuzminski <marcin@python-works.com>
parents:
216
diff
changeset
|
30 <table class="table_disp"> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
31 <tr class="header"> |
398
8c50b164fb58
Implemented basic gravatar support on admin pages only for now
Marcin Kuzminski <marcin@python-works.com>
parents:
362
diff
changeset
|
32 <th></th> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
33 <th class="left">${_('username')}</th> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
34 <th class="left">${_('name')}</th> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
35 <th class="left">${_('lastname')}</th> |
954
de671e3af0e5
added last login of user to admin users browse
Marcin Kuzminski <marcin@python-works.com>
parents:
739
diff
changeset
|
36 <th class="left">${_('last login')}</th> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
37 <th class="left">${_('active')}</th> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
38 <th class="left">${_('admin')}</th> |
712
131c1e335fa7
Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
39 <th class="left">${_('ldap')}</th> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
40 <th class="left">${_('action')}</th> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
41 </tr> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
42 %for cnt,user in enumerate(c.users_list): |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
43 %if user.name !='default': |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
44 <tr class="parity${cnt%2}"> |
714 | 45 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div></td> |
50
73f413946c14
user managment implementation continued update/delete/create works
Marcin Kuzminski <marcin@python-blog.com>
parents:
49
diff
changeset
|
46 <td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td> |
238
a55c17874486
Rewrite of user managment, improved forms, added some user info
Marcin Kuzminski <marcin@python-works.com>
parents:
230
diff
changeset
|
47 <td>${user.name}</td> |
a55c17874486
Rewrite of user managment, improved forms, added some user info
Marcin Kuzminski <marcin@python-works.com>
parents:
230
diff
changeset
|
48 <td>${user.lastname}</td> |
954
de671e3af0e5
added last login of user to admin users browse
Marcin Kuzminski <marcin@python-works.com>
parents:
739
diff
changeset
|
49 <td>${user.last_login}</td> |
712
131c1e335fa7
Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
50 <td>${h.bool2icon(user.active)}</td> |
131c1e335fa7
Added ldap info on admin users, added bool2icon helper for nicer representation of
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
51 <td>${h.bool2icon(user.admin)}</td> |
991
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
954
diff
changeset
|
52 <td>${h.bool2icon(bool(user.ldap_dn))}</td> |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
47
diff
changeset
|
53 <td> |
1266
a1bcfe58a1ab
Fixed #161 form saves the create repository permission.
Marcin Kuzminski <marcin@python-works.com>
parents:
991
diff
changeset
|
54 ${h.form(url('delete_user', id=user.user_id),method='delete')} |
1472
aaec08ad9daf
Added pt_BR localization, added i18n wrappers on some places missing, fixed css in settings screen for longer labels.
Augusto Herrmann <augusto.herrmann@planejamento.gov.br>
parents:
1266
diff
changeset
|
55 ${h.submit('remove_',_('delete'),id="remove_user_%s" % user.user_id, |
1827
94e9e8605096
more verbose removal messages
Marcin Kuzminski <marcin@python-works.com>
parents:
1472
diff
changeset
|
56 class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this user: %s') % user.username+"');")} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
57 ${h.end_form()} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
58 </td> |
44 | 59 </tr> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
60 %endif |
44 | 61 %endfor |
50
73f413946c14
user managment implementation continued update/delete/create works
Marcin Kuzminski <marcin@python-blog.com>
parents:
49
diff
changeset
|
62 </table> |
47
f6ac79182600
Added rest controllers for repos and users,
Marcin Kuzminski <marcin@python-blog.com>
parents:
44
diff
changeset
|
63 </div> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
346
diff
changeset
|
64 </div> |
216
c8162373f214
Cleaned the way based was used to generate submenu for admin, now it's much more clear to use submenu. Cleaned admin and added comment to middleware
Marcin Kuzminski <marcin@python-works.com>
parents:
182
diff
changeset
|
65 </%def> |