Slightly improve and re-organize Condition tests.

[plomtask] / templates / _macros.html

diff --git a/templates/_macros.html b/templates/_macros.html
index 14395914052efd6511eddc6cc82bbe947dda62c4..55ab626b1fe6bbb7f49b3ab41c9dbb24bf56d792 100644 (file)
--- a/templates/_macros.html
+++ b/templates/_macros.html
@@ -1,16 +1,27 @@
 {% macro edit_buttons() %}
+<div class="edit_buttons">
 <input class="btn-harmless" type="submit" name="update" value="update" />
 <div class="btn-to-right">
 <input class="btn-dangerous" type="submit" name="delete" value="delete" />
 </div>
+</div>
 {% endmacro %}
 
 
 
-{% macro datalist_of_titles(title, candidates) %}
+{% macro datalist_of_titles(title, candidates, historical=false, with_comments=false) %}
 <datalist id="{{title}}">
 {% for candidate in candidates %}
-<option value="{{candidate.id_}}">{{candidate.title.newest|e}}</option>
+<option value="{{candidate.id_}}">
+{% if historical is true %}
+{{candidate.title_then|e}}
+{% else %}
+{{candidate.title.newest|e}}
+{% endif %}
+{% if with_comments and candidate.comment %}
+/ {{candidate.comment}}
+{% endif %}
+</option>
 {% endfor %}
 </datalist>
 {% endmacro %}
@@ -39,6 +50,7 @@
 
 {% macro history_page(item_name, item, attribute_name, attribute, as_pre=false) %}
 <h3>{{item_name}} {{attribute_name}} history</h3>
+<form action="{{item_name}}_{{attribute_name}}s?id={{item.id_}}" method="POST">
 <table>
 
 <tr>
@@ -46,12 +58,15 @@
 <td><a href="{{item_name}}?id={{item.id_}}">{{item.title.newest|e}}</a></td>
 </tr>
 
+
 {% for date in attribute.history.keys() | sort(reverse=True) %}
 <tr>
-<th>{{date | truncate(19, True, '') }}</th>
+<td><input name="at:{{date}}" class="timestamp" value="{{date|truncate(19, True, '', 0)}}"></td>
 <td>{% if as_pre %}<pre>{% endif %}{{attribute.history[date]}}{% if as_pre %}</pre>{% endif %}</td>
 </tr>
 {% endfor %}
 
 </table>
+<input class="btn-harmless" type="submit" name="update" value="update" />
+</form>
 {% endmacro %}