Skip to content

Commit 4145815

Browse files
author
Richard Jones
committed
*** empty log message ***
1 parent 8e3ffca commit 4145815

File tree

5 files changed

+118
-36
lines changed

5 files changed

+118
-36
lines changed

‎roundup/templates/classic/html/issue.index‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,57 @@
4141
<tr class="list-header" tal:condition="batch">
4242
<td colspan="2">
4343
<form method="GET" tal:attributes="action request/classname">
44-
<span tal:replace="structure request/indexargs_form" />
45-
Pagesize: <input type="text" name=":pagesize" size="3" value="50">
46-
Starting at: <input type="text" name=":startwith" size="3" value="0">
47-
<input type="submit" value="Redisplay">
44+
Pagesize: <input type="text" name=":pagesize" size="3" value="50">
45+
Starting at: <input type="text" name=":startwith" size="3" value="0">
46+
<br>
47+
<xml:block tal:condition="python:'status' in request.filter">
48+
Status:
49+
<input type="hidden" name=":filter" value="status">
50+
<select name="status">
51+
<option value="-1,1,2,3,4,5,6,7"
52+
tal:attributes="selected python:'-1,1,2,3,4,5,6,7'.split(',')==request.filterspec['status']">not resolved</option>
53+
<option value="-1"
54+
tal:attributes="selected python:['-1']==request.filterspec['status']">not selected</option>
55+
<option tal:repeat="s db/status/list"
56+
tal:attributes="value s/id;
57+
selected python:[s]==request.filterspec['status']"
58+
tal:content="s/name">status to filter on</option>
59+
</select>
60+
</xml:block>
61+
62+
<xml:block tal:condition="python:'assignedto' in request.filter">
63+
Assigned To:
64+
<input type="hidden" name=":filter" value="assignedto">
65+
<select name="assignedto">
66+
<option value="-1"
67+
tal:attributes="selected python:['-1']==request.filterspec['assignedto']">not selected</option>
68+
<option tal:repeat="s db/user/list"
69+
tal:attributes="value s/id;
70+
selected python:[s]==request.filterspec['assignedto']"
71+
tal:content="s/username">person to filter on</option>
72+
</select>
73+
</xml:block>
74+
75+
<br>
76+
Show:
77+
<tal:block tal:repeat="col python:'id activity priority title status assignedto'.split()">
78+
<span tal:replace="col" /><input type="checkbox" name=":columns" tal:attributes="value col;
79+
checked python:request.columns.has_key(col)">
80+
</tal:block>
81+
<br>
82+
Sort on:
83+
<select name=":sort">
84+
<option tal:repeat="col python:request.columns.keys()"
85+
tal:attributes="value col; selected python:col in request.sort"
86+
tal:content="col">column</option>
87+
</select>
88+
Group on:
89+
<select name=":group">
90+
<option tal:repeat="col python:request.columns.keys()"
91+
tal:attributes="value col; selected python:col in request.group"
92+
tal:content="col">column</option>
93+
</select>
94+
<input type="submit" value="Redisplay">
4895
</form>
4996
</td>
5097
</tr>

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

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,38 @@
3939
</tr>
4040

4141
<tr class="form">
42-
<td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
43-
<td class="form-text" tal:content="structure issue/assignedto/menu">assignedto</td>
42+
<td width=1% nowrap align=right>
43+
<span class="form-label">Assigned To</span>
44+
</td>
45+
<td class="form-text" tal:content="structure issue/assignedto/menu">
46+
assignedto menu
47+
</td>
4448
<td>&nbsp;</td>
4549
<td>&nbsp;</td>
4650
</tr>
4751

4852
<tr class="form">
49-
<td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
50-
<td colspan=3 class="form-text"><textarea name="__note" wrap="hard" rows="5" cols="60"></textarea></td>
53+
<td width=1% nowrap align=right>
54+
<span class="form-label">Change Note</span>
55+
</td>
56+
<td colspan=3 class="form-text">
57+
<textarea name="__note" wrap="hard" rows="5" cols="60"></textarea>
58+
</td>
5159
</tr>
5260

5361
<tr class="form">
54-
<td width=1% nowrap align=right><span class="form-label">File</span></td>
55-
<td colspan=3 class="form-text"><input type="file" name="__file" size="60"></td>
62+
<td width=1% nowrap align=right>
63+
<span class="form-label">File</span>
64+
</td>
65+
<td colspan=3 class="form-text">
66+
<input type="file" name="__file" size="60">
67+
</td>
5668
</tr>
5769

5870
<tr class="form">
5971
<td>&nbsp;</td>
60-
<td colspan=3 class="form-text" tal:condition="exists:item">
61-
<input type="hidden" name=":action" value="edit">
62-
<input type="submit" name="submit" value="Submit Changes">
63-
</td>
64-
<td colspan=3 class="form-text" tal:condition="not:exists:item">
65-
<input type="hidden" name=":action" value="new">
66-
<input type="submit" name="submit" value="Submit New Entry">
72+
<td colspan=3 class="form-text" tal:content="structure issue/submit">
73+
submit button will go here
6774
</td>
6875
</tr>
6976

