Slightly improve and re-organize Condition tests.

[plomtask] / templates / _macros.html

diff --git a/templates/_macros.html b/templates/_macros.html
index a19c06381320461baf7b1622b475d7d0d244440b..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 %}