Skip to content

Commit 3c1f72c

Browse files
author
Richard Jones
committed
tweaks, and include status on default index pages
1 parent e3d6b1f commit 3c1f72c

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

roundup/templates/classic/html/home

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<span tal:replace="structure python:db.issue.renderWith('index',
88
sort=('-', 'activity'), group=('+', 'priority'), filter=['status'],
99
columns={'id':1,'activity':1,'title':1,'creator':1,'assignedto':1,
10-
'priority':1},
10+
'status':1},
1111
filterspec={'status':['-1','1','2','3','4','5','6','7']})" />
1212

roundup/templates/classic/html/issue.item

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
<td colspan=3 class="form-text" tal:content="structure python:issue.title.field(size=60)">title</td>
88
</tr>
99

10-
<tr class="form">
11-
<th nowrap>Created</th>
12-
<td class="form-text" tal:content="string:${issue/creation} (${issue/creator/username})">creation (creator)</td>
13-
<th nowrap>Last activity</th>
14-
<td class="form-text" tal:content="issue/activity">activity</td>
15-
</tr>
16-
1710
<tr class="form">
1811
<th nowrap>Priority</th>
1912
<td class="form-text" tal:content="structure issue/priority/menu">priority</td>
@@ -24,7 +17,7 @@
2417
<tr class="form">
2518
<th nowrap>Superseder</th>
2619
<td>
27-
<span tal:replace="structure python:issue.superseder.field(showid=1)" />
20+
<span tal:replace="structure python:issue.superseder.field(showid=1, size=20)" />
2821
<span tal:replace="structure python:db.issue.classhelp('id,title', label='list', width=500)" />
2922
<span tal:condition="issue/superseder">
3023
<br>View: <span tal:replace="structure python:issue.superseder.link(showid=1)" />
@@ -56,7 +49,7 @@
5649
<tr class="form">
5750
<th nowrap>File</th>
5851
<td colspan=3 class="form-text">
59-
<input type="file" name="__file" size="60">
52+
<input type="file" name="__file" size="40">
6053
</td>
6154
</tr>
6255

@@ -68,6 +61,8 @@
6861
</tr>
6962
</table>
7063

64+
<span tal:content="structure string:Created on <b>${issue/creation}</b> by <b>${issue/creator/username}</b>, last changed <b>${issue/activity}</b>.">activity info</span>
65+
7166
<tal:block tal:condition="exists:item">
7267
<table class="messages" tal:condition="issue/messages">
7368
<tr><th colspan=2 class="header">Messages</th></tr>

roundup/templates/classic/html/page

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<b>Issues</b><br>
2727
<a tal:condition="python:request.user.hasPermission('Edit', 'issue')"
2828
href="issue?:template=item">New Issue<br></a>
29-
<a href="issue?:sort=-activity&:group=priority&:filter=status,assignedto&:columns=id,activity,title,creator,priority&status=-1,1,2,3,4,5,6,7&assignedto=-1">Unassigned Issues</a><br>
30-
<a href="issue?:sort=-activity&:group=priority&:filter=status&:columns=id,activity,title,creator,assignedto,priority&status=-1,1,2,3,4,5,6,7">All Issues</a><br>
29+
<a href="issue?:sort=-activity&:group=priority&:filter=status,assignedto&:columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=-1">Unassigned Issues</a><br>
30+
<a href="issue?:sort=-activity&:group=priority&:filter=status&:columns=id,activity,title,creator,assignedto,status&status=-1,1,2,3,4,5,6,7">All Issues</a><br>
3131
<a href="issue?:template=search">Search Issues</a>
3232
</p>
3333

@@ -51,7 +51,7 @@
5151

5252
<p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
5353
<b>Hello,</b><br><b tal:content="request/user/username">username</b><br>
54-
<a tal:attributes="href string:issue?:sort=-activity&:group=priority&:filter=status,assignedto&:columns=id,activity,title,creator,priority&status=-1,1,2,3,4,5,6,7&assignedto=${request/user/id}">My Issues</a><br>
54+
<a tal:attributes="href string:issue?:sort=-activity&:group=priority&:filter=status,assignedto&:columns=id,activity,title,creator,status&status=-1,1,2,3,4,5,6,7&assignedto=${request/user/id}">My Issues</a><br>
5555
<a tal:attributes="href string:user${request/user/id}">My Details</a><br>
5656
<a tal:attributes="href python:request.indexargs_href(request.url,
5757
{':action':'logout'})">Logout</a>

roundup/templates/classic/html/style.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ table.form {
6666
font-weight: bold;
6767
color: #333388;
6868
text-align: right;
69+
vertical-align: top;
6970
}
7071

7172
.form-header th {
@@ -101,12 +102,14 @@ table.list th {
101102
color: #404070;
102103
background-color: #eeeeff;
103104
border-right: 1px solid #404070;
105+
border-top: 1px solid #404070;
104106
vertical-align: top;
105107
}
106108
table.list th a:hover { color: #404070 }
107109
table.list th a:link { color: #404070 }
108110
table.list th a { color: #404070 }
109111
table.list th.group {
112+
background-color: #f4f4ff;
110113
text-align: center;
111114
}
112115

0 commit comments

Comments
 (0)