@@ -93,11 +100,11 @@
93100
</tr>
94101
<tr tal:repeat="file issue/files">
95102
<td>
96-
<a href="" tal:attributes="href string:file${file/id}/${file/name}"
103+
<a tal:attributes="href string:file${file/id}/${file/name}"
97104
tal:content="file/name">dld link</a>
98105
</td>
99106
<td>
100-
<span tal:content="file/creator/username">creator's name</span>,
107+
<span tal:content="file/creator">creator's name</span>,
101108
<span tal:content="file/creation">creation date</span>
102109
</td>
103110
</tr>

‎roundup/templates/classic/html/issue.search‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
<form method="GET" tal:attributes="action request/classname">
3+
<input type="hidden" name=":action" value="search">
34

45
Columns you may display:
56
<tal:block
@@ -18,9 +19,32 @@ Group on:
1819
<input type="radio" name=":group" tal:repeat="n request/group"
1920
tal:attributes="value n;
2021
checked python:n in request.group">
22+
23+
<br>
24+
Priority:
25+
<span tal:replace="structure issue/priority/menu" />
26+
2127
<br>
22-
<input type="hidden" name=":action" value="searchform">
28+
Status:
29+
<select name="status">
30+
<option value="dontcare">don't care</option>
31+
<option value="-1,1,2,3,4,5,6,7">not resolved</option>
32+
<option value="-1">not selected</option>
33+
<option value="dontcare">------------</option>
34+
<option tal:repeat="s db/status/list" tal:attributes="value s/id"
35+
tal:content="s/name">status to filter on</option>
36+
</select>
37+
2338
<br>
39+
Assigned To:
40+
<select name="assignedto">
41+
<option value="dontcare">don't care</option>
42+
<option tal:attributes="value request/user/id">assigned to me</option>
43+
<option value="-1">unassigned</option>
44+
<option value="-1">------------</option>
45+
<option tal:repeat="s db/user/list" tal:attributes="value s/id"
46+
tal:content="s/username">user to filter on</option>
47+
</select>
2448

2549
<tal:block tal:repeat="n python:request.filterspec.keys()">
2650
Filter: <input tal:repeat="v python:request.filterspec[n]"

‎roundup/templates/classic/html/msg.item‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,41 @@
22
<table border=0 cellspacing=0 cellpadding=2>
33

44
<tr bgcolor="ffffea">
5-
<td width=1% nowrap align=right><span class="form-label">Author</span></td>
6-
<td class="form-text"><display call="plain('author')"></td>
5+
<td width=1% nowrap align=right><span class="form-label">Author</span></td>
6+
<td class="form-text" tal:content="msg/author"></td>
77
</tr>
88

99
<tr bgcolor="ffffea">
10-
<td width=1% nowrap align=right><span class="form-label">Recipients</span></td>
11-
<td class="form-text"><display call="plain('recipients')"></td>
10+
<td width=1% nowrap align=right><span class="form-label">Recipients</span></td>
11+
<td class="form-text" tal:content="msg/recipients"></td>
1212
</tr>
1313

1414
<tr bgcolor="ffffea">
15-
<td width=1% nowrap align=right><span class="form-label">Date</span></td>
16-
<td class="form-text"><display call="plain('date')"></td>
15+
<td width=1% nowrap align=right><span class="form-label">Date</span></td>
16+
<td class="form-text" tal:content="msg/date"></td>
1717
</tr>
1818

1919
<tr bgcolor="ffeaff">
2020
<td colspan=2 class="form-text">
21-
<pre><display call="plain('content', escape=1)"></pre>
21+
<pre tal:content="msg/content"></pre>
2222
</td>
2323
</tr>
2424

2525
<property name="files">
2626
<tr class="strong-header"><td colspan=2><b>Files</b></td></tr>
27-
<tr><td colspan=2><display call="list('files')"></td></tr>
27+
<tr tal:repeat="file msg/files">
28+
<td>
29+
<a tal:attributes="href string:file${file/id}/${file/name}"
30+
tal:content="file/name">dld link</a>
31+
</td>
32+
<td>
33+
<span tal:content="file/creator">creator's name</span>,
34+
<span tal:content="file/creation">creation date</span>
35+
</td>
36+
</tr>
2837
</property>
2938

3039
<tr class="history-header"><td colspan=2><b>History</b></td><tr>
31-
<tr><td colspan=2><display call="history()"></td></tr>
40+
<tr><td colspan="2" tal:content="structure msg/history">history</td></tr>
3241

3342
</table>

‎roundup/templates/classic/html/user.item‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,8 @@ You are not allowed to view this page.
5151

5252
<tr class="form">
5353
<td>&nbsp;</td>
54-
<td colspan=3 class="form-text" tal:condition="exists:item">
55-
<input type="hidden" name=":action" value="edit">
56-
<input type="submit" name="submit" value="Submit Changes">
57-
</td>
58-
<td colspan=3 class="form-text" tal:condition="not:exists:item">
59-
<input type="hidden" name=":action" value="new">
60-
<input type="submit" name="submit" value="Submit New Entry">
54+
<td colspan=3 class="form-text" tal:content="structure user/submit">
55+
submit button will go here
6156
</td>
6257
</tr>
6358

0 commit comments

Comments
 (0)