Skip to content

Commit e12bd8c

Browse files
bernhardreiterbernhardreiter
committed
Templates: (minor) removes leading tabs.
 * Removes tabs in classic and minimal templates that have been introduced with the csrf improvements of 5204:c8bf4e9912ed and 5205:9cd95b1ead8e and probably some more in the same files. So the indentation is more consistent and no leading tabs are used. No entry in CHANGES.txt because the cleanup change is unsignificant whitespace only and does no require an update of the templates when upgrading roundup.
1 parent 714b4e8 commit e12bd8c

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

‎share/roundup/templates/classic/html/issue.item.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
tal:attributes="action string:issue${context/id}">
156156
<input type="hidden" name="@remove@files" tal:attributes="value file/id">
157157
<input name="@csrf" type="hidden"
158-
tal:attributes="value python:utils.anti_csrf_nonce()">
158+
tal:attributes="value python:utils.anti_csrf_nonce()">
159159
<input type="hidden" name="@action" value="edit">
160160
<input type="submit" value="remove" i18n:attributes="value">
161161
</form>
@@ -178,7 +178,7 @@
178178
tal:attributes="action string:issue${context/id}">
179179
<input type="hidden" name="@remove@messages" tal:attributes="value msg/id">
180180
<input name="@csrf" type="hidden"
181-
tal:attributes="value python:utils.anti_csrf_nonce()">
181+
tal:attributes="value python:utils.anti_csrf_nonce()">
182182
<input type="hidden" name="@action" value="edit">
183183
<input type="submit" value="remove" i18n:attributes="value">
184184
</form>

‎share/roundup/templates/classic/html/page.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<div id="searchbox">
3232
<form method="GET" action="issue">
3333
<input type="hidden" name="@columns"
34-
tal:attributes="value columns_showall"
35-
value="id,activity,title,creator,assignedto,status"/>
34+
tal:attributes="value columns_showall"
35+
value="id,activity,title,creator,assignedto,status"/>
3636
<input type="hidden" name="@sort" value="activity"/>
3737
<input type="hidden" name="@group" value="priority"/>
3838
<input id="search-text" name="@search_text" size="10"
@@ -95,7 +95,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
9595
type="text" name="@number">
9696
<input type="hidden" name="@type" value="issue">
9797
<input name="@csrf" type="hidden"
98-
tal:attributes="value python:utils.anti_csrf_nonce()">
98+
tal:attributes="value python:utils.anti_csrf_nonce()">
9999
<input type="hidden" name="@action" value="show">
100100
</p>
101101
</form>
@@ -135,14 +135,14 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
135135
<input type="checkbox" name="remember" id="remember">
136136
<label for="remember" i18n:translate="">Remember me?</label><br>
137137
<input name="@csrf" type="hidden"
138-
tal:attributes="value python:utils.anti_csrf_nonce()">
138+
tal:attributes="value python:utils.anti_csrf_nonce()">
139139
<input type="submit" value="Login" i18n:attributes="value"><br>
140140
<input type="hidden" name="__came_from"
141-
tal:condition="exists:request/env/QUERY_STRING"
142-
tal:attributes="value string:${request/base}${request/env/PATH_INFO}?${request/env/QUERY_STRING}">
141+
tal:condition="exists:request/env/QUERY_STRING"
142+
tal:attributes="value string:${request/base}${request/env/PATH_INFO}?${request/env/QUERY_STRING}">
143143
<input type="hidden" name="__came_from"
144-
tal:condition="not:exists:request/env/QUERY_STRING"
145-
tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
144+
tal:condition="not:exists:request/env/QUERY_STRING"
145+
tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
146146
<span tal:replace="structure request/indexargs_form" />
147147
<a href="user?@template=register"
148148
tal:condition="python:request.user.hasPermission('Register', 'user')"
@@ -216,7 +216,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
216216
tal:define="required required | python:[]"
217217
tal:attributes="class python:(name in required) and 'required' or nothing">
218218
<label tal:attributes="for name" tal:content="label" i18n:translate="">text</label>
219-
<metal:x define-slot="behind_the_label" />
219+
<metal:x define-slot="behind_the_label" />
220220
</th>
221221

