X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=templates%2Fcalendar.html;h=11ac2a8816800eb0c11516610fe9e71eecda4027;hb=344d6c234e50953b36ac9fed2cfce8d4ba64a5b3;hp=eae103d9929ccc061b6eff1d296ecf2767325e81;hpb=12be63c6ef58282cb6b7d5b7bc2eabe8946a1bfc;p=plomtask

diff --git a/templates/calendar.html b/templates/calendar.html
index eae103d..11ac2a8 100644
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -1,27 +1,48 @@
-{% extends 'base.html' %}
+{% extends '_base.html' %}
+
+
 
 {% block css %}
 tr.week_row td {
-  height: 0.1em;
+  height: 0.3em;
   background-color: black;
   padding: 0;
   margin: 0;
+  border-top: 0.2em solid white;
 }
 tr.month_row td {
-  border: 0.1em solid black;
-  text-align: center;
+  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 %}
+<h3>calendar</h3>
+
+<p><a href="/calendar_txt">basic view</a></p>
+
 <form action="calendar" method="GET">
-from <input name="start" value="{{start}}" />
-to <input name="end" value="{{end}}" />
+from <input name="start" class="date" value="{{start}}" />
+to <input name="end" class="date" value="{{end}}" />
 <input type="submit" value="OK" />
 </form>
 <table>
@@ -29,21 +50,28 @@ to <input name="end" value="{{end}}" />
 
 {% if day.first_of_month %}
 <tr class="month_row">
-<td colspan=3>{{ day.month_name }}</td>
+<td colspan=2>{{ day.month_name }}</td>
 </tr>
 {% endif %}
 
 {% if day.weekday == "Monday" %}
 <tr class="week_row">
-<td colspan=3></td>
+<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 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>
+<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 %}
 </table>