Skip to content

Commit c85e58f

Browse files
caulagicaulagi
committed
- Use Jinja syntax for sort.html
- Remove references to i18n:translate - Enable JavaScript to allow alerts to be dismissed - Tidy markup; remove extraneous elements
1 parent f17d231 commit c85e58f

File tree

9 files changed

+265
-284
lines changed

9 files changed

+265
-284
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
{% if context.is_view_ok %}
1212
<p class="form-help">
1313
You may edit the contents of the
14-
<span tal:replace="request/classname" i18n:name="classname"/>
1514
class using this form. Commas, newlines and double quotes (") must be
1615
handled delicately. You may include commas and newlines by enclosing the
1716
values in double-quotes ("). Double quotes themselves must be quoted by

‎share/roundup/templates/jinja2/html/file.index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<h4>Files</h4>
22
<table class='table'>
33
<tr>
4-
<th i18n:translate="">File name</th>
5-
<th i18n:translate="">Uploaded</th>
6-
<th i18n:translate="">Type</th>
7-
<th i18n:translate="">Edit</th>
8-
<th i18n:translate="">Remove</th>
4+
<th>File name</th>
5+
<th>Uploaded</th>
6+
<th>Type</th>
7+
<th>Edit</th>
8+
<th>Remove</th>
99
</tr>
1010
{% for file in context.files %}
1111
<tr>

‎share/roundup/templates/jinja2/html/issue.item.edit.html‎

Lines changed: 73 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8,84 +8,83 @@
88
enctype="multipart/form-data"
99
>
1010
<fieldset>
11-
<div class='container-fluid'>
12-
<!-- title -->
13-
<div class='row-fluid'>
14-
<div class='control-group'>
15-
<label class='control-label' for='title'>Title</label>
16-
<div class='controls'>
17-
<input name='title' id='title' type='text' class='input-xxlarge' value='{{ context.title }}' required>
18-
</div>
19-
</div>
20-
</div> <!-- row-fluid -->
21-
22-
<!-- priority & Status -->
23-
<div class='row-fluid'>
24-
<div class='control-group span6'>
25-
<label class='control-label' for='priority'>Priority</label>
26-
<div class='controls'>
27-
{{ context.priority.menu() }}
28-
</div>
29-
</div>
30-
<div class='control-group span6'>
31-
<label class='control-label' for='status'>Status</label>
32-
<div class='controls'>
33-
{{ context.status.menu() }}
34-
</div>
35-
</div>
36-
</div> <!-- row-fluid -->
11+
<!-- title -->
12+
<div class='row-fluid'>
13+
<div class='control-group'>
14+
<label class='control-label' for='title'>Title</label>
15+
<div class='controls'>
16+
<input name='title' id='title' type='text' class='input-xxlarge' value='{{ context.title }}' required>
17+
</div>
18+
</div>
19+
</div> <!-- row-fluid -->
3720

38-
<!-- Superseder & nosy list -->
39-
<div class='row-fluid'>
40-
<div class='control-group span6'>
41-
<label class='control-label' for='superseder'>Superseder</label>
42-
<div class='controls'>
43-
<input type='text' name='superseder'>
44-
</div>
45-
</div>
46-
<div class='control-group span6'>
47-
<label class='control-label' for='nosylist'>Nosy list</label>
48-
<div class='controls'>
49-
<input type='text' name='nosy'>
50-
</div>
51-
</div>
52-
</div> <!-- row-fluid -->
21+
<!-- priority & Status -->
22+
<div class='row-fluid'>
23+
<div class='control-group span6'>
24+
<label class='control-label' for='priority'>Priority</label>
25+
<div class='controls'>
26+
{{ context.priority.menu() }}
27+
</div>
28+
</div>
29+
<div class='control-group span6'>
30+
<label class='control-label' for='status'>Status</label>
31+
<div class='controls'>
32+
{{ context.status.menu() }}
33+
</div>
34+
</div>
35+
</div> <!-- row-fluid -->
5336

54-
<!-- Assigned to & keywords -->
55-
<div class='row-fluid'>
56-
<div class='control-group span6'>
57-
<label class='control-label' for='assignedto'>Assigned to</label>
58-
<div class='controls'>
59-
{{ context.assignedto.menu() }}
60-
</div>
61-
</div>
62-
<div class='control-group span6'>
63-
<label class='control-label' for='keywords'>Keywords</label>
64-
<div class='controls'>
65-
<input type='text' name='keywords' id='keywords'>
66-
</div>
67-
</div>
68-
</div> <!-- row-fluid -->
37+
<!-- Superseder & nosy list -->
38+
<div class='row-fluid'>
39+
<div class='control-group span6'>
40+
<label class='control-label' for='superseder'>Superseder</label>
41+
<div class='controls'>
42+
<input type='text' name='superseder'>
43+
</div>
44+
</div>
45+
<div class='control-group span6'>
46+
<label class='control-label' for='nosylist'>Nosy list</label>
47+
<div class='controls'>
48+
<input type='text' name='nosy'>
49+
</div>
50+
</div>
51+
</div> <!-- row-fluid -->
6952

70-
<!-- Note -->
71-
<div class='row-fluid'>
72-
<div class='control-group'>
73-
<label class='control-label' for='change_note'>Change note</label>
74-
<div class='controls'>
75-
<textarea name="@note" rows="5" class='input-xxlarge' id='change_note'></textarea>
76-
</div>
77-
</div>
78-
</div> <!-- row-fluid -->
53+
<!-- Assigned to & keywords -->
54+
<div class='row-fluid'>
55+
<div class='control-group span6'>
56+
<label class='control-label' for='assignedto'>Assigned to</label>
57+
<div class='controls'>
58+
{{ context.assignedto.menu() }}
59+
</div>
60+
</div>
61+
<div class='control-group span6'>
62+
<label class='control-label' for='keywords'>Keywords</label>
63+
<div class='controls'>
64+
<input type='text' name='keywords' id='keywords'>
65+
</div>
66+
</div>
67+
</div> <!-- row-fluid -->
7968

80-
<!-- File upload -->
81-
<div class='row-fluid'>
82-
<div class='control-group'>
83-
<label class='control-label' for='file_upload'>File</label>
84-
<div class='controls'>
85-
<input type="file" name="@file" id='file_upload'>
86-
</div>
87-
</div>
88-
</div> <!-- row-fluid -->
69+
<!-- Note -->
70+
<div class='row-fluid'>
71+
<div class='control-group'>
72+
<label class='control-label' for='change_note'>Change note</label>
73+
<div class='controls'>
74+
<textarea name="@note" rows="5" class='input-xxlarge' id='change_note'></textarea>
75+
</div>
76+
</div>
77+
</div> <!-- row-fluid -->
78+
79+
<!-- File upload -->
80+
<div class='row-fluid'>
81+
<div class='control-group'>
82+
<label class='control-label' for='file_upload'>File</label>
83+
<div class='controls'>
84+
<input type="file" name="@file" id='file_upload'>
85+
</div>
86+
</div>
87+
</div> <!-- row-fluid -->
8988
</fieldset>
9089
<div class='form-actions'>
9190
{{ context.submit() }}

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,28 @@
4545

4646
{% if context.messages %}
4747
<h4>Messages</h4>
48-
{% for msg in context.messages.reverse() %}
49-
<div class='row-fluid'>
50-
<div class='span2'>
51-
<a href='msg{{ msg.id }}'>msg{{msg.id}} (view)</a>
52-
</div>
53-
<div class='span4'>
54-
Author: {{ msg.author }}, Date: {{ msg.date }}
55-
</div>
56-
<div class='pull-right'>
57-
{% if context.is_edit_ok %}
58-
<form method="POST" action='issue{{ context.id }}' class='form-inline'>
59-
<input type="hidden" name="@remove@messages" value='{{ msg.id }}'>
60-
<input type="hidden" name="@action" value="edit">
61-
<input type="submit" value="remove">
62-
</form>
63-
{% endif %}
64-
</div>
48+
{% for msg in context.messages.reverse() %}
49+
<div class='row-fluid'>
50+
<div class='span2'>
51+
<a href='msg{{ msg.id }}'>msg{{msg.id}} (view)</a>
6552
</div>
66-
<div class='row-fluid'>
67-
<pre>{{ msg.content.hyperlinked() }}</pre>
53+
<div class='span4'>
54+
Author: {{ msg.author }}, Date: {{ msg.date }}
6855
</div>
69-
{% endfor %}
70-
</table>
56+
<div class='pull-right'>
57+
{% if context.is_edit_ok %}
58+
<form method="POST" action='issue{{ context.id }}' class='form-inline'>
59+
<input type="hidden" name="@remove@messages" value='{{ msg.id }}'>
60+
<input type="hidden" name="@action" value="edit">
61+
<input type="submit" value="remove">
62+
</form>
63+
{% endif %}
64+
</div>
65+
</div>
66+
<div class='row-fluid'>
67+
<pre>{{ msg.content.hyperlinked() }}</pre>
68+
</div>
69+
{% endfor %}
7170
{% endif %}
7271

7372
<div class='vspace-five'></div>

0 commit comments

Comments
 (0)