Mostly superficial template design improvements.

diff --git a/templates/_base.html b/templates/_base.html
index d192631e55befd85dde6a0a97a914fefc891e143..0e384651d0f392a46ad97046849cf3f3f7955d07 100644 (file)
--- a/templates/_base.html
+++ b/templates/_base.html
@@ -19,6 +19,7 @@ div.btn-to-right {
 }
 td, th, tr, table {
   vertical-align: top;
+  margin-top: 1em;
   padding: 0;
 }
 {% block css %}

diff --git a/templates/calendar.html b/templates/calendar.html
index d7ec545bf3eb075b19cdce76d1fd7f9a7a9cf55d..46742624270f9c1c8b10a528c2af18d4f6a2cd32 100644 (file)
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -4,7 +4,7 @@
 
 {% block css %}
 tr.week_row td {
-  height: 0.1em;
+  height: 0.3em;
   background-color: black;
   padding: 0;
   margin: 0;
@@ -12,6 +12,11 @@ tr.week_row td {
 tr.month_row td {
   border: 0.1em solid black;
   text-align: center;
+  color: white;
+  background-color: #555555;
+}
+tr.day_row td {
+  background-color: #cccccc;
 }
 td.day_name {
   padding-right: 0.5em;
@@ -36,27 +41,23 @@ 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>
-<td class="day_name">{{day.weekday|truncate(2,True,'',0)}}</td>
-<td{% if day.date == today %} class="today"{% endif %}><a href="day?date={{day.date}}">{{day.date}}</a></td>
-<td>{{day.comment|e}}</td>
+<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> {{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>
+<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 %}
 

diff --git a/templates/todo.html b/templates/todo.html
index 80eb5c7bd356e8b93be5a2a02119f11c1d16fb13..0d4773c0c25b0d1c70f12a9b4654eb8cd2cbe081 100644 (file)
--- a/templates/todo.html
+++ b/templates/todo.html
@@ -77,5 +77,9 @@
 </form>
 
 {{ macros.datalist_of_titles("condition_candidates", condition_candidates) }}
-{{ macros.datalist_of_titles("todo_candidates", todo_candidates) }}
+<datalist id="todo_candidates">
+{% for candidate in todo_candidates %}
+<option value="{{candidate.id_}}">{{candidate.title.newest|e}} {{candidate.comment|e}}</option>
+{% endfor %}
+</datalist>
 {% endblock %}