Improve accounting scripts.

[misc] / todo_templates / task.html

diff --git a/todo_templates/task.html b/todo_templates/task.html
index 7a8f981fef608cbad413a66b866ad452cbbfdc88..2666d0da260cb1ea2ba1109adb8403b559678fe5 100644 (file)
--- a/todo_templates/task.html
+++ b/todo_templates/task.html
@@ -1,18 +1,25 @@
 {% extends 'base.html' %}
 
 {% block css %}
-th { padding-right: 1em; }
+tr.toplevel th { padding-right: 1em; }
+tr.toplevel td, tr.toplevel th { padding-top: 1em; }
+tr.lowlevel td, tr.lowlevel th { padding-top: 0em; }
 {% endblock %}
 
 {% block content %}
 <h3>edit task</h3>
 
-<form id="form_to_watch" action="task" method="POST">
+<form action="task" method="POST">
 <input type="hidden" name="task_id" value="{{ task.id_ }}" />
-<input type="hidden" name="return_to" value="{{ return_to }}" />
 <table>
 
-<tr>
+<tr class="toplevel">
+<th>add as todo</th>
+<td><input name="add_as_todo" type="checkbox" /> to {{ selected_date }}</td>
+<input name="selected_date" type="hidden" value="{{ selected_date }}" />
+</tr>
+
+<tr class="toplevel">
 <th>title</th>
 <td class="input">
 <input name="title" type="text" value="{{ task.title.now|e }}" size=100 />
@@ -27,14 +34,14 @@ th { padding-right: 1em; }
 </td>
 </tr>
 
-<tr>
+<tr class="toplevel">
 <th>comment</th>
 <td class="input">
-<textarea name="comment" cols=100>{{task.comment|e}}</textarea>
+<textarea name="comment" cols=100 rows=5>{{task.comment|e}}</textarea>
 </td>
 </tr>
 
-<tr>
+<tr class="toplevel">
 <th>default effort</th>
 <td class="input">
 {% if task.subtasks %}
@@ -53,15 +60,13 @@ th { padding-right: 1em; }
 </td>
 </tr>
 
-<tr>
+<tr class="toplevel">
 <th>tags</th>
 <td>
-{% for tag in tags | sort %}
-<input type="checkbox" name="tag_{{tag|e}}"{% if tag in task.tags.now %} checked{% endif %}/> {{ tag }}
-<br />
-{% endfor %}
-add: <input name="joined_tags" type="text" value="" size=100>
-<br />
+       <!--
+add: <input name="tag" value="" size=15 >
+       -->
+add: {{ macros.tagselection(submit_name='tag', selected_tags=task.tags.now, all_tags=tags) }}
 <details>
 <summary>history</summary>
 <ul>
@@ -73,13 +78,26 @@ add: <input name="joined_tags" type="text" value="" size=100>
 </td>
 </tr>
 
-<tr>
+{% if task.parents %}
+<tr class="toplevel">
+<th>parents</th>
+<td>
+<ul>
+{% for parent in task.parents %}
+<li><a href="task?id={{parent.id_}}">{{parent.title.now}}</a>
+{% endfor %}
+</ul>
+</td>
+</tr>
+{% endif %}
+    
+<tr class="toplevel">
 <th>children</th>
 <td>
+{% if task.subtasks %}
 <table>
-
 {% for subtask in task.subtasks %}
-<tr>
+<tr class="lowlevel">
 <td>
 <input name="subtask" type="checkbox" value="{{subtask.id_}}" checked/>
 </td>
@@ -88,37 +106,22 @@ add: <input name="joined_tags" type="text" value="" size=100>
 </td>
 </tr>
 {% endfor %}
-
-<tr>
-<th colspan=2>---</th>
-</tr>
-
-{% for subtask in filtered_tasks %}
-<tr>
-<td>
-<input name="subtask" type="checkbox" value="{{subtask.id_}}"/>
-</td>
-<td>
-<a href="task?id={{subtask.id_}}">{{subtask.title.now}}</a>
-</td>
-</tr>
-{% endfor %}
-
 </table>
+{% endif %}
+<br />
+add: <input name="subtask" list="tasks" />
 </td>
 </tr>
+<datalist id="tasks">
+{% for subtask in filtered_tasks %}
+<option value="{{subtask.id_}}">{{subtask.title.now}}</option>
+{% endfor %}
+</datalist>
 
 </table>
-<input class="update" type="submit" name="update" value="update" />
-<hr />
-{% include 'tagfilters.html' %}
-<br />
-search: <input name="search" value="{{search|e}}" />
-<input type="submit" name="filter" value="filter" />
+<input id="update_button" class="update" type="submit" name="update" value="update" />
+<div class="delete">
+<input class="delete" type="submit" name="delete" value="delete" />
+</div>
 </form>
-
-{% include 'watch_form.html' %}
-<script>
-mere_filter_inputs = mere_filter_inputs.concat(['search']);
-</script> 
 {% endblock %}