annotate rhodecode/templates/admin/users/user_edit.html @ 3960:5293d4bbb1ea

Merged dev into stable/default/master branch
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Jun 2013 00:31:11 +0200
parents 3563bb7b4b82 6cc17e42fa49
children ffd45b185016
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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()">
3582
1f334a68d057 improved title consistency
Marcin Kuzminski <marcin@python-works.com>
parents: 3455
diff changeset
5 ${_('Edit user')} ${c.user.username} &middot; ${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 &raquo;
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 &raquo;
3654
ec6354949623 Fix a lot of casings - use standard casing in most places
Mads Kiilerich <madski@unity3d.com>
parents: 3627
diff changeset
13 ${_('Edit %s') % 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
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3187
diff changeset
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
3c8d8725333f user edit: fix labels
Mads Kiilerich <madski@unity3d.com>
parents: 3222
diff changeset
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
3c8d8725333f user edit: fix labels
Mads Kiilerich <madski@unity3d.com>
parents: 3222
diff changeset
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
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3187
diff changeset
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>
3736
87e6960e250b Iteration on default permissions
Marcin Kuzminski <marcin@python-works.com>
parents: 3666
diff changeset
152 <%namespace name="dpb" file="/base/default_perms_box.html"/>
87e6960e250b Iteration on default permissions
Marcin Kuzminski <marcin@python-works.com>
parents: 3666
diff changeset
153 ${dpb.default_perms_box(url('user_perm', id=c.user.user_id))}
2435
751c1c56e080 #478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
154
751c1c56e080 #478 permissions overview for admin in user edit view
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
155 ## permissions overview
3666
fda60c2ad65f fixed sort of permissions summary it's now perm+name
Marcin Kuzminski <marcin@python-works.com>
parents: 3654
diff changeset
156 <%namespace name="p" file="/base/perms_summary.html"/>
3901
6cc17e42fa49 Don't show empty permissions for users, only for admins
Marcin Kuzminski <marcin@python-works.com>
parents: 3736
diff changeset
157 ${p.perms_summary(c.perm_user.permissions, show_all=True)}
3666
fda60c2ad65f fixed sort of permissions summary it's now perm+name
Marcin Kuzminski <marcin@python-works.com>
parents: 3654
diff changeset
158
889
79f42866bcbb extended user editing view with permissions (still a todo)
Marcin Kuzminski <marcin@python-works.com>
parents: 888
diff changeset
159 </div>
3187
81a81bac92da user edit: make email address box float correctly
Mads Kiilerich <madski@unity3d.com>
parents: 3125
diff changeset
160 <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
161 <!-- box / title -->
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
162 <div class="title">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
163 <h5>${_('Email addresses')}</h5>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
164 </div>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2462
diff changeset
165
2330
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
166 <div class="emails_wrap">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
167 <table class="noborder">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
168 %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
169 <tr>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
170 <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
171 <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
172 <td>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
173 ${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
174 ${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
175 ${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
176 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
177 ${h.end_form()}
2330
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
178 </td>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
179 </tr>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
180 %endfor
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
181 </table>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
182 </div>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2462
diff changeset
183
2330
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
184 ${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
185 <div class="form">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
186 <!-- fields -->
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
187 <div class="fields">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
188 <div class="field">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
189 <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
190 <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
191 </div>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
192 <div class="input">
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
193 ${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
194 </div>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2462
diff changeset
195 </div>
2330
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
196 <div class="buttons">
2607
7ae36df760ce removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents: 2544
diff changeset
197 ${h.submit('save',_('Add'),class_="ui-btn large")}
7ae36df760ce removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents: 2544
diff changeset
198 ${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
199 </div>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
200 </div>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
201 </div>
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
202 ${h.end_form()}
b0fef8a77568 Added simple UI for admin to manage emails map
Marcin Kuzminski <marcin@python-works.com>
parents: 1906
diff changeset
203 </div>
3125
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
204 <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
205 <!-- box / title -->
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
206 <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
207 <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
208 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
209
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
210 <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
211 <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
212 %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
213 %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
214 <tr>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
215 <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
216 <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
217 <td>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
218 ${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
219 ${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
220 ${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
221 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
222 ${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
223 </td>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
224 </tr>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
225 %endfor
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
226 %else:
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
227 <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
228 %endif
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
229 </table>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
230 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
231
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
232 ${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
233 <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
234 <!-- fields -->
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
235 <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
236 <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
237 <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
238 <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
239 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
240 <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
241 ${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
242 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
243 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
244 <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
245 ${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
246 ${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
247 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
248 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
249 </div>
9b92cf5a0cca Added UserIpMap interface for allowed IP addresses and IP restriction access
Marcin Kuzminski <marcin@python-works.com>
parents: 3021
diff changeset
250 ${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
251 </div>
991
b232a36cc51f Improve LDAP authentication
Thayne Harbaugh <thayne@fusionio.com>
parents: 895
diff changeset
252 </%def>