##// END OF EJS Templates
fixes for #66 renamed name to First Name
marcink -
r697:540545d3 beta
parent child Browse files
Show More
@@ -1,110 +1,110 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="/base/base.html"/>
3 3
4 4 <%def name="title()">
5 5 ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name}
6 6 </%def>
7 7
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 11 ${h.link_to(_('Users'),h.url('users'))}
12 12 &raquo;
13 13 ${_('edit')} "${c.user.username}"
14 14 </%def>
15 15
16 16 <%def name="page_nav()">
17 17 ${self.menu('admin')}
18 18 </%def>
19 19
20 20 <%def name="main()">
21 21 <div class="box">
22 22 <!-- box / title -->
23 23 <div class="title">
24 24 ${self.breadcrumbs()}
25 25 </div>
26 26 <!-- end box / title -->
27 27 ${h.form(url('user', id=c.user.user_id),method='put')}
28 28 <div class="form">
29 29 <!-- fields -->
30 30 <div class="fields">
31 31 <div class="field">
32 32 <div class="gravatar_box">
33 33 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
34 34 <p>
35 35 <strong>Change your avatar at <a href="http://gravatar.com">gravatar.com</a></strong><br/>
36 36 ${_('Using')} ${c.user.email}
37 37 </p>
38 38 </div>
39 39 </div>
40 40
41 41 <div class="field">
42 42 <div class="label">
43 43 <label for="username">${_('Username')}:</label>
44 44 </div>
45 45 <div class="input">
46 46 ${h.text('username',class_='small')}
47 47 </div>
48 48 </div>
49 49
50 50 <div class="field">
51 51 <div class="label">
52 52 <label for="new_password">${_('New password')}:</label>
53 53 </div>
54 54 <div class="input">
55 55 ${h.password('new_password',class_='small')}
56 56 </div>
57 57 </div>
58 58
59 59 <div class="field">
60 60 <div class="label">
61 <label for="name">${_('Name')}:</label>
61 <label for="name">${_('First Name')}:</label>
62 62 </div>
63 63 <div class="input">
64 64 ${h.text('name',class_='small')}
65 65 </div>
66 66 </div>
67 67
68 68 <div class="field">
69 69 <div class="label">
70 <label for="lastname">${_('Lastname')}:</label>
70 <label for="lastname">${_('Last Name')}:</label>
71 71 </div>
72 72 <div class="input">
73 73 ${h.text('lastname',class_='small')}
74 74 </div>
75 75 </div>
76 76
77 77 <div class="field">
78 78 <div class="label">
79 79 <label for="email">${_('Email')}:</label>
80 80 </div>
81 81 <div class="input">
82 82 ${h.text('email',class_='small')}
83 83 </div>
84 84 </div>
85 85
86 86 <div class="field">
87 87 <div class="label label-checkbox">
88 88 <label for="active">${_('Active')}:</label>
89 89 </div>
90 90 <div class="checkboxes">
91 91 ${h.checkbox('active',value=True)}
92 92 </div>
93 93 </div>
94 94
95 95 <div class="field">
96 96 <div class="label label-checkbox">
97 97 <label for="admin">${_('Admin')}:</label>
98 98 </div>
99 99 <div class="checkboxes">
100 100 ${h.checkbox('admin',value=True)}
101 101 </div>
102 102 </div>
103 103 <div class="buttons">
104 104 ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
105 105 </div>
106 106 </div>
107 107 </div>
108 108 ${h.end_form()}
109 109 </div>
110 110 </%def> No newline at end of file
@@ -1,188 +1,188 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <%inherit file="/base/base.html"/>
3 3
4 4 <%def name="title()">
5 5 ${_('My account')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
6 6 </%def>
7 7
8 8 <%def name="breadcrumbs_links()">
9 9 ${_('My Account')}
10 10 </%def>
11 11
12 12 <%def name="page_nav()">
13 13 ${self.menu('admin')}
14 14 </%def>
15 15
16 16 <%def name="main()">
17 17
18 18 <div class="box box-left">
19 19 <!-- box / title -->
20 20 <div class="title">
21 21 ${self.breadcrumbs()}
22 22 </div>
23 23 <!-- end box / title -->
24 24 <div class="ui-tabs-panel ui-widget-content ui-corner-bottom">
25 25 ${h.form(url('admin_settings_my_account_update'),method='put')}
26 26 <div class="form">
27 27 <div class="fields">
28 28 <div class="field">
29 29 <div class="label">
30 30 <label for="username">${_('Username')}:</label>
31 31 </div>
32 32 <div class="input">
33 33 ${h.text('username')}
34 34 </div>
35 35 </div>
36 36
37 37 <div class="field">
38 38 <div class="label">
39 39 <label for="new_password">${_('New password')}:</label>
40 40 </div>
41 41 <div class="input">
42 42 ${h.password('new_password')}
43 43 </div>
44 44 </div>
45 45
46 46 <div class="field">
47 47 <div class="label">
48 <label for="name">${_('Name')}:</label>
48 <label for="name">${_('First Name')}:</label>
49 49 </div>
50 50 <div class="input">
51 51 ${h.text('name')}
52 52 </div>
53 53 </div>
54 54
55 55 <div class="field">
56 56 <div class="label">
57 <label for="lastname">${_('Lastname')}:</label>
57 <label for="lastname">${_('Last Name')}:</label>
58 58 </div>
59 59 <div class="input">
60 60 ${h.text('lastname')}
61 61 </div>
62 62 </div>
63 63
64 64 <div class="field">
65 65 <div class="label">
66 66 <label for="email">${_('Email')}:</label>
67 67 </div>
68 68 <div class="input">
69 69 ${h.text('email')}
70 70 </div>
71 71 </div>
72 72
73 73 <div class="buttons">
74 74 ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
75 75 </div>
76 76 </div>
77 77 </div>
78 78 ${h.end_form()}
79 79 </div>
80 80 </div>
81 81
82 82 <div class="box box-right">
83 83 <!-- box / title -->
84 84 <div class="title">
85 85 <h5>${_('My repositories')}
86 86 <input class="top-right-rounded-corner top-left-rounded-corner bottom-left-rounded-corner bottom-right-rounded-corner" id="q_filter" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
87 87 </h5>
88 88 </div>
89 89 <!-- end box / title -->
90 90 <div class="table">
91 91 <table>
92 92 <thead>
93 93 <tr>
94 94 <th class="left">${_('Name')}</th>
95 95 <th class="left">${_('revision')}</th>
96 96 <th colspan="2" class="left">${_('action')}</th>
97 97 </thead>
98 98 <tbody>
99 99 %if c.user_repos:
100 100 %for repo in c.user_repos:
101 101 <tr>
102 102 <td>
103 103 %if repo['repo'].dbrepo.repo_type =='hg':
104 104 <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
105 105 %elif repo['repo'].dbrepo.repo_type =='git':
106 106 <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
107 107 %else:
108 108
109 109 %endif
110 110 %if repo['repo'].dbrepo.private:
111 111 <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
112 112 %else:
113 113 <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
114 114 %endif
115 115
116 116 ${h.link_to(repo['repo'].name, h.url('summary_home',repo_name=repo['repo'].name),class_="repo_name")}
117 117 %if repo['repo'].dbrepo.fork:
118 118 <a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
119 119 <img class="icon" alt="${_('public')}"
120 120 title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}"
121 121 src="/images/icons/arrow_divide.png"/></a>
122 122 %endif
123 123 </td>
124 124 <td><span class="tooltip" tooltip_title="${repo['repo'].last_change}">${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))}</span></td>
125 125 <td><a href="${h.url('repo_settings_home',repo_name=repo['repo'].name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/></a></td>
126 126 <td>
127 127 ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')}
128 128 ${h.submit('remove_%s' % repo['repo'].name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
129 129 ${h.end_form()}
130 130 </td>
131 131 </tr>
132 132 %endfor
133 133 %else:
134 134 ${_('No repositories yet')}
135 135 %if h.HasPermissionAny('hg.admin','hg.create.repository')():
136 136 ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'))}
137 137 %endif
138 138 %endif
139 139 </tbody>
140 140 </table>
141 141 </div>
142 142
143 143 </div>
144 144 <script type="text/javascript">
145 145 var D = YAHOO.util.Dom;
146 146 var E = YAHOO.util.Event;
147 147 var S = YAHOO.util.Selector;
148 148
149 149 var q_filter = D.get('q_filter');
150 150 var F = YAHOO.namespace('q_filter');
151 151
152 152 E.on(q_filter,'click',function(){
153 153 q_filter.value = '';
154 154 });
155 155
156 156 F.filterTimeout = null;
157 157
158 158 F.updateFilter = function() {
159 159 // Reset timeout
160 160 F.filterTimeout = null;
161 161
162 162 var obsolete = [];
163 163 var nodes = S.query('div.table tr td a.repo_name');
164 164 var req = D.get('q_filter').value;
165 165 for (n in nodes){
166 166 D.setStyle(nodes[n].parentNode.parentNode,'display','')
167 167 }
168 168 if (req){
169 169 for (n in nodes){
170 170 if (nodes[n].innerHTML.toLowerCase().indexOf(req) == -1) {
171 171 obsolete.push(nodes[n]);
172 172 }
173 173 }
174 174 if(obsolete){
175 175 for (n in obsolete){
176 176 D.setStyle(obsolete[n].parentNode.parentNode,'display','none');
177 177 }
178 178 }
179 179 }
180 180 }
181 181
182 182 E.on(q_filter,'keyup',function(e){
183 183 clearTimeout(F.filterTimeout);
184 184 setTimeout(F.updateFilter,600);
185 185 });
186 186
187 187 </script>
188 188 </%def> No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now