##// END OF EJS Templates
html: random indentation fixes
Mads Kiilerich -
r3198:c20adbaf beta
parent child Browse files
Show More
@@ -4,15 +4,15 b''
4 4 <h3>Support RhodeCode development.</h3>
5 5 <div style="text-align:center">
6 6 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
7 <input type="hidden" name="cmd" value="_s-xclick">
8 <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
9 <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
10 border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
11 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
7 <input type="hidden" name="cmd" value="_s-xclick">
8 <input type="hidden" name="hosted_button_id" value="8U2LLRPLBKWDU">
9 <input style="border:0px !important" type="image" src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif"
10 border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
11 <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
12 12 </form>
13 13 <div style="padding:5px">
14 14 <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
15 15 <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
16 </div>
16 </div>
17 17 </div>
18 18 {% endblock %}}
@@ -19,16 +19,16 b''
19 19 %endif
20 20 </td>
21 21 <td>${h.action_parser(l)[0]()}
22 <div class="journal_action_params">
23 ${h.literal(h.action_parser(l)[1]())}
24 </div>
22 <div class="journal_action_params">
23 ${h.literal(h.action_parser(l)[1]())}
24 </div>
25 25 </td>
26 26 <td>
27 %if l.repository is not None:
28 ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
29 %else:
30 ${l.repository_name}
31 %endif
27 %if l.repository is not None:
28 ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))}
29 %else:
30 ${l.repository_name}
31 %endif
32 32 </td>
33 33
34 34 <td>${h.fmt_date(l.action_date)}</td>
@@ -25,7 +25,7 b''
25 25 <div class="form">
26 26 <div class="fields">
27 27
28 <h3>${_('Connection settings')}</h3>
28 <h3>${_('Connection settings')}</h3>
29 29 <div class="field">
30 30 <div class="label label-checkbox"><label for="ldap_active">${_('Enable LDAP')}</label></div>
31 31 <div class="checkboxes"><div class="checkbox">${h.checkbox('ldap_active',True,class_='small')}</div></div>
@@ -54,7 +54,7 b''
54 54 <div class="label"><label for="ldap_tls_reqcert">${_('Certificate Checks')}</label></div>
55 55 <div class="select">${h.select('ldap_tls_reqcert',c.tls_reqcert_cur,c.tls_reqcert_choices,class_='small')}</div>
56 56 </div>
57 <h3>${_('Search settings')}</h3>
57 <h3>${_('Search settings')}</h3>
58 58 <div class="field">
59 59 <div class="label"><label for="ldap_base_dn">${_('Base DN')}</label></div>
60 60 <div class="input">${h.text('ldap_base_dn',class_='small')}</div>
@@ -67,7 +67,7 b''
67 67 <div class="label"><label for="ldap_search_scope">${_('LDAP Search Scope')}</label></div>
68 68 <div class="select">${h.select('ldap_search_scope',c.search_scope_cur,c.search_scope_choices,class_='small')}</div>
69 69 </div>
70 <h3>${_('Attribute mappings')}</h3>
70 <h3>${_('Attribute mappings')}</h3>
71 71 <div class="field">
72 72 <div class="label"><label for="ldap_attr_login">${_('Login Attribute')}</label></div>
73 73 <div class="input">${h.text('ldap_attr_login',class_='small')}</div>
@@ -32,14 +32,14 b''
32 32 <div class="form">
33 33 <!-- fields -->
34 34 <div class="fields">
35 <div class="field">
35 <div class="field">
36 36 <div class="label">
37 37 <label for="group_name">${_('Group name')}:</label>
38 38 </div>
39 39 <div class="input">
40 40 ${h.text('group_name',class_='medium')}
41 41 </div>
42 </div>
42 </div>
43 43
44 44 <div class="field">
45 45 <div class="label label-textarea">
@@ -48,16 +48,16 b''
48 48 <div class="textarea text-area editor">
49 49 ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
50 50 </div>
51 </div>
51 </div>
52 52
53 <div class="field">
54 <div class="label">
55 <label for="group_parent_id">${_('Group parent')}:</label>
56 </div>
57 <div class="input">
58 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
59 </div>
60 </div>
53 <div class="field">
54 <div class="label">
55 <label for="group_parent_id">${_('Group parent')}:</label>
56 </div>
57 <div class="input">
58 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
59 </div>
60 </div>
61 61 <div class="field">
62 62 <div class="label">
63 63 <label for="input">${_('Permissions')}:</label>
@@ -25,14 +25,14 b''
25 25 <div class="form">
26 26 <div class="fields">
27 27 % for hook in c.hooks:
28 <div class="field">
29 <div class="label label">
30 <label for="${hook.ui_key}">${hook.ui_key}</label>
28 <div class="field">
29 <div class="label label">
30 <label for="${hook.ui_key}">${hook.ui_key}</label>
31 </div>
32 <div class="input" style="margin-left:280px">
33 ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
34 </div>
31 35 </div>
32 <div class="input" style="margin-left:280px">
33 ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
34 </div>
35 </div>
36 36 % endfor
37 37 </div>
38 38 </div>
@@ -196,12 +196,12 b''
196 196 <label>${_('Web')}:</label>
197 197 </div>
198 198 <div class="checkboxes">
199 <div class="checkbox">
200 ${h.checkbox('web_push_ssl', 'True')}
201 <label for="web_push_ssl">${_('require ssl for vcs operations')}</label>
202 </div>
199 <div class="checkbox">
200 ${h.checkbox('web_push_ssl', 'True')}
201 <label for="web_push_ssl">${_('require ssl for vcs operations')}</label>
202 </div>
203 203 <span class="help-block">${_('RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable')}</span>
204 </div>
204 </div>
205 205 </div>
206 206
207 207 <div class="field">
@@ -209,14 +209,14 b''
209 209 <label>${_('Hooks')}:</label>
210 210 </div>
211 211 <div class="checkboxes">
212 <div class="checkbox">
213 ${h.checkbox('hooks_changegroup_update','True')}
214 <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
215 </div>
216 <div class="checkbox">
217 ${h.checkbox('hooks_changegroup_repo_size','True')}
218 <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
219 </div>
212 <div class="checkbox">
213 ${h.checkbox('hooks_changegroup_update','True')}
214 <label for="hooks_changegroup_update">${_('Update repository after push (hg update)')}</label>
215 </div>
216 <div class="checkbox">
217 ${h.checkbox('hooks_changegroup_repo_size','True')}
218 <label for="hooks_changegroup_repo_size">${_('Show repository size after push')}</label>
219 </div>
220 220 <div class="checkbox">
221 221 ${h.checkbox('hooks_changegroup_push_logger','True')}
222 222 <label for="hooks_changegroup_push_logger">${_('Log user push commands')}</label>
@@ -225,7 +225,7 b''
225 225 ${h.checkbox('hooks_outgoing_pull_logger','True')}
226 226 <label for="hooks_outgoing_pull_logger">${_('Log user pull commands')}</label>
227 227 </div>
228 </div>
228 </div>
229 229 <div class="input" style="margin-top:10px">
230 230 ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")}
231 231 </div>
@@ -257,9 +257,9 b''
257 257 </div>
258 258 <div class="input">
259 259 ${h.text('paths_root_path',size=30,readonly="readonly")}
260 <span id="path_unlock" class="tooltip"
261 title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
262 ${_('unlock')}</span>
260 <span id="path_unlock" class="tooltip"
261 title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
262 ${_('unlock')}</span>
263 263 <span class="help-block">${_('Location where repositories are stored. After changing this value a restart, and rescan is required')}</span>
264 264 </div>
265 265 </div>
@@ -329,8 +329,8 b''
329 329
330 330 <script type="text/javascript">
331 331 YUE.on('expand_modules','click',function(e){
332 YUD.setStyle('expand_modules_table','display','');
333 YUD.setStyle('expand_modules','display','none');
332 YUD.setStyle('expand_modules_table','display','');
333 YUD.setStyle('expand_modules','display','none');
334 334 })
335 335 </script>
336 336
@@ -173,37 +173,37 b' if (url[1]) {'
173 173 }
174 174
175 175 function table_renderer(data){
176 var myDataSource = new YAHOO.util.DataSource(data);
177 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
176 var myDataSource = new YAHOO.util.DataSource(data);
177 myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON;
178 178
179 myDataSource.responseSchema = {
180 resultsList: "records",
181 fields: [
182 {key:"menu"},
183 {key:"raw_name"},
184 {key:"name"},
185 {key:"last_changeset"},
186 {key:"action"},
187 ]
188 };
189 myDataSource.doBeforeCallback = function(req,raw,res,cb) {
190 // This is the filter function
191 var data = res.results || [],
192 filtered = [],
193 i,l;
179 myDataSource.responseSchema = {
180 resultsList: "records",
181 fields: [
182 {key:"menu"},
183 {key:"raw_name"},
184 {key:"name"},
185 {key:"last_changeset"},
186 {key:"action"},
187 ]
188 };
189 myDataSource.doBeforeCallback = function(req,raw,res,cb) {
190 // This is the filter function
191 var data = res.results || [],
192 filtered = [],
193 i,l;
194 194
195 if (req) {
196 req = req.toLowerCase();
197 for (i = 0; i<data.length; i++) {
198 var pos = data[i].raw_name.toLowerCase().indexOf(req)
199 if (pos != -1) {
200 filtered.push(data[i]);
201 }
202 }
203 res.results = filtered;
204 }
205 return res;
206 }
195 if (req) {
196 req = req.toLowerCase();
197 for (i = 0; i<data.length; i++) {
198 var pos = data[i].raw_name.toLowerCase().indexOf(req)
199 if (pos != -1) {
200 filtered.push(data[i]);
201 }
202 }
203 res.results = filtered;
204 }
205 return res;
206 }
207 207
208 208 // main table sorting
209 209 var myColumnDefs = [
@@ -137,7 +137,7 b''
137 137 return h.literal('class="current"')
138 138 %>
139 139 %if current not in ['home','admin']:
140 ##REGULAR MENU
140 ##REGULAR MENU
141 141 <ul id="quick">
142 142 <!-- repo switcher -->
143 143 <li>
@@ -207,14 +207,14 b''
207 207 %endif
208 208 %endif
209 209
210 <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
210 <li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
211 211 %if h.is_hg(c.rhodecode_repo):
212 212 <li>${h.link_to(_('open new pull request'),h.url('pullrequest_home',repo_name=c.repo_name),class_='pull_request')}</li>
213 213 %endif
214 214 %if c.rhodecode_db_repo.fork:
215 215 <li>${h.link_to(_('compare fork'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name),class_='compare_request')}</li>
216 216 %endif
217 <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
217 <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
218 218
219 219 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
220 220 %if c.rhodecode_db_repo.locked[0]:
@@ -21,17 +21,17 b''
21 21
22 22 %if c.ga_code:
23 23 <!-- Analytics -->
24 <script type="text/javascript">
25 var _gaq = _gaq || [];
26 _gaq.push(['_setAccount', '${c.ga_code}']);
27 _gaq.push(['_trackPageview']);
24 <script type="text/javascript">
25 var _gaq = _gaq || [];
26 _gaq.push(['_setAccount', '${c.ga_code}']);
27 _gaq.push(['_trackPageview']);
28 28
29 (function() {
30 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
31 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
32 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
33 })();
34 </script>
29 (function() {
30 var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
31 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
32 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
33 })();
34 </script>
35 35 %endif
36 36
37 37 ## JAVASCRIPT ##
@@ -1,15 +1,15 b''
1 1 %if c.repo_bookmarks:
2 2 <div id="table_wrap" class="yui-skin-sam">
3 3 <table id="bookmarks_data">
4 <thead>
4 <thead>
5 5 <tr>
6 6 <th class="left">${_('Name')}</th>
7 7 <th class="left">${_('Date')}</th>
8 8 <th class="left">${_('Author')}</th>
9 9 <th class="left">${_('Revision')}</th>
10 10 </tr>
11 </thead>
12 %for cnt,book in enumerate(c.repo_bookmarks.items()):
11 </thead>
12 %for cnt,book in enumerate(c.repo_bookmarks.items()):
13 13 <tr class="parity${cnt%2}">
14 14 <td>
15 15 <span class="logbooks">
@@ -25,7 +25,7 b''
25 25 </div>
26 26 </td>
27 27 </tr>
28 %endfor
28 %endfor
29 29 </table>
30 30 </div>
31 31 %else:
@@ -20,7 +20,7 b''
20 20 </%def>
21 21
22 22 <%def name="page_nav()">
23 ${self.menu('files')}
23 ${self.menu('files')}
24 24 </%def>
25 25 <%def name="main()">
26 26 <div class="box">
@@ -42,30 +42,30 b''
42 42
43 43 <div class="browser-body">
44 44 <table class="code-browser">
45 <thead>
46 <tr>
47 <th>${_('Name')}</th>
48 <th>${_('Size')}</th>
49 <th>${_('Mimetype')}</th>
50 <th>${_('Last Revision')}</th>
51 <th>${_('Last modified')}</th>
52 <th>${_('Last commiter')}</th>
53 </tr>
54 </thead>
45 <thead>
46 <tr>
47 <th>${_('Name')}</th>
48 <th>${_('Size')}</th>
49 <th>${_('Mimetype')}</th>
50 <th>${_('Last Revision')}</th>
51 <th>${_('Last modified')}</th>
52 <th>${_('Last commiter')}</th>
53 </tr>
54 </thead>
55 55
56 <tbody id="tbody">
57 %if c.file.parent:
58 <tr class="parity0">
59 <td>
60 ${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
61 </td>
62 <td></td>
63 <td></td>
64 <td></td>
65 <td></td>
66 <td></td>
56 <tbody id="tbody">
57 %if c.file.parent:
58 <tr class="parity0">
59 <td>
60 ${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
61 </td>
62 <td></td>
63 <td></td>
64 <td></td>
65 <td></td>
66 <td></td>
67 67 </tr>
68 %endif
68 %endif
69 69
70 70 %for cnt,node in enumerate(c.file):
71 71 <tr class="parity${cnt%2}">
@@ -108,9 +108,9 b''
108 108 </td>
109 109 </tr>
110 110 %endfor
111 </tbody>
112 <tbody id="tbody_filtered" style="display:none">
113 </tbody>
111 </tbody>
112 <tbody id="tbody_filtered" style="display:none">
113 </tbody>
114 114 </table>
115 115 </div>
116 116 </div>
@@ -20,7 +20,7 b''
20 20 </%def>
21 21
22 22 <%def name="page_nav()">
23 ${self.menu('files')}
23 ${self.menu('files')}
24 24 </%def>
25 25 <%def name="main()">
26 26 <div class="box">
@@ -89,9 +89,9 b''
89 89 ${h.checkbox('update_after_clone',value="True")}
90 90 <span class="help-block">${_('Checkout source after making a clone')}</span>
91 91 </div>
92 </div>
92 </div>
93 93 <div class="buttons">
94 ${h.submit('',_('fork this repository'),class_="ui-btn large")}
94 ${h.submit('',_('fork this repository'),class_="ui-btn large")}
95 95 </div>
96 96 </div>
97 97 </div>
@@ -10,16 +10,16 b''
10 10 <span style="font-size: 20px">
11 11 <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname}) /
12 12 ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
13 </span>
14 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
13 </span>
14 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
15 15 </div>
16 16 <div style="clear:both;padding-top: 10px"></div>
17 17 <div class="follower_date">${_('forked')} -
18 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
19 <a title="${_('compare fork with %s' % c.repo_name)}"
20 href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}"
21 class="ui-btn small">${_('Compare fork')}</a>
22 </div>
18 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
19 <a title="${_('compare fork with %s' % c.repo_name)}"
20 href="${h.url('compare_url',repo_name=f.repo_name,org_ref_type='branch',org_ref='default',other_ref_type='branch',other_ref='default', repo=c.repo_name)}"
21 class="ui-btn small">${_('Compare fork')}</a>
22 </div>
23 23 <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
24 24 </div>
25 25 % endfor
@@ -15,59 +15,59 b''
15 15 <div class="form">
16 16 <!-- fields -->
17 17 <div class="fields">
18 <div class="field">
18 <div class="field">
19 19 <div class="label">
20 20 <label for="username">${_('Username')}:</label>
21 21 </div>
22 22 <div class="input">
23 23 ${h.text('username',class_="medium")}
24 24 </div>
25 </div>
25 </div>
26 26
27 <div class="field">
27 <div class="field">
28 28 <div class="label">
29 29 <label for="password">${_('Password')}:</label>
30 30 </div>
31 31 <div class="input">
32 32 ${h.password('password',class_="medium")}
33 33 </div>
34 </div>
34 </div>
35 35
36 <div class="field">
37 <div class="label">
38 <label for="password">${_('Re-enter password')}:</label>
39 </div>
40 <div class="input">
41 ${h.password('password_confirmation',class_="medium")}
42 </div>
43 </div>
36 <div class="field">
37 <div class="label">
38 <label for="password">${_('Re-enter password')}:</label>
39 </div>
40 <div class="input">
41 ${h.password('password_confirmation',class_="medium")}
42 </div>
43 </div>
44 44
45 <div class="field">
45 <div class="field">
46 46 <div class="label">
47 47 <label for="firstname">${_('First Name')}:</label>
48 48 </div>
49 49 <div class="input">
50 50 ${h.text('firstname',class_="medium")}
51 51 </div>
52 </div>
52 </div>
53 53
54 <div class="field">
54 <div class="field">
55 55 <div class="label">
56 56 <label for="lastname">${_('Last Name')}:</label>
57 57 </div>
58 58 <div class="input">
59 59 ${h.text('lastname',class_="medium")}
60 60 </div>
61 </div>
61 </div>
62 62
63 <div class="field">
63 <div class="field">
64 64 <div class="label">
65 65 <label for="email">${_('Email')}:</label>
66 66 </div>
67 67 <div class="input">
68 68 ${h.text('email',class_="medium")}
69 69 </div>
70 </div>
70 </div>
71 71
72 72 <div class="buttons">
73 73 <div class="nohighlight">
General Comments 0
You need to be logged in to leave comments. Login now