Minor template improvements.

diff --git a/templates/_base.html b/templates/_base.html
index 7c1050693747b13e4c46452d26d192ace91b0e46..0d2debe981a931eece26a1a8a60b2b74eb15a857 100644 (file)
--- a/templates/_base.html
+++ b/templates/_base.html
@@ -23,6 +23,9 @@ td, th, tr, table {
   padding: 0;
   border-collapse: collapse;
 }
   padding: 0;
   border-collapse: collapse;
 }

+th, td {
+  padding-right: 1em;
+}

 a {
   color: black;
 }
 a {
   color: black;
 }

diff --git a/templates/day.html b/templates/day.html
index 0165c9ede5593a8cfde064c72d6bb45fc779a8ba..627923b2a2b34c75d57f204f97a2d5b86a729c33 100644 (file)
--- a/templates/day.html
+++ b/templates/day.html
@@ -37,7 +37,7 @@ td.todo_line {
   height: 1.7em;
 }
 tr.inactive td.todo_line {
   height: 1.7em;
 }
 tr.inactive td.todo_line {

-  background-color: #efefef;
+  background-color: #dddddd;

 }
 td.left_border {
   border-left: 1px solid black;
 }
 td.left_border {
   border-left: 1px solid black;


@@ -45,8 +45,11 @@ td.left_border {
 td.right_border {
   border-right: 1px solid black;
 }
 td.right_border {
   border-right: 1px solid black;
 }

-input {
-  height: 100%;
+input[type="text"] {
+  width: 98%;
+}
+input[name="day_comment"] {
+  width: 100em;

 }
 {% endblock %}
 
 }
 {% endblock %}
 


@@ -82,14 +85,14 @@ O 
 </td>
 
 {% for condition in conditions_present|reverse %}
 </td>
 
 {% for condition in conditions_present|reverse %}

-<td class="cond_line_{{(conditions_present|length - loop.index) % 3}} {% if condition in node.todo.enables or condition in node.todo.disables %}min_width{% endif %}">{% if condition in node.todo.enables %}&nbsp;+{% elif condition in node.todo.disables %}&nbsp;!{% endif %}</td>
+<td class="cond_line_{{(conditions_present|length - loop.index) % 3}}">{% if condition in node.todo.enables %}&nbsp;+{% elif condition in node.todo.disables %}&nbsp;!{% endif %}</td>

 {% endfor %}
 
 <td colspan=2>
 {% if node.seen %}
 {{node.todo.comment|e}}
 {% else %}
 {% endfor %}
 
 <td colspan=2>
 {% if node.seen %}
 {{node.todo.comment|e}}
 {% else %}

-<input name="comment" value="{{node.todo.comment|e}}" style="width: 100%" />
+<input name="comment" type="text" value="{{node.todo.comment|e}}" />

 {% endif %}
 </td>
 
 {% endif %}
 </td>
 


@@ -144,16 +147,19 @@ O&nbsp;
 <a href="day?date={{day.prev_date}}">prev</a> | <a href="day?date={{day.next_date}}">next</a>
 </p>
 <form action="day?date={{day.date}}" method="POST">
 <a href="day?date={{day.prev_date}}">prev</a> | <a href="day?date={{day.next_date}}">next</a>
 </p>
 <form action="day?date={{day.date}}" method="POST">

-comment: <input name="day_comment" value="{{day.comment|e}}" />
-<input type="submit" value="OK" /><br />
-add todo: <input name="new_todo" list="processes" autocomplete="off" />
+
+<p>
+comment:
+<input name="day_comment" value="{{day.comment|e}}" />
+<input type="submit" value="OK" /></td>
+</p>

 
 <h4>to do</h4>
 
 <table>
 
 <tr>
 
 <h4>to do</h4>
 
 <table>
 
 <tr>

-<th colspan={{ conditions_present|length + 3 + conditions_present|length }}>states</th>
+<th colspan={{ conditions_present|length + 3 + conditions_present|length }}>conditions</th>

 <th>add enabler</th>
 <th>add disabler</th>
 </tr>
 <th>add enabler</th>
 <th>add disabler</th>
 </tr>


@@ -168,12 +174,12 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% elif outer_loop.index < loop.index %}
 <td class="cond_line_{{outer_loop.index0 % 3}}">
 {% else %}
 {% elif outer_loop.index < loop.index %}
 <td class="cond_line_{{outer_loop.index0 % 3}}">
 {% else %}

-<td class="cond_line_{{outer_loop.index0 % 3}} cond_line_corner">X
+<td class="cond_line_{{outer_loop.index0 % 3}} cond_line_corner">×

 {% endif %}
 </td>
 {% endfor %}
 
 {% endif %}
 </td>
 {% endfor %}
 

-<td class="cond_line_{{loop.index0 % 3}}">[{% if condition.is_active %}X{% else %}&nbsp;{% endif %}]</td>
+<td class="cond_line_{{loop.index0 % 3}}"><input type="checkbox" disabled{% if condition.is_active %} checked{% endif %}></td>

 <td colspan=2 class="cond_line_{{loop.index0 % 3}}"><a href="condition?id={{condition.id_}}">{{condition.title.at(day.date)|e}}</a></td>
 
 {% for _ in conditions_present %}
 <td colspan=2 class="cond_line_{{loop.index0 % 3}}"><a href="condition?id={{condition.id_}}">{{condition.title.at(day.date)|e}}</a></td>
 
 {% for _ in conditions_present %}


@@ -182,7 +188,7 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% elif outer_loop.index0 + loop.index > conditions_present|length %}
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}">
 {% else %}
 {% elif outer_loop.index0 + loop.index > conditions_present|length %}
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}">
 {% else %}

-<td class="cond_line_{{outer_loop.index0 % 3}} cond_line_corner">&nbsp;X
+<td class="cond_line_{{outer_loop.index0 % 3}} cond_line_corner">&nbsp;×

 {% endif %}
 {% endfor %}
 
 {% endif %}
 {% endfor %}
 


@@ -201,7 +207,19 @@ add todo: <input name="new_todo" list="processes" autocomplete="off" />
 {% for condition in conditions_present %}
 <td class="cond_line_{{loop.index0 % 3}}"></td>
 {% endfor %}
 {% for condition in conditions_present %}
 <td class="cond_line_{{loop.index0 % 3}}"></td>
 {% endfor %}

-<th class="left_border right_border vertical_borders" colspan=3>doables</th>
+<th colspan=3>doables</th>
+{% for condition in conditions_present %}
+<td class="cond_line_{{(conditions_present|length - loop.index) % 3}}"></td>
+{% endfor %}
+<td colspan=2></td>
+</tr>
+<tr>
+{% for condition in conditions_present %}
+<td class="cond_line_{{loop.index0 % 3}}"></td>
+{% endfor %}
+<td class="left_border"></td>
+<td>add:</td>
+<td class="right_border" ><input type="text" name="new_todo" list="processes"></td>

 {% for condition in conditions_present %}
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}"></td>
 {% endfor %}
 {% for condition in conditions_present %}
 <td class="cond_line_{{(conditions_present|length - loop.index) % 3}}"></td>
 {% endfor %}