{% block css %}
-td, th, tr, table {
- padding: 0;
- margin: 0;
-}
table {
border-collapse: collapse;
}
th {
border: 1px solid black;
}
-td.cond_line_0 {
+td.cond_line_0, td.cond_line_1, td.cond_line_2 {
+ padding: 0;
border-top: 1px solid white;
- background-color: #dddddd;
+}
+td.cond_line_0 {
+ background-color: #bfbfbf;
}
td.cond_line_1 {
- border-top: 1px solid white;
- background-color: #efefef;
+ background-color: #dfdfdf;
}
td.cond_line_2 {
- border-top: 1px solid white;
background-color: #fffff;
}
td.cond_line_corner {
text-overflow: clip;
}
td.todo_line {
- border-bottom: 1px solid #dddddd;
+ border-bottom: 1px solid #bfbfbf;
height: 1.7em;
}
-tr.inactive td.todo_line {
- background-color: #efefef;
+tr.inactive > td.todo_line {
+ background-color: #bfbfbf;
+}
+tr.hidden_undone > td, tr.hidden_undone a {
+ color: #9f9f9f;
}
td.left_border {
border-left: 1px solid black;
td.right_border {
border-right: 1px solid black;
}
-input {
- height: 100%;
+input.ablers {
+ width: 50em;
}
{% endblock %}
</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 %} +{% elif condition in node.todo.disables %} !{% endif %}</td>
+<td class="cond_line_{{(conditions_present|length - loop.index) % 3}}">{% if condition in node.todo.enables %} +{% elif condition in node.todo.disables %} !{% endif %}</td>
{% 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>
{% macro show_node_done(node, indent, path) %}
-{% if node.todo.is_done %}
-
-<tr>
-{% if path|length > 0 and not path[-1].todo.is_done %}
+{% if node.todo.has_doneness_in_path %}
+<tr{% if not node.todo.is_done %} class="hidden_undone"{% endif %}>
<td>
-({% for path_node in path %}<a href="todo?id={{path_node.todo.id_}}">{{path_node.todo.title_then|e}}</a> <- {% endfor %})
-</td>
-</tr>
-
-<tr>
-<td>
- +
-{% else %}
-<td>
-{% for i in range(indent) %} {% endfor %} +
-{% endif %}
-{% if node.seen %}({% endif %}<a href="todo?id={{node.todo.id_}}">{{node.todo.title_then|e}}</a> {% if node.todo.comment|length > 0 %}[{{node.todo.comment|e}}]{% endif %}{% if node.seen %}){% endif %}
+{% for i in range(indent) %} {% endfor %} +
+{% if not node.todo.is_done %}({% endif %}<a href="todo?id={{node.todo.id_}}">{{node.todo.title_then|e}}</a>{% if not node.todo.is_done %}){% endif %}
</td>
+<td>{{node.todo.comment|e}}</td>
</tr>
-{% endif %}
{% if not node.seen %}
{% for child in node.children %}
-{{ show_node_done(child, indent+1, path + [node]) }}
+{{ show_node_done(child, indent+1) }}
{% endfor %}
{% endif %}
-
+{% endif %}
{% endmacro %}
<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" type="text" value="{{day.comment|e}}" />
+<input type="submit" value="OK" /></td>
+</p>
<h4>to do</h4>
+<p>
+add: <input type="text" name="new_todo" list="processes">
+</p>
+
<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>
{% 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 %}
-<td class="cond_line_{{loop.index0 % 3}}">[{% if condition.is_active %}X{% else %} {% 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 %}
{% 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"> X
+<td class="cond_line_{{outer_loop.index0 % 3}} cond_line_corner"> ×
{% endif %}
{% endfor %}
{% set list_name = "todos_for_%s"|format(condition.id_) %}
-<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+<td><input class="ablers" type="text" name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
{{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }}
</td>
{% set list_name = "todos_against_%s"|format(condition.id_) %}
-<td><input name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
+<td><input class="ablers" type="text" name="new_todo" list="{{list_name}}" autocomplete="off" /></td>
{{ macros.datalist_of_titles(list_name, disablers_for[condition.id_]) }}
</td>
</tr>
{% 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 %}
-<th colspan=2>comments</th>
+<td colspan=2></td>
</tr>
{% for node in top_nodes %}
{{ show_node_undone(node, 0) }}