222222
<td metal:define-macro="search_input">
@@ -230,7 +230,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
230230
name name;
231231
id name">
232232
<a class="classhelp"
233-
tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
233+
tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
234234
</td>
235235

236236
<td metal:define-macro="search_popup">
@@ -269,7 +269,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
269269
tal:content="python:s[db_content]"></option>
270270
</select>
271271
<a class="classhelp"
272-
tal:attributes="href python:'''javascript:help_window('issue?@template=keywords_expr&property=%s&form=itemSynopsis', 350, 200)'''%name">(expr)</a>
272+
tal:attributes="href python:'''javascript:help_window('issue?@template=keywords_expr&property=%s&form=itemSynopsis', 350, 200)'''%name">(expr)</a>
273273
</div>
274274
</td>
275275

@@ -284,14 +284,14 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
284284
<option value="" i18n:translate="" disabled="disabled">------------</option>
285285
<option tal:repeat="s python:db[db_klass].list()"
286286
tal:attributes="value s/id; selected python:value == s.id"
287-
tal:content="python:s[db_content]"
288-
i18n:translate=""></option>
287+
tal:content="python:s[db_content]"
288+
i18n:translate=""></option>
289289
</select>
290290
</td>
291291

292292
<!-- currently, there is no convenient API to get a list of all roles -->
293293
<td metal:define-macro="search_select_roles"
294-
tal:define="onchange onchange | nothing">
294+
tal:define="onchange onchange | nothing">
295295
<select name=roles id=roles tal:attributes="onchange onchange">
296296
<option value="" i18n:translate="">don't care</option>
297297
<option value="" i18n:translate="" disabled="disabled">------------</option>

‎share/roundup/templates/classic/html/user.forgotten.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<tr>
2020
<td>&nbsp;</td>
2121
<td>
22-
<input name="@csrf" type="hidden"
23-
tal:attributes="value python:utils.anti_csrf_nonce()">
22+
<input name="@csrf" type="hidden"
23+
tal:attributes="value python:utils.anti_csrf_nonce()">
2424
<input type="hidden" name="@action" value="passrst">
2525
<input type="hidden" name="@template" value="forgotten">
2626
<input type="submit" value="Request password reset"

‎share/roundup/templates/classic/html/user.index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
tal:attributes="action string:user${user/id}">
3939
<input type="hidden" name="@template" value="index">
4040
<input name="@csrf" type="hidden"
41-
tal:attributes="value python:utils.anti_csrf_nonce()">
41+
tal:attributes="value python:utils.anti_csrf_nonce()">
4242
<input type="hidden" name="@action" value="retire">
4343
<input type="submit" value="retire" i18n:attributes="value">
4444
</form>

‎share/roundup/templates/classic/html/user.register.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
<td>
6060
<input type="hidden" name="@template" value="register">
6161
<input type="hidden" name="@required"
62-
value="username,password,address">
62+
value="username,password,address">
6363
<input name="@csrf" type="hidden"
64-
tal:attributes="value python:utils.anti_csrf_nonce()">
64+
tal:attributes="value python:utils.anti_csrf_nonce()">
6565
<input type="hidden" name="@action" value="register">
6666
<input type="submit" name="submit" value="Register" i18n:attributes="value">
6767
</td>

‎share/roundup/templates/minimal/html/_generic.index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<textarea rows="15" style="width:90%" name="rows" tal:content="context/csv"></textarea>
4949
<br>
5050
<input name="@csrf" type="hidden"
51-
tal:attributes="value python:utils.anti_csrf_nonce()">
51+
tal:attributes="value python:utils.anti_csrf_nonce()">
5252
<input type="hidden" name="@action" value="editCSV">
5353
<input type="submit" value="Edit Items" i18n:attributes="value">
5454
</form>

