Mercurial > kallithea
annotate rhodecode/templates/admin/users/user_edit.html @ 3455:d5ae996eed11 beta
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 05 Mar 2013 11:39:30 +0100 |
parents | 3c8d8725333f |
children | 1f334a68d057 |
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:
70
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 |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
4 <%def name="title()"> |
619
a1ec653f5f95
#38 updated RhodeCode titles
Marcin Kuzminski <marcin@python-works.com>
parents:
582
diff
changeset
|
5 ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name} |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
6 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
7 |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
8 <%def name="breadcrumbs_links()"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
9 ${h.link_to(_('Admin'),h.url('admin_home'))} |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
10 » |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
11 ${h.link_to(_('Users'),h.url('users'))} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
12 » |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
13 ${_('edit')} "${c.user.username}" |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
14 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
15 |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
16 <%def name="page_nav()"> |
3197 | 17 ${self.menu('admin')} |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
18 </%def> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
19 |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
20 <%def name="main()"> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
21 <div class="box box-left"> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
22 <!-- box / title --> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
23 <div class="title"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
24 ${self.breadcrumbs()} |
48
8e250e86a670
Css fixes, implemented removal of users, and display draft
Marcin Kuzminski <marcin@python-blog.com>
parents:
diff
changeset
|
25 </div> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
26 <!-- end box / title --> |
1266
a1bcfe58a1ab
Fixed #161 form saves the create repository permission.
Marcin Kuzminski <marcin@python-works.com>
parents:
1116
diff
changeset
|
27 ${h.form(url('update_user', id=c.user.user_id),method='put')} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
28 <div class="form"> |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
29 <div class="field"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
30 <div class="gravatar_box"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
31 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div> |
1629
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
32 <p> |
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
33 %if c.use_gravatar: |
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
34 <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong> |
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
35 <br/>${_('Using')} ${c.user.email} |
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
36 %else: |
2196aa27954b
implements #293 gravatar link should be disabled when use_gravatar = false
Marcin Kuzminski <marcin@python-works.com>
parents:
1597
diff
changeset
|
37 <br/>${c.user.email} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
38 %endif |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
39 </div> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
40 </div> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
41 <div class="field"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
42 <div class="label"> |
3409 | 43 <label>${_('API key')}:</label> ${c.user.api_key} |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
44 </div> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
45 </div> |
3455
d5ae996eed11
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
Marcin Kuzminski <marcin@python-works.com>
parents:
3409
diff
changeset
|
46 ##show current ip just if we show ourself |
d5ae996eed11
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
Marcin Kuzminski <marcin@python-works.com>
parents:
3409
diff
changeset
|
47 %if c.rhodecode_user.username == c.user.username: |
3125
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
48 <div class="field"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
49 <div class="label"> |
3409 | 50 <label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"} |
3125
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
51 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
52 </div> |
3455
d5ae996eed11
show ip for my account, and only in editing your user, showing in all users next to API key is misleading
Marcin Kuzminski <marcin@python-works.com>
parents:
3409
diff
changeset
|
53 %endif |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
54 <div class="fields"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
55 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
56 <div class="label"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
57 <label for="username">${_('Username')}:</label> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
58 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
59 <div class="input"> |
3021
b2b93614a7cd
Implemented #658 Changing username in LDAP-Mode should not be allowed.
Marcin Kuzminski <marcin@python-works.com>
parents:
2815
diff
changeset
|
60 %if c.ldap_dn: |
b2b93614a7cd
Implemented #658 Changing username in LDAP-Mode should not be allowed.
Marcin Kuzminski <marcin@python-works.com>
parents:
2815
diff
changeset
|
61 ${h.text('username',class_='medium disabled', readonly="readonly")} |
b2b93614a7cd
Implemented #658 Changing username in LDAP-Mode should not be allowed.
Marcin Kuzminski <marcin@python-works.com>
parents:
2815
diff
changeset
|
62 %else: |
b2b93614a7cd
Implemented #658 Changing username in LDAP-Mode should not be allowed.
Marcin Kuzminski <marcin@python-works.com>
parents:
2815
diff
changeset
|
63 ${h.text('username',class_='medium')} |
b2b93614a7cd
Implemented #658 Changing username in LDAP-Mode should not be allowed.
Marcin Kuzminski <marcin@python-works.com>
parents:
2815
diff
changeset
|
64 %endif: |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
65 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
66 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
67 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
68 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
69 <div class="label"> |
991
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
70 <label for="ldap_dn">${_('LDAP DN')}:</label> |
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
71 </div> |
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
72 <div class="input"> |
1906
90a4066d4261
marked ldap_dn in user edit form as readonly ref #292
Marcin Kuzminski <marcin@python-works.com>
parents:
1888
diff
changeset
|
73 ${h.text('ldap_dn',class_='medium disabled',readonly="readonly")} |
991
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
74 </div> |
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
75 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
76 |
991
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
77 <div class="field"> |
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
78 <div class="label"> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
79 <label for="new_password">${_('New password')}:</label> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
80 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
81 <div class="input"> |
1366
9c0f5d558789
fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached
Marcin Kuzminski <marcin@python-works.com>
parents:
1266
diff
changeset
|
82 ${h.password('new_password',class_='medium',autocomplete="off")} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
83 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
84 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
85 |
1597
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
86 <div class="field"> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
87 <div class="label"> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
88 <label for="password_confirmation">${_('New password confirmation')}:</label> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
89 </div> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
90 <div class="input"> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
91 ${h.password('password_confirmation',class_="medium",autocomplete="off")} |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
92 </div> |
019026a8cf67
implements #237 added password confirmation for my account and admin edit user.
Marcin Kuzminski <marcin@python-works.com>
parents:
1575
diff
changeset
|
93 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
94 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
95 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
96 <div class="label"> |
2544
6ce3387bf0ce
Renamed name to firstname in forms
Marcin Kuzminski <marcin@python-works.com>
parents:
2532
diff
changeset
|
97 <label for="firstname">${_('First Name')}:</label> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
98 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
99 <div class="input"> |
2544
6ce3387bf0ce
Renamed name to firstname in forms
Marcin Kuzminski <marcin@python-works.com>
parents:
2532
diff
changeset
|
100 ${h.text('firstname',class_='medium')} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
101 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
102 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
103 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
104 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
105 <div class="label"> |
697
540545d374fd
fixes for #66 renamed name to First Name
Marcin Kuzminski <marcin@python-works.com>
parents:
619
diff
changeset
|
106 <label for="lastname">${_('Last Name')}:</label> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
107 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
108 <div class="input"> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
109 ${h.text('lastname',class_='medium')} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
110 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
111 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
112 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
113 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
114 <div class="label"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
115 <label for="email">${_('Email')}:</label> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
116 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
117 <div class="input"> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
118 ${h.text('email',class_='medium')} |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
119 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
120 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
121 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
122 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
123 <div class="label label-checkbox"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
124 <label for="active">${_('Active')}:</label> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
125 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
126 <div class="checkboxes"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
127 ${h.checkbox('active',value=True)} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
128 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
129 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
130 |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
131 <div class="field"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
132 <div class="label label-checkbox"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
133 <label for="admin">${_('Admin')}:</label> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
134 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
135 <div class="checkboxes"> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
136 ${h.checkbox('admin',value=True)} |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
137 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
138 </div> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
139 <div class="buttons"> |
2607
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
140 ${h.submit('save',_('Save'),class_="ui-btn large")} |
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
141 ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
142 </div> |
3197 | 143 </div> |
362
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
144 </div> |
558eb7c5028f
version bump to 0.8
Marcin Kuzminski <marcin@python-works.com>
parents:
329
diff
changeset
|
145 ${h.end_form()} |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
146 </div> |
2636
4dbc00e9d0c3
fixes issue #506
Marcin Kuzminski <marcin@python-works.com>
parents:
2631
diff
changeset
|
147 <div style="min-height:780px" class="box box-right"> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
148 <!-- box / title --> |
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
149 <div class="title"> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
150 <h5>${_('Permissions')}</h5> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
151 </div> |
1266
a1bcfe58a1ab
Fixed #161 form saves the create repository permission.
Marcin Kuzminski <marcin@python-works.com>
parents:
1116
diff
changeset
|
152 ${h.form(url('user_perm', id=c.user.user_id),method='put')} |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
153 <div class="form"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
154 <!-- fields --> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
155 <div class="fields"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
156 <div class="field"> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
157 <div class="label label-checkbox"> |
2709
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
158 <label for="inherit_permissions">${_('Inherit default permissions')}:</label> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
159 </div> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
160 <div class="checkboxes"> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
161 ${h.checkbox('inherit_default_permissions',value=True)} |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
162 </div> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
163 <span class="help-block">${h.literal(_('Select to inherit permissions from %s settings. ' |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
164 'With this selected below options does not have any action') % h.link_to('default', url('edit_permission', id='default')))}</span> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
165 </div> |
2815
acc05c33cc0c
White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2722
diff
changeset
|
166 <div id="inherit_overlay" style="${'opacity:0.3' if c.user.inherit_default_permissions else ''}" > |
2709
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
167 <div class="field"> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
168 <div class="label label-checkbox"> |
1575
e0b069468de0
Corrected some label-input linking in templates
Augusto Herrmann <augusto.herrmann@planejamento.gov.br>
parents:
1472
diff
changeset
|
169 <label for="create_repo_perm">${_('Create repositories')}:</label> |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
170 </div> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
171 <div class="checkboxes"> |
1266
a1bcfe58a1ab
Fixed #161 form saves the create repository permission.
Marcin Kuzminski <marcin@python-works.com>
parents:
1116
diff
changeset
|
172 ${h.checkbox('create_repo_perm',value=True)} |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
173 </div> |
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
174 </div> |
2709
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
175 <div class="field"> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
176 <div class="label label-checkbox"> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
177 <label for="fork_repo_perm">${_('Fork repositories')}:</label> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
178 </div> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
179 <div class="checkboxes"> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
180 ${h.checkbox('fork_repo_perm',value=True)} |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
181 </div> |
d2d35cf2b351
RhodeCode now has a option to explicitly set forking permissions. ref #508
Marcin Kuzminski <marcin@python-works.com>
parents:
2673
diff
changeset
|
182 </div> |
2815
acc05c33cc0c
White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2722
diff
changeset
|
183 </div> |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
184 <div class="buttons"> |
2607
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
185 ${h.submit('save',_('Save'),class_="ui-btn large")} |
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
186 ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
187 </div> |
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
188 </div> |
1116
716911af91e1
Added api_key into user, api key get's generated again after password change
Marcin Kuzminski <marcin@python-works.com>
parents:
1051
diff
changeset
|
189 </div> |
1888
f91d3f9b7230
White-space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
1629
diff
changeset
|
190 ${h.end_form()} |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
191 |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
192 ## permissions overview |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
193 <div id="perms" class="table"> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
194 %for section in sorted(c.perm_user.permissions.keys()): |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
195 <div class="perms_section_head">${section.replace("_"," ").capitalize()}</div> |
2636
4dbc00e9d0c3
fixes issue #506
Marcin Kuzminski <marcin@python-works.com>
parents:
2631
diff
changeset
|
196 %if not c.perm_user.permissions[section]: |
2722
ef7520340c44
fixed missing div on my_account + added nothing here yet when there are no
Marcin Kuzminski <marcin@python-works.com>
parents:
2709
diff
changeset
|
197 <span class="empty_data">${_('Nothing here yet')}</span> |
2636
4dbc00e9d0c3
fixes issue #506
Marcin Kuzminski <marcin@python-works.com>
parents:
2631
diff
changeset
|
198 %else: |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
199 <div id='tbl_list_wrap_${section}' class="yui-skin-sam"> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
200 <table id="tbl_list_${section}"> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
201 <thead> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
202 <tr> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
203 <th class="left">${_('Name')}</th> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
204 <th class="left">${_('Permission')}</th> |
2631
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
205 <th class="left">${_('Edit Permission')}</th> |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
206 </thead> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
207 <tbody> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
208 %for k in c.perm_user.permissions[section]: |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
209 <% |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
210 if section != 'global': |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
211 section_perm = c.perm_user.permissions[section].get(k) |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
212 _perm = section_perm.split('.')[-1] |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
213 else: |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
214 _perm = section_perm = None |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
215 %> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
216 <tr> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
217 <td> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
218 %if section == 'repositories': |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
219 <a href="${h.url('summary_home',repo_name=k)}">${k}</a> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
220 %elif section == 'repositories_groups': |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
221 <a href="${h.url('repos_group_home',group_name=k)}">${k}</a> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
222 %else: |
2532
19de74e33fb0
Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
223 ${h.get_permission_name(k)} |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
224 %endif |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
225 </td> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
226 <td> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
227 %if section == 'global': |
2532
19de74e33fb0
Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
228 ${h.bool2icon(k.split('.')[-1] != 'none')} |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
229 %else: |
2532
19de74e33fb0
Better descriptions of given permission overview in edit user view
Marcin Kuzminski <marcin@python-works.com>
parents:
2478
diff
changeset
|
230 <span class="perm_tag ${_perm}">${section_perm}</span> |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
231 %endif |
2631
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
232 </td> |
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
233 <td> |
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
234 %if section == 'repositories': |
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
235 <a href="${h.url('edit_repo',repo_name=k,anchor='permissions_manage')}">${_('edit')}</a> |
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
236 %elif section == 'repositories_groups': |
3222
b4daef4cc26d
Group management delegation:
Marcin Kuzminski <marcin@python-works.com>
parents:
3197
diff
changeset
|
237 <a href="${h.url('edit_repos_group',group_name=k,anchor='permissions_manage')}">${_('edit')}</a> |
2631
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
238 %else: |
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
239 -- |
2673
d5e42c00f3c1
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2636
diff
changeset
|
240 %endif |
2631
f597cfb492f9
Added quick links for editing permissions for users from permission overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
241 </td> |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
242 </tr> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
243 %endfor |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
244 </tbody> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
245 </table> |
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
246 </div> |
2636
4dbc00e9d0c3
fixes issue #506
Marcin Kuzminski <marcin@python-works.com>
parents:
2631
diff
changeset
|
247 %endif |
2435
751c1c56e080
#478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
248 %endfor |
2453
d2a528b60e50
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2435
diff
changeset
|
249 </div> |
889
79f42866bcbb
extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents:
888
diff
changeset
|
250 </div> |
3187
81a81bac92da
user edit: make email address box float correctly
Mads Kiilerich <madski@unity3d.com>
parents:
3125
diff
changeset
|
251 <div class="box box-left" style="clear:left"> |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
252 <!-- box / title --> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
253 <div class="title"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
254 <h5>${_('Email addresses')}</h5> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
255 </div> |
2478
8eab81115660
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2462
diff
changeset
|
256 |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
257 <div class="emails_wrap"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
258 <table class="noborder"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
259 %for em in c.user_email_map: |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
260 <tr> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
261 <td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(em.user.email,16)}"/> </div></td> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
262 <td><div class="email">${em.email}</div></td> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
263 <td> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
264 ${h.form(url('user_emails_delete', id=c.user.user_id),method='delete')} |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
265 ${h.hidden('del_email',em.email_id)} |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
266 ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id, |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
267 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} |
2478
8eab81115660
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2462
diff
changeset
|
268 ${h.end_form()} |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
269 </td> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
270 </tr> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
271 %endfor |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
272 </table> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
273 </div> |
2478
8eab81115660
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2462
diff
changeset
|
274 |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
275 ${h.form(url('user_emails', id=c.user.user_id),method='put')} |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
276 <div class="form"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
277 <!-- fields --> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
278 <div class="fields"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
279 <div class="field"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
280 <div class="label"> |
3125
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
281 <label for="new_email">${_('New email address')}:</label> |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
282 </div> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
283 <div class="input"> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
284 ${h.text('new_email', class_='medium')} |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
285 </div> |
2478
8eab81115660
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2462
diff
changeset
|
286 </div> |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
287 <div class="buttons"> |
2607
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
288 ${h.submit('save',_('Add'),class_="ui-btn large")} |
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2544
diff
changeset
|
289 ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
2330
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
290 </div> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
291 </div> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
292 </div> |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
293 ${h.end_form()} |
b0fef8a77568
Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents:
1906
diff
changeset
|
294 </div> |
3125
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
295 <div class="box box-left" style="clear:left"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
296 <!-- box / title --> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
297 <div class="title"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
298 <h5>${_('Allowed IP addresses')}</h5> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
299 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
300 |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
301 <div class="ips_wrap"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
302 <table class="noborder"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
303 %if c.user_ip_map: |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
304 %for ip in c.user_ip_map: |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
305 <tr> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
306 <td><div class="ip">${ip.ip_addr}</div></td> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
307 <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
308 <td> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
309 ${h.form(url('user_ips_delete', id=c.user.user_id),method='delete')} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
310 ${h.hidden('del_ip',ip.ip_id)} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
311 ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
312 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
313 ${h.end_form()} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
314 </td> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
315 </tr> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
316 %endfor |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
317 %else: |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
318 <tr><td><div class="ip">${_('All IP addresses are allowed')}</div></td></tr> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
319 %endif |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
320 </table> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
321 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
322 |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
323 ${h.form(url('user_ips', id=c.user.user_id),method='put')} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
324 <div class="form"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
325 <!-- fields --> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
326 <div class="fields"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
327 <div class="field"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
328 <div class="label"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
329 <label for="new_ip">${_('New ip address')}:</label> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
330 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
331 <div class="input"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
332 ${h.text('new_ip', class_='medium')} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
333 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
334 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
335 <div class="buttons"> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
336 ${h.submit('save',_('Add'),class_="ui-btn large")} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
337 ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
338 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
339 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
340 </div> |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
341 ${h.end_form()} |
9b92cf5a0cca
Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents:
3021
diff
changeset
|
342 </div> |
991
b232a36cc51f
Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents:
895
diff
changeset
|
343 </%def> |