From: Christian Heller Date: Mon, 3 Jun 2024 02:16:48 +0000 (+0200) Subject: Enhance layouts. X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=commitdiff_plain;h=8542cd471f1aeea1abbe0b237a94f7863fb12dd0;p=plomtask Enhance layouts. --- diff --git a/templates/_base.html b/templates/_base.html index 0e38465..7c10506 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -21,6 +21,10 @@ td, th, tr, table { vertical-align: top; margin-top: 1em; padding: 0; + border-collapse: collapse; +} +a { + color: black; } {% block css %} {% endblock %} diff --git a/templates/_macros.html b/templates/_macros.html index b1f0104..cb1bb45 100644 --- a/templates/_macros.html +++ b/templates/_macros.html @@ -25,7 +25,7 @@ -{% if historical %}{{item.title_then}}{% else %}{{item.title.newest|e}}{% endif %} +{% if historical is true %}{{item.title_then}}{% else %}{{item.title.newest|e}}{% endif %} {% endfor %} diff --git a/templates/calendar.html b/templates/calendar.html index 4674262..42c821a 100644 --- a/templates/calendar.html +++ b/templates/calendar.html @@ -8,15 +8,19 @@ tr.week_row td { 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; diff --git a/templates/day.html b/templates/day.html index 2e1a380..0165c9e 100644 --- a/templates/day.html +++ b/templates/day.html @@ -8,23 +8,45 @@ td, th, tr, table { padding: 0; margin: 0; } +table { + border-collapse: collapse; +} th { border: 1px solid black; } -td.min_width { - min-width: 1em; -} td.cond_line_0 { - background-color: #ffbbbb; + border-top: 1px solid white; + background-color: #dddddd; } td.cond_line_1 { - background-color: #bbffbb; + border-top: 1px solid white; + background-color: #efefef; } td.cond_line_2 { - background-color: #bbbbff; + border-top: 1px solid white; + background-color: #fffff; +} +td.cond_line_corner { + max-width: 0px; + white-space: nowrap; + overflow: hidden; + text-overflow: clip; } td.todo_line { - border-bottom: 1px solid #bbbbbb; + border-bottom: 1px solid #dddddd; + height: 1.7em; +} +tr.inactive td.todo_line { + background-color: #efefef; +} +td.left_border { + border-left: 1px solid black; +} +td.right_border { + border-right: 1px solid black; +} +input { + height: 100%; } {% endblock %} @@ -32,38 +54,42 @@ td.todo_line { {% macro show_node_undone(node, indent) %} {% if not node.todo.is_done %} - + {% if not node.seen %} {% endif %} {% for condition in conditions_present %} -{% if condition in node.todo.conditions and not condition.is_active %}O{% elif condition in node.todo.blockers and condition.is_active %}!{% endif %} + +{% if condition in node.todo.conditions and not condition.is_active %} +O  +{% elif condition in node.todo.blockers and condition.is_active %} +!  +{% endif %} + {% endfor %} --> {% if node.seen %} - + {% if node.todo.effort %}{{ node.todo.effort }}{% endif %} {% else %} - + {% endif %} - -{% for i in range(indent) %}  {% endfor %} + + +{% for i in range(indent) %}    {% endfor %} + {% if node.seen %}({% endif %}{{node.todo.title_then|e}}{% if node.seen %}){% endif %} --> {% for condition in conditions_present|reverse %} -{% if condition in node.todo.enables %}+{% elif condition in node.todo.disables %}!{% endif %} +{% if condition in node.todo.enables %} +{% elif condition in node.todo.disables %} !{% endif %} {% endfor %} - + {% if node.seen %} {{node.todo.comment|e}} {% else %} - + {% endif %} @@ -122,14 +148,12 @@ comment:
add todo: -

todo

+

to do

- - - + @@ -141,24 +165,27 @@ add todo: {% for _ in conditions_present %} {% if outer_loop.index > loop.index %} {% endfor %} - + {% for _ in conditions_present %} -{% if outer_loop.index0 + loop.index0 < conditions_present|length %} +{% if outer_loop.index0 + loop.index < conditions_present|length %} {{ macros.datalist_of_titles(list_name, enablers_for[condition.id_]) }} @@ -174,11 +201,11 @@ add todo: {% for condition in conditions_present %} {% endfor %} - + {% for condition in conditions_present %} {% endfor %} - + {% for node in top_nodes %} {{ show_node_undone(node, 0) }} diff --git a/templates/todo.html b/templates/todo.html index 0d4773c..a2ef536 100644 --- a/templates/todo.html +++ b/templates/todo.html @@ -40,22 +40,22 @@ - + - + - + - + diff --git a/templates/todos.html b/templates/todos.html index 6b733e0..3dd1f3f 100644 --- a/templates/todos.html +++ b/templates/todos.html @@ -25,9 +25,9 @@ in comment {% for todo in todos %} - + - + {% endfor %}
cstateststates add enabler add disabler
-{% else %} +{% elif outer_loop.index < loop.index %} -{% endif %} -{% if outer_loop.index == loop.index %} +{% else %} +X {% endif %} [{% if condition.is_active %}X{% else %} {% endif %}]{{condition.title.at(day.date)|e}}{{condition.title.at(day.date)|e}} -{% else %} +{% elif outer_loop.index0 + loop.index > conditions_present|length %} +{% else %} + X {% endif %} {% endfor %} + {% set list_name = "todos_for_%s"|format(condition.id_) %} doablesdoablescommentscomments
conditions{{ macros.simple_checkbox_table("condition", todo.conditions, "condition", "condition_candidates", historical=true) }}{{ macros.simple_checkbox_table("condition", todo.conditions, "condition", "condition_candidates") }}
blockers{{ macros.simple_checkbox_table("blocker", todo.blockers, "condition", "condition_candidates", historical=true) }}{{ macros.simple_checkbox_table("blocker", todo.blockers, "condition", "condition_candidates") }}
enables{{ macros.simple_checkbox_table("enables", todo.enables, "condition", "condition_candidates", historical=true) }}{{ macros.simple_checkbox_table("enables", todo.enables, "condition", "condition_candidates") }}
disables{{ macros.simple_checkbox_table("disables", todo.disables, "condition", "condition_candidates", historical=true) }}{{ macros.simple_checkbox_table("disables", todo.disables, "condition", "condition_candidates") }}
[{% if todo.is_done %}x{% else %} {% endif %}]{{todo.date}}{{todo.date}} {{todo.title_then}}{{todo.comment}}{{todo.comment}}