X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fcalendar.html;h=77242037982762100a20e21bf0d8b453877c7fe3;hb=HEAD;hp=0f18203b639eab7ada07d69a98d71d56330d489a;hpb=ee89735cb3714dc7c3ec8bbd0643cf279ee9a1ef;p=plomtask

diff --git a/templates/calendar.html b/templates/calendar.html
index 0f18203..11ac2a8 100644
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -1,9 +1,78 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+
+
+
+{% block css %}
+tr.week_row td {
+  height: 0.3em;
+  background-color: black;
+  padding: 0;
+  margin: 0;
+  border-top: 0.2em solid white;
+}
+tr.month_row td {
+  border-top: 0.2em solid white;
+  color: white;
+  background-color: #555555;
+}
+table {
+  width: 100%;
+}
+tr.day_row td {
+  background-color: #cccccc;
+  border-top: 0.2em solid white;
+}
+td.day_name {
+  padding-right: 0.5em;
+}
+td.today {
+  font-weight: bold;
+}
+span.total_effort {
+  white-space: pre;
+}
+{% endblock %}
+
+
 
 {% block content %}
-<ul>
+<h3>calendar</h3>
+
+<p><a href="/calendar_txt">basic view</a></p>
+
+<form action="calendar" method="GET">
+from <input name="start" class="date" value="{{start}}" />
+to <input name="end" class="date" value="{{end}}" />
+<input type="submit" value="OK" />
+</form>
+<table>
 {% for day in days %}
-<li>{{day.date}} ({{day.weekday}})
+
+{% if day.first_of_month %}
+<tr class="month_row">
+<td colspan=2>{{ day.month_name }}</td>
+</tr>
+{% endif %}
+
+{% if day.weekday == "Monday" %}
+<tr class="week_row">
+<td colspan=2></td>
+</tr>
+{% endif %}
+
+<tr class="day_row">
+<td class="day_name {% if day.date == today %}today{% endif %}">
+<a href="day?date={{day.date}}">{{day.weekday|truncate(2,True,'',0)}} {% if day.date == today %} {% endif %}{{day.date}}</a>
+[<span class="total_effort">{{ '{:5.1f}'.format(day.total_effort) }}</span>]
+{{day.comment|e}}</td>
+</tr>
+
+{% for todo in day.calendarized_todos %}
+<tr>
+<td>[{% if todo.is_done %}X{% else %} {% endif %}] <a href="todo?id={{todo.id_}}">{{todo.title_then|e}}</a>{% if todo.comment %} · {{todo.comment|e}}{% endif %}</td>
+</tr>
+{% endfor %}
+
 {% endfor %}
-</ul>
+</table>
 {% endblock %}