X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/gitweb.css?a=blobdiff_plain;f=templates%2Fcalendar.html;h=4d672421329c95208cb1ca5050130c78065bfe9b;hb=5383b5cf1520a1cb66b4966dd4ee449a99f5e465;hp=3acdbc6fc2205e67e0c4e514130e4e33ad292e66;hpb=af769db012fc0cf590b565c3368102b2f6099394;p=plomtask

diff --git a/templates/calendar.html b/templates/calendar.html
index 3acdbc6..4d67242 100644
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -1,14 +1,62 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+
+
+
+{% block css %}
+tr.week_row td {
+  height: 0.1em;
+  background-color: black;
+  padding: 0;
+  margin: 0;
+}
+tr.month_row td {
+  border: 0.1em solid black;
+  text-align: center;
+}
+td.day_name {
+  padding-right: 0.5em;
+}
+{% endblock %}
+
+
 
 {% block content %}
+<h3>calendar</h3>
+
 <form action="calendar" method="GET">
 from <input name="start" value="{{start}}" />
 to <input name="end" value="{{end}}" />
 <input type="submit" value="OK" />
 </form>
-<ul>
+<table>
 {% for day in days %}
-<li><a href="day?date={{day.date}}">{{day.date}}</a> ({{day.weekday}}) {{day.comment|e}}
+
+{% if day.first_of_month %}
+<tr class="month_row">
+<td colspan=3>{{ day.month_name }}</td>
+</tr>
+{% endif %}
+
+{% if day.weekday == "Monday" %}
+<tr class="week_row">
+<td colspan=3></td>
+</tr>
+{% endif %}
+
+<tr>
+<td class="day_name">{{day.weekday|truncate(2,True,'',0)}}</td>
+<td><a href="day?date={{day.date}}">{{day.date}}</a></td>
+<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_then|e}}</td>
+<td>{{todo.comment|e}}</td>
+</tr>
+{% endfor %}
+
 {% endfor %}
-</ul>
+</table>
 {% endblock %}