For Todos, on Save check for auto-deletion by .effort < 0, and on removal check if...

[plomtask] / templates / calendar.html

diff --git a/templates/calendar.html b/templates/calendar.html
index eae103d9929ccc061b6eff1d296ecf2767325e81..77242037982762100a20e21bf0d8b453877c7fe3 100644 (file)
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -1,4 +1,6 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+
+
 
 {% block css %}
 tr.week_row td {
@@ -19,6 +21,8 @@ td.day_name {
 
 
 {% block content %}
+<h3>calendar</h3>
+
 <form action="calendar" method="GET">
 from <input name="start" value="{{start}}" />
 to <input name="end" value="{{end}}" />
@@ -45,6 +49,14 @@ to <input name="end" value="{{end}}" />
 <td>{{day.comment|e}}</td>
 </tr>
 
+{% for todo in day.calendarized_todos %}
+<tr>
+<td>[{% if todo.is_done %}X{% else %} {% endif %}]</td>
+<td><a href="todo?id={{todo.id_}}">{{todo.title.newest|e}}</td>
+<td>{{todo.comment|e}}</td>
+</tr>
+{% endfor %}
+
 {% endfor %}
 </table>
 {% endblock %}