--- roundup-1.4.9/share/roundup/templates/classic/html/issue.item.html	2009-03-26 02:14:19.000000000 -0400
+++ issue.item.html	2010-04-24 11:36:58.844113642 -0400
@@ -2,9 +2,9 @@
 <tal:block metal:use-macro="templates/page/macros/icing">
 <title metal:fill-slot="head_title">
 <tal:block condition="context/id" i18n:translate=""
- >Issue <tal:x tal:content="context/id" i18n:name="id"
- />: <tal:x content="context/title" i18n:name="title"
- /> - <tal:x content="config/TRACKER_NAME" i18n:name="tracker"
+ >Issue <span tal:replace="context/id" i18n:name="id"
+ />: <span tal:replace="context/title" i18n:name="title"
+ /> - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
 /></tal:block>
 <tal:block condition="not:context/id" i18n:translate=""
  >New Issue - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
@@ -53,28 +53,16 @@
 </tr>
 
 <tr>
- <th i18n:translate="">Superseder</th>
- <td>
-  <span tal:replace="structure python:context.superseder.field(showid=1, size=20)" />
-  <span tal:condition="context/is_edit_ok" tal:replace="structure python:db.issue.classhelp('id,title', property='superseder')" />
-  <span tal:condition="context/superseder">
-   <br><span i18n:translate="">View:</span>
-     <a tal:repeat="sup context/superseder"
-        tal:content="python:sup['id'] + ', '*(not repeat['sup'].end)"
-        tal:attributes="href string:issue${sup/id}"></a>
-  </span>
- </td>
- <th i18n:translate="">Nosy List</th>
- <td>
-  <span tal:replace="structure context/nosy/field" />
-  <span tal:condition="context/is_edit_ok" tal:replace="structure
-python:db.user.classhelp('username,realname,address', property='nosy', width='600')" /><br>
- </td>
+ <th i18n:translate="">Due Date</th>
+ <td tal:content="structure python:context.due_date.field(format='%Y-%m-%d')" />
+ <th i18n:translate="">Revives</th>
+ <td tal:content="structure python:context.revives.field(format='%Y-%m-%d')" />
 </tr>
 
+
 <tr>
  <th i18n:translate="">Assigned To</th>
- <td tal:content="structure context/assignedto/menu">assignedto menu</td>
+ <td tal:content="structure context/assignedto/menu" />
  <th i18n:translate="">Keywords</th>
  <td>
   <span tal:replace="structure context/keyword/field" />
@@ -82,17 +70,50 @@
  </td>
 </tr>
 
+<tr>
+ <th i18n:translate="">Requires</th>
+ <td>
+  <span tal:replace="structure python:context.superseder.field(showid=1, size=20)" />
+  <span tal:condition="context/is_edit_ok"
+        tal:replace="structure python:db.issue.classhelp('id,title', property='superseder',
+        filter='status=waiting,in progress,needs attention;keyword='+context.keyword.plain())"/>
+
+   <tal:block tal:condition="context/superseder">
+   <br/>
+   <table>
+     <tr tal:repeat="sup context/superseder">
+       <td><a tal:attributes="href string:issue${sup/id}"
+         tal:content="string:${sup/id} - ${sup/title}"/>
+       </td>
+     </tr>
+   </table>
+   </tal:block>
+ </td>
+
+ <th>Required for</th>
+ <td>
+   <table tal:define="sups python:db.issue.filter(filterspec=dict(superseder=context.id))"
+     tal:condition="sups">
+     <tr tal:repeat="sup sups">
+       <td><a tal:attributes="href string:issue${sup/id}"
+         tal:content="string:${sup/id} - ${sup/title}"/>
+       </td>
+     </tr>
+   </table>
+ </td>
+</tr>
+
 <tr tal:condition="context/is_edit_ok">
- <th i18n:translate="">Change Note</th>
+ <th i18n:translate="" class="multi">Change Note</th>
  <td colspan=3>
   <textarea tal:content="request/form/@note/value | default"
-            name="@note" wrap="hard" rows="5" cols="80"></textarea>
+            name="@note" wrap="hard" rows="15" cols="90"></textarea>
  </td>
 </tr>
 
 <tr tal:condition="context/is_edit_ok">
  <th i18n:translate="">File</th>
- <td colspan=3><input type="file" name="@file" size="40"></td>
+ <td colspan=3><input type="file" name="@file" size="60"></td>
 </tr>
 
 <tr tal:condition="context/is_edit_ok">
@@ -103,8 +124,6 @@
  </td>
  <td colspan=3>
   <span tal:replace="structure context/submit">submit button</span>
