- attachment:html.diff of TodoTemplate
Attachment 'html.diff'
Download 1 diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/home.html html/home.html
2 --- roundup-1.4.9/share/roundup/templates/classic/html/home.html 2009-03-09 19:28:14.000000000 -0400
3 +++ html/home.html 2010-04-24 11:48:20.412719297 -0400
4 @@ -5,6 +5,6 @@
5 whatever. It's a good idea to have the issues on the front page though
6 -->
7 <span tal:replace="structure python:db.issue.renderWith('index',
8 - sort=[('-', 'activity')], group=[('+', 'priority')], filter=['status'],
9 - columns=['id','activity','title','creator','assignedto', 'status'],
10 - filterspec={'status':['-1','1','2','3','4','5','6','7']})" />
11 + sort=[('+', 'due_date'), ('-', 'status')], group=[('+', 'priority')], filter=['status'],
12 + columns=['id','title','due_date','status','keywords'],
13 + filterspec={'status':['-1','1','2']})" />
14 diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/issue.index.html html/issue.index.html
15 --- roundup-1.4.9/share/roundup/templates/classic/html/issue.index.html 2009-03-09 19:28:14.000000000 -0400
16 +++ html/issue.index.html 2010-04-24 11:48:19.137258257 -0400
17 @@ -24,16 +24,18 @@
18 <tal:block tal:define="batch request/batch" tal:condition="context/is_view_ok">
19 <table class="list">
20 <tr>
21 - <th tal:condition="request/show/priority" i18n:translate="">Priority</th>
22 <th tal:condition="request/show/id" i18n:translate="">ID</th>
23 + <th tal:condition="request/show/title" i18n:translate="">Title</th>
24 + <th tal:condition="request/show/status" i18n:translate="">Status</th>
25 + <th tal:condition="request/show/priority" i18n:translate="">Priority</th>
26 + <th tal:condition="request/show/due_date">Due Date</th>
27 <th tal:condition="request/show/creation" i18n:translate="">Creation</th>
28 <th tal:condition="request/show/activity" i18n:translate="">Activity</th>
29 <th tal:condition="request/show/actor" i18n:translate="">Actor</th>
30 <th tal:condition="request/show/keyword" i18n:translate="">Keyword</th>
31 - <th tal:condition="request/show/title" i18n:translate="">Title</th>
32 - <th tal:condition="request/show/status" i18n:translate="">Status</th>
33 <th tal:condition="request/show/creator" i18n:translate="">Creator</th>
34 <th tal:condition="request/show/assignedto" i18n:translate="">Assigned To</th>
35 + <th tal:condition="request/show/revives">Revives</th>
36 </tr>
37 <tal:block tal:repeat="i batch" condition=true>
38 <tr tal:define="group python:[r[1] for r in request.group]"
39 @@ -46,9 +48,18 @@
40 </tr>
41
42 <tr>
43 + <td tal:condition="request/show/id" tal:content="i/id"> </td>
44 + <td tal:condition="request/show/title">
45 + <a tal:attributes="href string:issue${i/id}"
46 + tal:content="python:str(i.title.plain(hyperlink=0)) or '[no title]'">title</a>
47 + </td>
48 + <td tal:condition="request/show/status"
49 + i18n:translate=""
50 + tal:content="python:i.status.plain() or default"> </td>
51 <td tal:condition="request/show/priority"
52 tal:content="python:i.priority.plain() or default"> </td>
53 - <td tal:condition="request/show/id" tal:content="i/id"> </td>
54 + <td tal:condition="request/show/due_date"
55 + tal:content="python:i.due_date.pretty('%Y-%m-%d')"> </td>
56 <td class="date" tal:condition="request/show/creation"
57 tal:content="i/creation/reldate"> </td>
58 <td class="date" tal:condition="request/show/activity"
59 @@ -57,17 +68,12 @@
60 tal:content="python:i.actor.plain() or default"> </td>
61 <td tal:condition="request/show/keyword"
62 tal:content="python:i.keyword.plain() or default"> </td>
63 - <td tal:condition="request/show/title">
64 - <a tal:attributes="href string:issue${i/id}"
65 - tal:content="python:str(i.title.plain(hyperlink=0)) or '[no title]'">title</a>
66 - </td>
67 - <td tal:condition="request/show/status"
68 - i18n:translate=""
69 - tal:content="python:i.status.plain() or default"> </td>
70 <td tal:condition="request/show/creator"
71 tal:content="python:i.creator.plain() or default"> </td>
72 <td tal:condition="request/show/assignedto"
73 tal:content="python:i.assignedto.plain() or default"> </td>
74 + <td tal:condition="request/show/revives"
75 + tal:content="python:i.revives.pretty('%Y-%m-%d')"> </td>
76 </tr>
77
78 </tal:block>
79 diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/issue.search.html html/issue.search.html
80 --- roundup-1.4.9/share/roundup/templates/classic/html/issue.search.html 2009-03-09 19:28:14.000000000 -0400
81 +++ html/issue.search.html 2010-04-24 11:48:21.828110226 -0400
82 @@ -50,6 +50,22 @@
83 <td> </td>
84 </tr>
85
86 +<tr tal:define="name string:due_date">
87 + <th i18n:translate="">Due Date:</th>
88 + <td metal:use-macro="search_input"></td>
89 + <td metal:use-macro="column_input"></td>
90 + <td metal:use-macro="sort_input"></td>
91 + <td metal:use-macro="group_input"></td>
92 +</tr>
93 +
94 +<tr tal:define="name string:revives">
95 + <th i18n:translate="">Revives:</th>
96 + <td metal:use-macro="search_input"></td>
97 + <td metal:use-macro="column_input"></td>
98 + <td metal:use-macro="sort_input"></td>
99 + <td metal:use-macro="group_input"></td>
100 +</tr>
101 +
102 <tr tal:define="name string:keyword;
103 db_klass string:keyword;
104 db_content string:name;">
105 @@ -134,8 +150,8 @@
106 <th i18n:translate="">Status:</th>
107 <td metal:use-macro="search_select_translated">
108 <tal:block metal:fill-slot="extra_options">
109 - <option value="-1,1,2,3,4,5,6,7" i18n:translate=""
110 - tal:attributes="selected python:value == '-1,1,2,3,4,5,6,7'">not resolved</option>
111 + <option value="-1,1,2" i18n:translate=""
112 + tal:attributes="selected python:value == '-1,1,2'">not waiting/done</option>
113 <option value="-1" i18n:translate=""
114 tal:attributes="selected python:value == '-1'">not selected</option>
115 </tal:block>
116 diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/page.html html/page.html
117 --- roundup-1.4.9/share/roundup/templates/classic/html/page.html 2009-07-12 22:13:54.000000000 -0400
118 +++ html/page.html 2010-04-24 11:48:22.257985812 -0400
119 @@ -19,8 +19,8 @@
120 kw_edit python:request.user.hasPermission('Edit', 'keyword');
121 kw_create python:request.user.hasPermission('Create', 'keyword');
122 kw_edit_link python:kw_edit and db.keyword.list();
123 -columns string:id,activity,title,creator,status;
124 -columns_showall string:id,activity,title,creator,assignedto,status;
125 +columns string:id,activity,due_date,revives,title,status;
126 +columns_showall string:id,activity,due_date,revives,title,status;
127 status_notresolved string:-1,1,2,3,4,5,6,7;
128 "
129 >
130 @@ -119,7 +119,7 @@
131 or request.user.hasPermission('Edit', 'user')">
132 <a href="user" i18n:translate="">User List</a><br>
133 </span>
134 - <a tal:condition="python:request.user.hasPermission('Create', 'user')"
135 + <a tal:condition="python:request.user.hasPermission('Register', 'user')"
136 href="user?@template=item" i18n:translate="">Add User</a>
137 </p>
138
139 diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/user.item.html html/user.item.html
140 --- roundup-1.4.9/share/roundup/templates/classic/html/user.item.html 2009-03-09 19:28:14.000000000 -0400
141 +++ html/user.item.html 2010-04-24 11:48:12.940513323 -0400
142 @@ -4,9 +4,9 @@
143 >
144 <title metal:fill-slot="head_title">
145 <tal:if condition="context/id" i18n:translate=""
146 - >User <tal:x content="context/id" i18n:name="id"
147 - />: <tal:x content="context/username" i18n:name="title"
148 - /> - <tal:x content="config/TRACKER_NAME" i18n:name="tracker"
149 + >User <span tal:replace="context/id" i18n:name="id"
150 + />: <span tal:replace="context/username" i18n:name="title"
151 + /> - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
152 /></tal:if>
153 <tal:if condition="not:context/id" i18n:translate=""
154 >New User - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
Attached Files
To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.You are not allowed to attach a file to this page.