From: Christian Heller Date: Tue, 11 Jun 2024 19:35:05 +0000 (+0200) Subject: Template layout and code improvements. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/static/%7B%7Bprefix%7D%7D/conditions?a=commitdiff_plain;h=3bc56075efe4e4409824c7bd99a55593905e960e;p=plomtask Template layout and code improvements. --- diff --git a/templates/_base.html b/templates/_base.html index 0b44171..182a1c6 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -6,10 +6,17 @@ body { font-family: monospace; text-align: left; padding: 0; + background-color: white; } input[type="text"] { width: 100em; } +input.timestamp { + width: 11em; +} +input.date { + width: 6em; +} input.btn-harmless { color: green; } @@ -21,7 +28,6 @@ div.btn-to-right { text-align: right; } td, th, tr, table { - vertical-align: top; margin-top: 1em; padding: 0; border-collapse: collapse; @@ -32,11 +38,27 @@ th, td { a { color: black; } -table.edit_table > tbody > tr > td, table.main > tbody > tr > th { +table.edit_table > tbody > tr > td, +table.edit_table > tbody > tr > th { border-bottom: 0.1em solid #bbbbbb; padding-top: 0.5em; padding-bottom: 0.5em; } +td.number, input[type="number"] { + text-align: right; +} +input[name="effort"] { + width: 3.5em; +} +textarea { + width: 100%; +} +table.alternating > tbody > tr:nth-child(odd) { + background-color: #dfdfdf; +} +div.edit_buttons { + margin-top: 1em; +} {% block css %} {% endblock %} diff --git a/templates/_macros.html b/templates/_macros.html index a19c063..23dfbe9 100644 --- a/templates/_macros.html +++ b/templates/_macros.html @@ -1,8 +1,10 @@ {% macro edit_buttons() %} +
+
{% endmacro %} diff --git a/templates/calendar.html b/templates/calendar.html index 699caab..4e83573 100644 --- a/templates/calendar.html +++ b/templates/calendar.html @@ -38,8 +38,8 @@ td.today {

basic view

-from -to +from +to
diff --git a/templates/conditions.html b/templates/conditions.html index 5990711..aa8fcac 100644 --- a/templates/conditions.html +++ b/templates/conditions.html @@ -5,10 +5,10 @@ - + -
+
diff --git a/templates/day.html b/templates/day.html index 93a430f..2941105 100644 --- a/templates/day.html +++ b/templates/day.html @@ -4,9 +4,6 @@ {% block css %} -table { - border-collapse: collapse; -} th { border: 1px solid black; } @@ -35,6 +32,7 @@ td.todo_line { } tr.inactive > td.todo_line { background-color: #bfbfbf; + border-bottom: 1px solid white; } tr.hidden_undone > td, tr.hidden_undone a { color: #9f9f9f; @@ -74,7 +72,7 @@ O  {% else %} - + {% endif %} - + + - +{% if not node.todo.is_done %}({% endif %}{% if node.seen %}[{% endif %}{{node.todo.title_then|e}}{% if node.seen %}]{% endif %}{% if not node.todo.is_done %}){% endif %}{% if node.todo.comment %} · {{node.todo.comment|e}}{% endif %} {% if not node.seen %} {% for child in node.children %} @@ -201,7 +197,7 @@ add: {% for condition in conditions_present %} {% endfor %} - + {% for node in top_nodes %} {{ show_node_undone(node, 0) }} @@ -211,7 +207,13 @@ add:

done

-
active title{% if node.todo.effort %}{{ node.todo.effort }}{% endif %} {% for i in range(indent) %}    {% endfor %} + @@ -109,13 +107,11 @@ O  {% macro show_node_done(node, indent, path) %} {% if node.todo.has_doneness_in_path %} -{{node.todo.performed_effort}}{{node.todo.tree_effort|round(1)}}{{ '{:4.1f}'.format(node.todo.performed_effort) }}{{ '{:4.1f}'.format(node.todo.tree_effort) }} {% for i in range(indent) %}    {% endfor %} + -{% if not node.todo.is_done %}({% endif %}{{node.todo.title_then|e}}{% if not node.todo.is_done %}){% endif %} -{{node.todo.comment|e}}
comments
+
+ + + + + + {% for node in top_nodes %} {{ show_node_done(node, 0, []) }} {% endfor %} diff --git a/templates/process.html b/templates/process.html index 4027f50..60687d8 100644 --- a/templates/process.html +++ b/templates/process.html @@ -84,8 +84,8 @@ edit process of ID {{process.id_}} - - + + @@ -114,12 +114,14 @@ edit process of ID {{process.id_}} diff --git a/templates/processes.html b/templates/processes.html index c057890..b6a9608 100644 --- a/templates/processes.html +++ b/templates/processes.html @@ -5,10 +5,10 @@ - + -
effortaction · comment
selftree
{% if process.id_ %} [history]{% endif %}
default effort{% if process.id_ %} [history]{% endif %}effort{% if process.id_ %} [history]{% endif %}
description
steps +{% if steps %} {% for step_id, step_node in steps.items() %} {{ step_with_steps(step_id, step_node, 0) }} {% endfor %}
-add: +{% endif %} +add:
+
@@ -17,9 +17,9 @@ {% for process in processes %} - - - + + + {% endfor %} diff --git a/templates/todo.html b/templates/todo.html index fd16680..f62b0d1 100644 --- a/templates/todo.html +++ b/templates/todo.html @@ -24,7 +24,7 @@ - + diff --git a/templates/todos.html b/templates/todos.html index 3dd1f3f..ac5240a 100644 --- a/templates/todos.html +++ b/templates/todos.html @@ -7,15 +7,14 @@

todos

+from +to
+process
+in comment
-process -from -to -in comment - -
steps owners
{{ process.explicit_steps|count }}{{ process.n_owners }}{{ process.effort.newest }}{{ process.explicit_steps|count }}{{ process.n_owners }}{{ process.effort.newest }} {{process.title.newest}}
effort
comment
+
done date