diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/home.html html/home.html
--- roundup-1.4.9/share/roundup/templates/classic/html/home.html	2009-03-09 19:28:14.000000000 -0400
+++ html/home.html	2010-04-24 11:48:20.412719297 -0400
@@ -5,6 +5,6 @@
  whatever. It's a good idea to have the issues on the front page though
 -->
 <span tal:replace="structure python:db.issue.renderWith('index',
-    sort=[('-', 'activity')], group=[('+', 'priority')], filter=['status'],
-    columns=['id','activity','title','creator','assignedto', 'status'],
-    filterspec={'status':['-1','1','2','3','4','5','6','7']})" />
+    sort=[('+', 'due_date'), ('-', 'status')], group=[('+', 'priority')], filter=['status'],
+    columns=['id','title','due_date','status','keywords'],
+    filterspec={'status':['-1','1','2']})" />
diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/issue.index.html html/issue.index.html
--- roundup-1.4.9/share/roundup/templates/classic/html/issue.index.html	2009-03-09 19:28:14.000000000 -0400
+++ html/issue.index.html	2010-04-24 11:48:19.137258257 -0400
@@ -24,16 +24,18 @@
 <tal:block tal:define="batch request/batch" tal:condition="context/is_view_ok">
  <table class="list">
   <tr>
-   <th tal:condition="request/show/priority" i18n:translate="">Priority</th>
    <th tal:condition="request/show/id" i18n:translate="">ID</th>
+   <th tal:condition="request/show/title" i18n:translate="">Title</th>
+   <th tal:condition="request/show/status" i18n:translate="">Status</th>
+   <th tal:condition="request/show/priority" i18n:translate="">Priority</th>
+   <th tal:condition="request/show/due_date">Due Date</th>
    <th tal:condition="request/show/creation" i18n:translate="">Creation</th>
    <th tal:condition="request/show/activity" i18n:translate="">Activity</th>
    <th tal:condition="request/show/actor" i18n:translate="">Actor</th>
    <th tal:condition="request/show/keyword" i18n:translate="">Keyword</th>
-   <th tal:condition="request/show/title" i18n:translate="">Title</th>
-   <th tal:condition="request/show/status" i18n:translate="">Status</th>
    <th tal:condition="request/show/creator" i18n:translate="">Creator</th>
    <th tal:condition="request/show/assignedto" i18n:translate="">Assigned&nbsp;To</th>
+   <th tal:condition="request/show/revives">Revives</th>
   </tr>
  <tal:block tal:repeat="i batch" condition=true>
   <tr tal:define="group python:[r[1] for r in request.group]"
@@ -46,9 +48,18 @@
   </tr>
 
   <tr>
+   <td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
+   <td tal:condition="request/show/title">
+    <a tal:attributes="href string:issue${i/id}"
+		tal:content="python:str(i.title.plain(hyperlink=0)) or '[no title]'">title</a>
+   </td>
+   <td tal:condition="request/show/status"
+       i18n:translate=""
+       tal:content="python:i.status.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/priority"
        tal:content="python:i.priority.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
+   <td tal:condition="request/show/due_date"
+       tal:content="python:i.due_date.pretty('%Y-%m-%d')">&nbsp;</td>
    <td class="date" tal:condition="request/show/creation"
        tal:content="i/creation/reldate">&nbsp;</td>
    <td class="date" tal:condition="request/show/activity"
@@ -57,17 +68,12 @@
        tal:content="python:i.actor.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/keyword"
        tal:content="python:i.keyword.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/title">
-    <a tal:attributes="href string:issue${i/id}"
-		tal:content="python:str(i.title.plain(hyperlink=0)) or '[no title]'">title</a>
-   </td>
-   <td tal:condition="request/show/status"
-       i18n:translate=""
-       tal:content="python:i.status.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/creator"
        tal:content="python:i.creator.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/assignedto"
        tal:content="python:i.assignedto.plain() or default">&nbsp;</td>