‎share/roundup/templates/minimal/html/page.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<div id="searchbox">
3232
<form method="GET" action="issue">
3333
<input type="hidden" name="@columns"
34-
tal:attributes="value columns_showall"
35-
value="id,activity,title,creator,assignedto,status"/>
34+
tal:attributes="value columns_showall"
35+
value="id,activity,title,creator,assignedto,status"/>
3636
<input type="hidden" name="@sort" value="activity"/>
3737
<input type="hidden" name="@group" value="priority"/>
3838
<input id="search-text" name="@search_text" size="10"
@@ -95,7 +95,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
9595
type="text" name="@number">
9696
<input type="hidden" name="@type" value="issue">
9797
<input name="@csrf" type="hidden"
98-
tal:attributes="value python:utils.anti_csrf_nonce()">
98+
tal:attributes="value python:utils.anti_csrf_nonce()">
9999
<input type="hidden" name="@action" value="show">
100100
</p>
101101
</form>
@@ -132,17 +132,17 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
132132
<input size="10" name="__login_name"><br>
133133
<input size="10" type="password" name="__login_password"><br>
134134
<input name="@csrf" type="hidden"
135-
tal:attributes="value python:utils.anti_csrf_nonce()">
135+
tal:attributes="value python:utils.anti_csrf_nonce()">
136136
<input type="hidden" name="@action" value="Login">
137137
<input type="checkbox" name="remember" id="remember">
138138
<label for="remember" i18n:translate="">Remember me?</label><br>
139139
<input type="submit" value="Login" i18n:attributes="value"><br>
140140
<input type="hidden" name="__came_from"
141-
tal:condition="exists:request/env/QUERY_STRING"
142-
tal:attributes="value string:${request/base}${request/env/PATH_INFO}?${request/env/QUERY_STRING}">
141+
tal:condition="exists:request/env/QUERY_STRING"
142+
tal:attributes="value string:${request/base}${request/env/PATH_INFO}?${request/env/QUERY_STRING}">
143143
<input type="hidden" name="__came_from"
144-
tal:condition="not:exists:request/env/QUERY_STRING"
145-
tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
144+
tal:condition="not:exists:request/env/QUERY_STRING"
145+
tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
146146
<span tal:replace="structure request/indexargs_form" />
147147
<a href="user?@template=register"
148148
tal:condition="python:request.user.hasPermission('Register', 'user')"
@@ -204,7 +204,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
204204
tal:define="required required | python:[]"
205205
tal:attributes="class python:(name in required) and 'required' or nothing">
206206
<label tal:attributes="for name" tal:content="label" i18n:translate="">text</label>
207-
<metal:x define-slot="behind_the_label" />
207+
<metal:x define-slot="behind_the_label" />
208208
</th>
209209

210210
<td metal:define-macro="search_input">
@@ -218,7 +218,7 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
218218
name name;
219219
id name">
220220
<a class="classhelp"
221-
tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
221+
tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
222222
</td>
223223

224224
<td metal:define-macro="search_popup">
@@ -256,14 +256,14 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
256256
<option value="" i18n:translate="" disabled="disabled">------------</option>
257257
<option tal:repeat="s python:db[db_klass].list()"
258258
tal:attributes="value s/id; selected python:value == s.id"
259-
tal:content="python:s[db_content]"
260-
i18n:translate=""></option>
259+
tal:content="python:s[db_content]"
260+
i18n:translate=""></option>
261261
</select>
262262
</td>
263263

264264
<!-- currently, there is no convenient API to get a list of all roles -->
265265
<td metal:define-macro="search_select_roles"
266-
tal:define="onchange onchange | nothing">
266+
tal:define="onchange onchange | nothing">
267267
<select name=roles id=roles tal:attributes="onchange onchange">
268268
<option value="" i18n:translate="">don't care</option>
269269
<option value="" i18n:translate="" disabled="disabled">------------</option>

‎share/roundup/templates/minimal/html/user.register.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<td>&nbsp;</td>
5959
<td>
6060
<input name="@csrf" type="hidden"
61-
tal:attributes="value python:utils.anti_csrf_nonce()">
61+
tal:attributes="value python:utils.anti_csrf_nonce()">
6262
<input type="hidden" name=":action" value="register">
6363
<input type="submit" name="submit" value="Register" i18n:attributes="value">
6464
</td>

0 commit comments

Comments
 (0)