Improve accounting scripts.

[misc] / todo_templates / calendar.html

diff --git a/todo_templates/calendar.html b/todo_templates/calendar.html
index bc77ccdb0669aed74dd67be1fa6ff7828301958a..343019aa6387b8254a2bd3fce7ef39ec390bfec4 100644 (file)
--- a/todo_templates/calendar.html
+++ b/todo_templates/calendar.html
@@ -1,13 +1,18 @@
 {% extends 'base.html' %}
 
+
+
 {% block css %}
 #filter { margin-bottom: 1em; }
 tr.month_row td { color: white; background-color: #555555; text-align: center; }
 tr.week_row td { height: 0.1em; background-color: black; }
 tr.day_row td { background-color: #cccccc; }
 span.selected_date { font-weight: bold; }
+span.todos_sum { white-space: pre; }
 {% endblock %}
 
+
+
 {% block content %}
 <h3>calendar</h3>
 <form action="calendar" method="POST">
@@ -36,9 +41,9 @@ to: <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeho
 <tr class="day_row">
 <td colspan=3>
 <span {% if date == selected_date %}class="selected_date"{% endif %}>
-<a href="do_todos?date={{date}}&hide_unchosen=1">{{ day.weekday }} {{ date }}</a>
+<a href="day_todos?date={{date}}">{{ day.weekday }} {{ date }}</a>
 </span>
-<span style="white-space: pre; ">|{{ '{:5.1f}'.format(day.todos_sum)}}|</span>
+<span class="todos_sum">|{{ '{:5.1f}'.format(day.todos_sum)}}|</span>
 {{ day.comment|e }}
 </td>
 </tr>
@@ -48,7 +53,7 @@ to: <input name="end" {% if end_date %}value="{{ end_date }}"{% endif %} placeho
 <tr>
 <td>
 {% if "cancelled" in todo.tags %}<s>{% endif %}
-[{% if todo.done and not "cancelled" in todo.tags %}✓{% else %} {% endif %}]
+{{ macros.doneness_string(todo, true) }}
 <a href="todo?id={{todo.id_}}">
 {% if "deadline" in todo.tags %}DEADLINE: {% endif %}
 {{ todo.title|e }}