*** empty log message ***

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1017 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/templates/classic/html/issue.index b/roundup/templates/classic/html/issue.index
index 457888a882601bb88674e33f950305cf4894b0d5..f726492161f143f5db59bcec15b2ba15d944f602 100644 (file)
--- a/roundup/templates/classic/html/issue.index
+++ b/roundup/templates/classic/html/issue.index
@@ -41,10 +41,57 @@
   <tr class="list-header" tal:condition="batch">
    <td colspan="2">
     <form method="GET" tal:attributes="action request/classname">
-    <span tal:replace="structure request/indexargs_form" />
-    Pagesize: <input type="text" name=":pagesize" size="3" value="50">
-    Starting at: <input type="text" name=":startwith" size="3" value="0">
-    <input type="submit" value="Redisplay">
+     Pagesize: <input type="text" name=":pagesize" size="3" value="50">
+     Starting at: <input type="text" name=":startwith" size="3" value="0">
+     <br>
+     <xml:block tal:condition="python:'status' in request.filter">
+      Status:
+      <input type="hidden" name=":filter" value="status">
+      <select name="status">
+       <option value="-1,1,2,3,4,5,6,7"
+         tal:attributes="selected python:'-1,1,2,3,4,5,6,7'.split(',')==request.filterspec['status']">not resolved</option>
+       <option value="-1"
+         tal:attributes="selected python:['-1']==request.filterspec['status']">not selected</option>
+       <option tal:repeat="s db/status/list"
+         tal:attributes="value s/id;
+                         selected python:[s]==request.filterspec['status']"
+         tal:content="s/name">status to filter on</option>
+      </select>
+     </xml:block>
+
+     <xml:block tal:condition="python:'assignedto' in request.filter">
+      Assigned To:
+      <input type="hidden" name=":filter" value="assignedto">
+      <select name="assignedto">
+       <option value="-1"
+         tal:attributes="selected python:['-1']==request.filterspec['assignedto']">not selected</option>
+       <option tal:repeat="s db/user/list"
+         tal:attributes="value s/id;
+                         selected python:[s]==request.filterspec['assignedto']"
+         tal:content="s/username">person to filter on</option>
+      </select>
+     </xml:block>
+
+     <br>
+     Show:
+     <tal:block tal:repeat="col python:'id activity priority title status assignedto'.split()">
+      <span tal:replace="col" /><input type="checkbox" name=":columns" tal:attributes="value col;
+        checked python:request.columns.has_key(col)">
+     </tal:block>
+     <br>
+     Sort on:
+     <select name=":sort">
+      <option tal:repeat="col python:request.columns.keys()"
+             tal:attributes="value col; selected python:col in request.sort"
+             tal:content="col">column</option>
+     </select>
+     Group on:
+     <select name=":group">
+      <option tal:repeat="col python:request.columns.keys()"
+             tal:attributes="value col; selected python:col in request.group"
+             tal:content="col">column</option>
+     </select>
+     <input type="submit" value="Redisplay">
     </form>
    </td>
   </tr>

diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
index d668e01e844e8f02de92629e4f694891f6fb6559..d07fbec972987567b7d27b302ccba443f0dd6241 100644 (file)
--- a/roundup/templates/classic/html/issue.item
+++ b/roundup/templates/classic/html/issue.item
@@ -39,31 +39,38 @@
 </tr>
 
 <tr class="form">
- <td width=1% nowrap align=right><span class="form-label">Assigned To</span></td>
- <td class="form-text" tal:content="structure issue/assignedto/menu">assignedto</td>
+ <td width=1% nowrap align=right>
+  <span class="form-label">Assigned To</span>
+ </td>
+ <td class="form-text" tal:content="structure issue/assignedto/menu">
+  assignedto menu
+ </td>
  <td>&nbsp;</td>
  <td>&nbsp;</td>
 </tr>
 
 <tr class="form">
- <td width=1% nowrap align=right><span class="form-label">Change Note</span></td>
- <td colspan=3 class="form-text"><textarea name="__note" wrap="hard" rows="5" cols="60"></textarea></td>
+ <td width=1% nowrap align=right> 
+  <span class="form-label">Change Note</span>
+ </td>
+ <td colspan=3 class="form-text">
+  <textarea name="__note" wrap="hard" rows="5" cols="60"></textarea>
+ </td>
 </tr>
 
 <tr class="form">
- <td width=1% nowrap align=right><span class="form-label">File</span></td>
- <td colspan=3 class="form-text"><input type="file" name="__file" size="60"></td>
+ <td width=1% nowrap align=right>
+  <span class="form-label">File</span>
+ </td>
+ <td colspan=3 class="form-text">
+  <input type="file" name="__file" size="60">
+ </td>
 </tr>
 
 <tr class="form">
  <td>&nbsp;</td>
- <td colspan=3 class="form-text" tal:condition="exists:item">
-  <input type="hidden" name=":action" value="edit">
-  <input type="submit" name="submit" value="Submit Changes">
- </td>
- <td colspan=3 class="form-text" tal:condition="not:exists:item">
-  <input type="hidden" name=":action" value="new">
-  <input type="submit" name="submit" value="Submit New Entry">
+ <td colspan=3 class="form-text" tal:content="structure issue/submit">
+  submit button will go here
  </td>
 </tr>
 
@@ -93,11 +100,11 @@
   </tr>
   <tr tal:repeat="file issue/files">
    <td>
-    <a href="" tal:attributes="href string:file${file/id}/${file/name}"
+    <a tal:attributes="href string:file${file/id}/${file/name}"
        tal:content="file/name">dld link</a>
    </td>
    <td>