-  <a tal:condition="context/id" tal:attributes="href context/copy_url"
-   i18n:translate="">Make a copy</a>
  </td>
 </tr>
 
@@ -122,12 +141,55 @@
 </tal:block>
 
 <p tal:condition="context/id" i18n:translate="">
- Created on <b tal:content="context/creation" i18n:name="creation" />
- by <b tal:content="context/creator" i18n:name="creator" />,
- last changed <b content="context/activity" i18n:name="activity" />
- by <b tal:content="context/actor" i18n:name="actor" />.
+ Created on <b><tal:x replace="context/creation" i18n:name="creation" /></b>
+ by <b><tal:x replace="context/creator" i18n:name="creator" /></b>,
+ last changed <b><tal:x replace="context/activity" i18n:name="activity" /></b>
+ by <b><tal:x replace="context/actor" i18n:name="actor" /></b>.
 </p>
 
+<table class="messages" tal:condition="context/messages">
+ <tr><th colspan="4" class="header" i18n:translate="">Messages</th></tr>
+ <!-- Use context/messages/reverse for reverse ordering -->
+ <tal:block tal:repeat="msg context/messages">
+  <tr>
+   <th><a tal:attributes="href string:msg${msg/id}"
+    i18n:translate="">msg<tal:x replace="msg/id" i18n:name="id" /> (view)</a></th>
+   <th i18n:translate="">Author: <tal:x replace="msg/author"
+       i18n:name="author" /></th>
+   <th i18n:translate="">Date: <tal:x replace="msg/date"
+       i18n:name="date" /></th>
+   <th>
+     <form style="padding:0" method="POST" tal:condition="context/is_edit_ok"
+           tal:attributes="action string:issue${context/id}">
+       <input type="hidden" name="@remove@messages" tal:attributes="value msg/id">
+     <input type="hidden" name="@action" value="edit">
+     <input type="submit" value="remove" i18n:attributes="value">
+    </form>
+   </th>
+  </tr>
+  <tr>
+   <td colspan="4" class="content">
+     <pre tal:content="structure msg/content/hyperlinked">content</pre>
+
+     <tal:block tal:condition="msg/files">
+       <h5>Attachments</h5>
+       <ul>
+         <tal:block tal:repeat="file msg/files">
+           <li>
+             <a tal:attributes="href file/download_url"
+                tal:content="file/name">dld link</a>
+           </li>
+         </tal:block>
+       </ul>
+     </tal:block>
+   </td>
+  </tr>
+ </tal:block>
+</table>
+
+<!-- Uncomment the following to list all files without
+     their messages -->
+<!--
 <table class="files" tal:condition="context/files">
  <tr><th colspan="5" class="header" i18n:translate="">Files</th></tr>
  <tr>
@@ -151,7 +213,7 @@
           tal:attributes="href string:file${file/id}">edit</a>
   </td>
   <td>
-   <form style="padding:0" method="POST" tal:condition="context/is_edit_ok"
+   <form style="padding:0" tal:condition="context/is_edit_ok"
          tal:attributes="action string:issue${context/id}">
     <input type="hidden" name="@remove@files" tal:attributes="value file/id">
     <input type="hidden" name="@action" value="edit">
@@ -160,33 +222,8 @@
   </td>
  </tr>
 </table>
+-->
 
-<table class="messages" tal:condition="context/messages">
- <tr><th colspan="4" class="header" i18n:translate="">Messages</th></tr>
- <tal:block tal:repeat="msg context/messages/reverse">
-  <tr>
-   <th><a tal:attributes="href string:msg${msg/id}"
-    i18n:translate="">msg<tal:x replace="msg/id" i18n:name="id" /> (view)</a></th>
-   <th i18n:translate="">Author: <tal:x replace="msg/author"
-       i18n:name="author" /></th>
-   <th i18n:translate="">Date: <tal:x replace="msg/date"
-       i18n:name="date" /></th>
-   <th>
-    <form style="padding:0" method="POST" tal:condition="context/is_edit_ok"
-          tal:attributes="action string:issue${context/id}">
-     <input type="hidden" name="@remove@messages" tal:attributes="value msg/id">
-     <input type="hidden" name="@action" value="edit">
-     <input type="submit" value="remove" i18n:attributes="value">
-    </form>
-   </th>
-  </tr>
-  <tr>
-   <td colspan="4" class="content">
-    <pre tal:content="structure msg/content/hyperlinked">content</pre>
-   </td>
-  </tr>
- </tal:block>
-</table>
 
 <tal:block tal:condition="context/id" tal:replace="structure context/history" />
 
@@ -195,3 +232,4 @@
 </td>
 
 </tal:block>
+<!-- SHA: cef943195fefd743431d22c020eef27edd6255e1 -->
