Formatting tweaks.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1064 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
@@ -30,10 +30,11 @@ $form.imageSubmit("action", "claim", "images/claim.png", "Claim this task")
|
||||
</tr>
|
||||
|
||||
#if (!$string.blank($notes))
|
||||
<tr><td colspan="4"> </td></tr>
|
||||
<tr><td style="border-bottom: 1px, solid" colspan="4"><i>Notes</i></td></tr>
|
||||
<tr><td> </td>
|
||||
<td colspan="3">
|
||||
<p>
|
||||
<code>$notes</code>
|
||||
<pre>$notes</pre>
|
||||
</td></tr>
|
||||
#end
|
||||
|
||||
|
||||
+25
-25
@@ -4,9 +4,6 @@
|
||||
#if ($task)
|
||||
|
||||
<p>
|
||||
<table cellpadding="0" cellspacing="10"> <!-- two colum layout table -->
|
||||
<tr><td valign="top">
|
||||
|
||||
<table cellpadding="2" cellspacing="0" border="0">
|
||||
|
||||
#if ($task.completor)
|
||||
@@ -26,13 +23,13 @@ $form.submit("submit", "Reopen")</td></tr>
|
||||
$form.fixedHidden("action", "update")
|
||||
<input type="hidden" name="task" value="$task.taskId">
|
||||
|
||||
<tr><td colspan="3">Summary:<br>
|
||||
<textarea name="summary" rows="5" cols="50">
|
||||
<tr><td rowspan="3" valign="top">Summary:<br>
|
||||
<textarea name="summary" rows="8" cols="50">
|
||||
$task.summary
|
||||
</textarea>
|
||||
</td></tr>
|
||||
</td>
|
||||
|
||||
<tr><td>Category:<br>
|
||||
<td valign="top">Category:<br>
|
||||
$form.text("category", "size='10'", $task.category)
|
||||
</td>
|
||||
|
||||
@@ -44,6 +41,10 @@ $form.text("category", "size='10'", $task.category)
|
||||
$form.option("complexity", "Subsystem", "Subsystem", $task.complexity)
|
||||
$form.option("complexity", "Major refactor", "Major refactor", $task.complexity)
|
||||
</select>
|
||||
</td></tr>
|
||||
|
||||
<tr><td valign="top">Creator:<br>
|
||||
$form.text("creator", "size='10'", $task.creator)
|
||||
</td>
|
||||
|
||||
<td>Priority:<br>
|
||||
@@ -57,25 +58,24 @@ $form.text("category", "size='10'", $task.category)
|
||||
</select>
|
||||
</td></tr>
|
||||
|
||||
<tr><td>Creator:<br>
|
||||
$form.text("creator", "size='10'", $task.creator)
|
||||
</td>
|
||||
<td> </td>
|
||||
<td>Owner:<br>
|
||||
<tr><td>Owner:<br>
|
||||
#if ($task.owner)
|
||||
$form.text("owner", "size='10'", $task.owner)
|
||||
#else
|
||||
$form.text("owner", "size='10'", "")
|
||||
#end
|
||||
</td>
|
||||
<td> </td></tr>
|
||||
|
||||
<tr><td colspan="3" align="right" bgcolor="$scolor">
|
||||
<tr><td colspan="4" align="right" bgcolor="$scolor">
|
||||
$form.submit("submit", "Update")</td></tr>
|
||||
</form>
|
||||
</table>
|
||||
|
||||
<tr><td colspan="3"> </td></tr>
|
||||
<tr><td colspan="3">Other actions:</td></tr>
|
||||
<tr><td colspan="3" align="right" bgcolor="$scolor">
|
||||
<p>
|
||||
<table cellpadding="2" cellspacing="0" border="0">
|
||||
<tr><td>Other actions:</td></tr>
|
||||
<tr><td align="right" bgcolor="$scolor">
|
||||
|
||||
<form action="edit.wm">
|
||||
$form.fixedHidden("action", "delete")
|
||||
@@ -84,33 +84,36 @@ $form.submit("submit", "Delete")
|
||||
</form>
|
||||
|
||||
</td></tr>
|
||||
</table>
|
||||
|
||||
</td><td valign="top"> <!-- two colum layout table -->
|
||||
|
||||
<table cellpadding="2" cellspacing="0" border="0">
|
||||
<tr><td> </td></tr>
|
||||
|
||||
<form action="edit.wm">
|
||||
$form.fixedHidden("action", "addnote")
|
||||
<input type="hidden" name="task" value="$task.taskId">
|
||||
|
||||
<tr><td>Add a note:<br>
|
||||
<textarea name="note" rows="5" cols="50">
|
||||
<code>
|
||||
<textarea name="note" rows="5" cols="80" wrap="hard">
|
||||
</textarea>
|
||||
</code>
|
||||
</td></tr>
|
||||
|
||||
<tr><td align="right" bgcolor="$scolor">
|
||||
$form.submit("submit", "Add")</td></tr>
|
||||
</form>
|
||||
|
||||
<tr><td> </td></tr>
|
||||
|
||||
<form action="edit.wm">
|
||||
$form.fixedHidden("action", "editnotes")
|
||||
<input type="hidden" name="task" value="$task.taskId">
|
||||
|
||||
<tr><td>Notes:<br>
|
||||
<textarea name="notes" rows="10" cols="50">
|
||||
<code>
|
||||
<textarea name="notes" rows="10" cols="80" wrap="hard">
|
||||
$task.notes
|
||||
</textarea>
|
||||
</code>
|
||||
</td></tr>
|
||||
|
||||
<tr><td align="right" bgcolor="$scolor">
|
||||
@@ -119,9 +122,6 @@ $form.submit("submit", "Update")</td></tr>
|
||||
|
||||
</table>
|
||||
|
||||
</td></tr> <!-- two colum layout table -->
|
||||
</table>
|
||||
|
||||
#end
|
||||
|
||||
#import ("/footer.wm")
|
||||
|
||||
+42
-42
@@ -3,23 +3,9 @@
|
||||
|
||||
<p>
|
||||
|
||||
<table cellpadding="0" cellspacing="15" border="0">
|
||||
<tr><td width="50%"><b>Owned tasks:</b></td>
|
||||
|
||||
<td width="50%"><b>
|
||||
#if ($query)
|
||||
Tasks matching '$query':
|
||||
#else
|
||||
Outstanding tasks:
|
||||
#if ($expand == "all")
|
||||
<a href="index.wm">[trim]</a>
|
||||
#else
|
||||
<a href="index.wm?expand=all">[show all]</a>
|
||||
#end
|
||||
#end
|
||||
</b></td></tr>
|
||||
|
||||
<table cellpadding="0" cellspacing="0" border="0">
|
||||
<tr><td valign="top">
|
||||
<b>Owned tasks:</b>
|
||||
<table cellpadding="2" cellspacing="0" border="0" width="100%">
|
||||
|
||||
#foreach ($otask in $otasks)
|
||||
@@ -33,30 +19,28 @@ $ocats.clear()
|
||||
<form action="index.wm">
|
||||
$form.fixedHidden("action", "complete")
|
||||
$form.fixedHidden("task", "$task.taskId")
|
||||
#if ($vidx%2 == 0)
|
||||
#set ($rowcolor = "#FFFFFF")
|
||||
#else
|
||||
#set ($rowcolor = "#EEEEEE")
|
||||
#end
|
||||
|
||||
#if ($ocats.checkCategory($task.complexity))
|
||||
<tr><td colspan="4" class="small">$task.complexity</td></tr>
|
||||
<tr><td colspan="4" class="small" style="border-bottom: 1px solid"><i>$task.complexity</i></td></tr>
|
||||
#set ($border = "")
|
||||
#else
|
||||
#set ($border = 'style="border-top: 1px solid"')
|
||||
#end
|
||||
|
||||
<tr bgcolor="$rowcolor"><td>
|
||||
<tr><td>
|
||||
#if ($username == $task.owner)
|
||||
$form.imageSubmit("submit", "", "images/complete.png", "Mark as completed")
|
||||
#else
|
||||
|
||||
#end
|
||||
</td>
|
||||
<td>$task.summary
|
||||
<td $border>$task.summary
|
||||
#if (!$string.blank($task.notes))
|
||||
<a href="detail.wm?task=$task.taskId">[...]</a>
|
||||
#end
|
||||
</td>
|
||||
<td valign="top">$task.getDisplayCategory()</td>
|
||||
<td valign="top"><a href="edit.wm?task=$task.taskId">
|
||||
<td valign="top" $border>$task.getDisplayCategory()</td>
|
||||
<td valign="top" $border><a href="edit.wm?task=$task.taskId">
|
||||
<img src="images/edit.png" border="0"></a></td></tr>
|
||||
</form>
|
||||
#end
|
||||
@@ -66,7 +50,23 @@ $form.imageSubmit("submit", "", "images/complete.png", "Mark as completed")
|
||||
<p>
|
||||
<center class="small">Check the box to mark a task as completed.</center>
|
||||
|
||||
</td><td valign="top">
|
||||
</td>
|
||||
|
||||
<td width="15"> </td>
|
||||
|
||||
<td valign="top">
|
||||
<b>
|
||||
#if ($query)
|
||||
Tasks matching '$query':
|
||||
#else
|
||||
Outstanding tasks:
|
||||
#if ($expand == "all")
|
||||
<a href="index.wm">[trim]</a>
|
||||
#else
|
||||
<a href="index.wm?expand=all">[show all]</a>
|
||||
#end
|
||||
#end
|
||||
</b>
|
||||
|
||||
<table cellpadding="2" cellspacing="0" border="0" width="100%">
|
||||
#foreach ($xtask in $xtasks)
|
||||
@@ -88,24 +88,22 @@ $xcats.clear()
|
||||
$form.fixedHidden("task", "$task.taskId")
|
||||
|
||||
#if ($xcats.checkCategory($task.complexity))
|
||||
<tr><td colspan="4" class="small">$task.complexity</td></tr>
|
||||
<tr><td colspan="4" class="small" style="border-bottom: 1px solid"><i>$task.complexity</i></td></tr>
|
||||
#set ($border = "")
|
||||
#else
|
||||
#set ($border = 'style="border-top: 1px solid"')
|
||||
#end
|
||||
|
||||
#if ($vidx%2 == 0)
|
||||
#set ($rowcolor = "#FFFFFF")
|
||||
#else
|
||||
#set ($rowcolor = "#EEEEEE")
|
||||
#end
|
||||
<tr bgcolor="$rowcolor">
|
||||
<tr>
|
||||
<td>$form.imageSubmit("action", "claim", "images/claim.png", "Claim this task")</td>
|
||||
<td>$task.summary
|
||||
<td $border>$task.summary
|
||||
<span class="small">[$task.creator]</span>
|
||||
#if (!$string.blank($task.notes))
|
||||
<a href="detail.wm?task=$task.taskId">[...]</a>
|
||||
#end
|
||||
</td>
|
||||
<td valign="top">$task.getDisplayCategory()</td>
|
||||
<td valign="top"><a href="edit.wm?task=$task.taskId">
|
||||
<td valign="top" $border>$task.getDisplayCategory()</td>
|
||||
<td valign="top" $border><a href="edit.wm?task=$task.taskId">
|
||||
<img src="images/edit.png" border="0"></a></td>
|
||||
</tr>
|
||||
</form>
|
||||
@@ -127,12 +125,10 @@ Filter on single word:<br>
|
||||
|
||||
</td></tr>
|
||||
|
||||
<tr><td colspan="2"> </td></tr>
|
||||
|
||||
<tr><td><b>Recent completed tasks:</b></td>
|
||||
<td><b>Create new task:</b></td></tr>
|
||||
<tr><td colspan="3"> </td></tr>
|
||||
|
||||
<tr><td valign="top">
|
||||
<b>Recent completed tasks:</b>
|
||||
<table cellpadding="2" cellspacing="0" border="0" width="100%">
|
||||
#foreach ($task in $dtasks)
|
||||
#if ($vidx%2 == 0)
|
||||
@@ -154,8 +150,12 @@ Filter on single word:<br>
|
||||
#end
|
||||
</table>
|
||||
|
||||
</td><td valign="top">
|
||||
</td>
|
||||
|
||||
<td> </td>
|
||||
|
||||
<td valign="top">
|
||||
<b>Create new task:</b>
|
||||
<form action="index.wm">
|
||||
$form.fixedHidden("action", "create")
|
||||
|
||||
|
||||
@@ -21,3 +21,8 @@ pre, code {
|
||||
.small {
|
||||
font-size: small;
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
border-width: 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user