-    <span tal:content="file/creator/username">creator's name</span>,
+    <span tal:content="file/creator">creator's name</span>,
     <span tal:content="file/creation">creation date</span>
    </td>
   </tr>

diff --git a/roundup/templates/classic/html/issue.search b/roundup/templates/classic/html/issue.search
index 6c10aa0d9290157c12fa7272acf41928a1a8cdfa..accf7aed62b41b5035f4aa799de3a28437c3216d 100644 (file)
--- a/roundup/templates/classic/html/issue.search
+++ b/roundup/templates/classic/html/issue.search
@@ -1,5 +1,6 @@
 
 <form method="GET" tal:attributes="action request/classname">
+<input type="hidden" name=":action" value="search">
 
 Columns you may display:
 <tal:block
@@ -18,9 +19,32 @@ Group on:
 <input type="radio" name=":group" tal:repeat="n request/group"
        tal:attributes="value n;
                        checked python:n in request.group">
+
+<br>
+Priority:
+<span tal:replace="structure issue/priority/menu" />
+
 <br>
-<input type="hidden" name=":action" value="searchform">
+Status:
+<select name="status">
+ <option value="dontcare">don't care</option>
+ <option value="-1,1,2,3,4,5,6,7">not resolved</option>
+ <option value="-1">not selected</option>
+ <option value="dontcare">------------</option>
+ <option tal:repeat="s db/status/list" tal:attributes="value s/id"
+   tal:content="s/name">status to filter on</option>
+</select>
+
 <br>
+Assigned To:
+<select name="assignedto">
+ <option value="dontcare">don't care</option>
+ <option tal:attributes="value request/user/id">assigned to me</option>
+ <option value="-1">unassigned</option>
+ <option value="-1">------------</option>
+ <option tal:repeat="s db/user/list" tal:attributes="value s/id"
+   tal:content="s/username">user to filter on</option>
+</select>
 
 <tal:block tal:repeat="n python:request.filterspec.keys()">
  Filter: <input tal:repeat="v python:request.filterspec[n]"

diff --git a/roundup/templates/classic/html/msg.item b/roundup/templates/classic/html/msg.item
index 2320531b050106f46be0bbf11ccef059b631e4fc..d1405ed49b44787bd6151b45a2735d0e22839f16 100644 (file)
--- a/roundup/templates/classic/html/msg.item
+++ b/roundup/templates/classic/html/msg.item
@@ -2,32 +2,41 @@
 <table border=0 cellspacing=0 cellpadding=2>
 
 <tr bgcolor="ffffea">
-    <td width=1% nowrap align=right><span class="form-label">Author</span></td>
-    <td class="form-text"><display call="plain('author')"></td>
+ <td width=1% nowrap align=right><span class="form-label">Author</span></td>
+ <td class="form-text" tal:content="msg/author"></td>
 </tr>
 
 <tr bgcolor="ffffea">
-    <td width=1% nowrap align=right><span class="form-label">Recipients</span></td>
-    <td class="form-text"><display call="plain('recipients')"></td>
+ <td width=1% nowrap align=right><span class="form-label">Recipients</span></td>
+ <td class="form-text" tal:content="msg/recipients"></td>
 </tr>
 
 <tr bgcolor="ffffea">
-    <td width=1% nowrap align=right><span class="form-label">Date</span></td>
-    <td class="form-text"><display call="plain('date')"></td>
+ <td width=1% nowrap align=right><span class="form-label">Date</span></td>
+ <td class="form-text" tal:content="msg/date"></td>
 </tr>
 
 <tr bgcolor="ffeaff">
  <td colspan=2 class="form-text">
-  <pre><display call="plain('content', escape=1)"></pre>
+  <pre tal:content="msg/content"></pre>
  </td>
 </tr>
 
 <property name="files">
 <tr class="strong-header"><td colspan=2><b>Files</b></td></tr>
-<tr><td colspan=2><display call="list('files')"></td></tr>
+<tr tal:repeat="file msg/files">
+ <td>
+  <a tal:attributes="href string:file${file/id}/${file/name}"
+     tal:content="file/name">dld link</a>
+ </td>
+ <td>
+  <span tal:content="file/creator">creator's name</span>,
+  <span tal:content="file/creation">creation date</span>
+ </td>
+</tr>
 </property>
 
 <tr class="history-header"><td colspan=2><b>History</b></td><tr>
-<tr><td colspan=2><display call="history()"></td></tr>
+<tr><td colspan="2" tal:content="structure msg/history">history</td></tr>
 
 </table>

diff --git a/roundup/templates/classic/html/user.item b/roundup/templates/classic/html/user.item
index 90e065ee679ee06c9860d09d9115d40dbfc7e2a8..d9e84deb9a882f11c074853afdaeba646c7822d8 100644 (file)
--- a/roundup/templates/classic/html/user.item
+++ b/roundup/templates/classic/html/user.item
@@ -51,13 +51,8 @@ You are not allowed to view this page.
 
  <tr class="form">
   <td>&nbsp;</td>
-  <td colspan=3 class="form-text" tal:condition="exists:item">
-   <input type="hidden" name=":action" value="edit">
-   <input type="submit" name="submit" value="Submit Changes">
-  </td>
-  <td colspan=3 class="form-text" tal:condition="not:exists:item">
-   <input type="hidden" name=":action" value="new">
-   <input type="submit" name="submit" value="Submit New Entry">
+  <td colspan=3 class="form-text" tal:content="structure user/submit">
+   submit button will go here
   </td>
  </tr>