+   <td tal:condition="request/show/revives"
+       tal:content="python:i.revives.pretty('%Y-%m-%d')">&nbsp;</td>
   </tr>
 
  </tal:block>
diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/issue.search.html html/issue.search.html
--- roundup-1.4.9/share/roundup/templates/classic/html/issue.search.html	2009-03-09 19:28:14.000000000 -0400
+++ html/issue.search.html	2010-04-24 11:48:21.828110226 -0400
@@ -50,6 +50,22 @@
   <td>&nbsp;</td>
 </tr>
 
+<tr tal:define="name string:due_date">
+	<th i18n:translate="">Due Date:</th>
+	<td metal:use-macro="search_input"></td>
+	<td metal:use-macro="column_input"></td>
+	<td metal:use-macro="sort_input"></td>
+	<td metal:use-macro="group_input"></td>
+</tr>
+
+<tr tal:define="name string:revives">
+	<th i18n:translate="">Revives:</th>
+	<td metal:use-macro="search_input"></td>
+	<td metal:use-macro="column_input"></td>
+	<td metal:use-macro="sort_input"></td>
+	<td metal:use-macro="group_input"></td>
+</tr>
+
 <tr tal:define="name string:keyword;
                 db_klass string:keyword;
                 db_content string:name;">
@@ -134,8 +150,8 @@
   <th i18n:translate="">Status:</th>
   <td metal:use-macro="search_select_translated">
     <tal:block metal:fill-slot="extra_options">
-      <option value="-1,1,2,3,4,5,6,7" i18n:translate=""
-              tal:attributes="selected python:value == '-1,1,2,3,4,5,6,7'">not resolved</option>
+      <option value="-1,1,2" i18n:translate=""
+              tal:attributes="selected python:value == '-1,1,2'">not waiting/done</option>
       <option value="-1" i18n:translate=""
               tal:attributes="selected python:value == '-1'">not selected</option>
     </tal:block>
diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/page.html html/page.html
--- roundup-1.4.9/share/roundup/templates/classic/html/page.html	2009-07-12 22:13:54.000000000 -0400
+++ html/page.html	2010-04-24 11:48:22.257985812 -0400
@@ -19,8 +19,8 @@
 kw_edit python:request.user.hasPermission('Edit', 'keyword');
 kw_create python:request.user.hasPermission('Create', 'keyword');
 kw_edit_link python:kw_edit and db.keyword.list();
-columns string:id,activity,title,creator,status;
-columns_showall string:id,activity,title,creator,assignedto,status;
+columns string:id,activity,due_date,revives,title,status;
+columns_showall string:id,activity,due_date,revives,title,status;
 status_notresolved string:-1,1,2,3,4,5,6,7;
 "
 >
@@ -119,7 +119,7 @@
                             or request.user.hasPermission('Edit', 'user')">
     <a href="user"  i18n:translate="">User List</a><br>
    </span>
-   <a tal:condition="python:request.user.hasPermission('Create', 'user')"
+   <a tal:condition="python:request.user.hasPermission('Register', 'user')"
       href="user?@template=item" i18n:translate="">Add User</a>
   </p>
 
diff -wBu -I '^<!-- SHA' -I '^<!-- $Id' roundup-1.4.9/share/roundup/templates/classic/html/user.item.html html/user.item.html
--- roundup-1.4.9/share/roundup/templates/classic/html/user.item.html	2009-03-09 19:28:14.000000000 -0400
+++ html/user.item.html	2010-04-24 11:48:12.940513323 -0400
@@ -4,9 +4,9 @@
 >
 <title metal:fill-slot="head_title">
 <tal:if condition="context/id" i18n:translate=""
- >User <tal:x content="context/id" i18n:name="id"
- />: <tal:x content="context/username" i18n:name="title"
- /> - <tal:x content="config/TRACKER_NAME" i18n:name="tracker"
+ >User <span tal:replace="context/id" i18n:name="id"
+ />: <span tal:replace="context/username" i18n:name="title"
+ /> - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
 /></tal:if>
 <tal:if condition="not:context/id" i18n:translate=""
  >New User - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"