From 3e2cd12db137cbaf6febe2a472cbd6e2eca6740f Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Mon, 2 Sep 2002 06:20:51 +0000
Subject: [PATCH] tweaks, and include status on default index pages

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1023 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 roundup/templates/classic/html/home       |  2 +-
 roundup/templates/classic/html/issue.item | 13 ++++---------
 roundup/templates/classic/html/page       |  6 +++---
 roundup/templates/classic/html/style.css  |  3 +++
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/roundup/templates/classic/html/home b/roundup/templates/classic/html/home
index 1d5d38c..8dc99f7 100644
--- a/roundup/templates/classic/html/home
+++ b/roundup/templates/classic/html/home
@@ -7,6 +7,6 @@
 <span tal:replace="structure python:db.issue.renderWith('index',
     sort=('-', 'activity'), group=('+', 'priority'), filter=['status'],
     columns={'id':1,'activity':1,'title':1,'creator':1,'assignedto':1,
-             'priority':1},
+             'status':1},
     filterspec={'status':['-1','1','2','3','4','5','6','7']})" />
 
diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
index 750f35c..a967c09 100644
--- a/roundup/templates/classic/html/issue.item
+++ b/roundup/templates/classic/html/issue.item
@@ -7,13 +7,6 @@
  <td colspan=3 class="form-text" tal:content="structure python:issue.title.field(size=60)">title</td>
 </tr>
 
-<tr class="form">
- <th nowrap>Created</th>
- <td class="form-text" tal:content="string:${issue/creation} (${issue/creator/username})">creation (creator)</td>
- <th nowrap>Last activity</th>
- <td class="form-text" tal:content="issue/activity">activity</td>
-</tr>
-
 <tr class="form">
  <th nowrap>Priority</th>
  <td class="form-text" tal:content="structure issue/priority/menu">priority</td>
@@ -24,7 +17,7 @@
 <tr class="form">
  <th nowrap>Superseder</th>
  <td>
-  <span tal:replace="structure python:issue.superseder.field(showid=1)" />
+  <span tal:replace="structure python:issue.superseder.field(showid=1, size=20)" />
   <span tal:replace="structure python:db.issue.classhelp('id,title', label='list', width=500)" />
   <span tal:condition="issue/superseder">
    <br>View: <span tal:replace="structure python:issue.superseder.link(showid=1)" />
@@ -56,7 +49,7 @@
 <tr class="form">
  <th nowrap>File</th>
  <td colspan=3 class="form-text">
-  <input type="file" name="__file" size="60">
+  <input type="file" name="__file" size="40">
  </td>
 </tr>
 
@@ -68,6 +61,8 @@
 </tr>
 </table>
 
+<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>
+
 <tal:block tal:condition="exists:item">
  <table class="messages" tal:condition="issue/messages">
   <tr><th colspan=2 class="header">Messages</th></tr>
diff --git a/roundup/templates/classic/html/page b/roundup/templates/classic/html/page
index 75d63d3..c69172b 100644
--- a/roundup/templates/classic/html/page
+++ b/roundup/templates/classic/html/page
@@ -26,8 +26,8 @@
    <b>Issues</b><br>
    <a tal:condition="python:request.user.hasPermission('Edit', 'issue')"
       href="issue?:template=item">New Issue<br></a>
-   <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>
-   <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>
+   <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>
+   <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>
    <a href="issue?:template=search">Search Issues</a>
   </p>
 
@@ -51,7 +51,7 @@
    
   <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
    <b>Hello,</b><br><b tal:content="request/user/username">username</b><br>
-   <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>
+   <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>
    <a tal:attributes="href string:user${request/user/id}">My Details</a><br>
    <a tal:attributes="href python:request.indexargs_href(request.url,
        {':action':'logout'})">Logout</a>
diff --git a/roundup/templates/classic/html/style.css b/roundup/templates/classic/html/style.css
index a300427..1191bbb 100644
--- a/roundup/templates/classic/html/style.css
+++ b/roundup/templates/classic/html/style.css
@@ -66,6 +66,7 @@ table.form {
   font-weight: bold;
   color: #333388;
   text-align: right;
+  vertical-align: top;
 }
 
 .form-header th {
@@ -101,12 +102,14 @@ table.list th {
   color: #404070;
   background-color: #eeeeff;
   border-right: 1px solid #404070;
+  border-top: 1px solid #404070;
   vertical-align: top;
 }
 table.list th a:hover { color: #404070 }
 table.list th a:link { color: #404070 }
 table.list th a { color: #404070 }
 table.list th.group {
+  background-color: #f4f4ff;
   text-align: center;
 }
 
-- 
2.30.2