X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=todo_templates%2Ftodo.html;h=5aaf8a0bd71165ef5b36aeeb50cbe728f44d2f0b;hb=11df024d5f24e8d7916f57c907975ebe27db617f;hp=404ac1c496e32e3fdff533ccb634b2973029a1f6;hpb=979de59ced9fe3fd3860d19288b42485d7f02346;p=misc diff --git a/todo_templates/todo.html b/todo_templates/todo.html index 404ac1c..5aaf8a0 100644 --- a/todo_templates/todo.html +++ b/todo_templates/todo.html @@ -1,134 +1,259 @@ {% extends 'base.html' %} + + {% block css %} -th.toplevel { padding-right: 1em; } -input[type="submit"].delete { background-color: #ff7777; } -div.delete { float: right; } +tr.toplevel th { padding-right: 1em; } td.center { text-align: center; } +tr.toplevel td, tr.toplevel th { padding-top: 1em; } +tr.lowlevel td, tr.lowlevel th { padding-top: 0em; } +tr.grey td { background-color: #cccccc; } {% endblock %} + + +{% macro draw_todo(todo) %}{{todo.title}}{% if todo.comment %}({{todo.comment|e}}){% endif %}{% endmacro %} + + + +{% macro task_with_deps(task, indent) %} +{% for i in range(indent) %}  {% endfor %}+ +({{task.title.then}})
+{% for t in task.deps %} +{{ task_with_deps(t, indent+1) }} +{% endfor %} +{% endmacro %} + + + +{% macro todo_with_deps(todo, indent) %} +{% for i in range(indent) %}   {% endfor %}{{ macros.doneness_string(todo) }} {{ draw_todo(todo) }}
+{% for dep in todo.deps %} +{% if dep.been_observed %} +{% for i in range(indent+1) %}   {% endfor %}{{ macros.doneness_string(dep) }} ({{ draw_todo(dep) }})
+{% else %} +{{ todo_with_deps(dep, indent+1) }} +{% endif %} +{% endfor %} +{{ todo.observe() }} +{% endmacro %} + + + +{% macro draw_deps(deps) %} +{% for t in deps %} + + +{{ macros.doneness_string(t) }} + +{% if t.deps and not t.been_observed %} +
+{{ draw_todo(t) }} +{% for dep in t.deps %} +{{ todo_with_deps(dep, 0) }} +{% endfor %} +
+{% else %} +{{ draw_todo(t) }} +{% endif %} + +{{ t.observe() }} + +{% endfor %} +{% endmacro %} + + + {% block content %}

edit todo

-
+ - + - - - - - - - - + + + - - + + + - - - - - - - - + + - - - + + +{% if todo.dependers %} + + + +{% endif %} - - - + + - - -
task{{ todo.task.title.then|e }}
default effort{{ todo.default_effort }}
task +{{ todo.task.title.then|e }} +{% if todo.task.comment %} +
{{ todo.task.comment|e }}
+{% else %} +
  +{% endif %} +
efforts
work + +done
+(all days: {{todo.all_days_effort}})
+(dependencies: {{todo.all_days_effort}}) +		 - + + + + + {% for date, effort in todo.efforts.items() %} - + {% endfor %} - +
dateeffortdelete
dateeffortdelete
- +{{date}} - + -{% if not (todo.children and effort) %}{% endif %} +{% if not (todo.deps and effort) %}{% endif %}
- +
total effort{{todo.all_days_effort}}
importance - +
comment +
comment - +
tags +new: {{ macros.tagselection(submit_name='tag', selected_tags=todo.day_tags, all_tags=tags) }} +{% for tag in todo.task.tags.now | sort %}{% endfor %} +
dependers + +{% for path in todo.shortened_depender_paths %} - - + +{% endfor %} +
done -{% if todo.children %}✓{% else %}{% endif %} + +{% if not path[0] %}[…]
{% endif %} +{% for step in path %} +{% if step %} +{% if step.dependers %}➛ {% endif %}{{step.title}}
+{% endif %} +{% endfor %}
day tags -{% for tag in tags | sort %} -{% if tag in todo.task.tags.now %} - âœ“ +
sub-todos + + +{% for dep_slot in dep_slots %} +{% if dep_slot.todos %} +{{ draw_deps(dep_slot.todos) }} {% else %} - -{% endif %} {{ tag }} -
+ + + + - - - - +{{ draw_deps(additional_deps) }} +{% endif %} +
expected:
[ ] +{% if dep_slot.task.deps %}
+({{dep_slot.task.title.then}}) +{% for task in dep_slot.task.deps %} +{{ task_with_deps(task, 1) }} {% endfor %} -add: +
+{% else %} +({{dep_slot.task.title.then}}) +{% endif %}
parents -
    -{% for parent in todo.parents %} -
  • {{parent.title}} +{% endif %} {% endfor %} -
+{% if additional_deps %} +
bonus:
children - - - + + + -{% for todo in filtered_todos %} - - - - + + + + + +{{ macros.datalist_tasks(filtered_tasks) }} + + + +
adoptefforttitlecomments
suggestions +{% if todo.task.deps %} + +{% for dep in todo.task.deps %} + + + + -{% for todo in child_todos %} - - - - +{% for suggested_todo in suggested_todos[dep.id_] %} + + + + + {% endfor %} - - +{% endfor %} +
make new{{dep.title.then}}
{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %} {% endif %}{{todo.day.date}} {{todo.title}}
adopt{{suggested_todo.day.date}}:{{suggested_todo.title}}{% if suggested_todo.deps %}:+{% endif %}{{suggested_todo.comment}}
--------
+{% endif %} +
{{ '{:2.1f}'.format(todo.all_days_effort) }} {% if todo.done %}✓{% else %} {% endif %}{{todo.day.date}} {{todo.title}}
free add +make from task:
+
+adopt:
+ + +{% for t in filtered_todos %} + +{% endfor %} + +
as chain + +{% for dep in todo.deps_chain %} + + + + {% endfor %}
{{dep.deps_depth}}{% if dep.deps_done %}{{ macros.doneness_string(dep) }}{% endif %}{{ draw_todo(dep) }}
@@ -136,22 +261,9 @@ add:
- +
- -
-{% include 'tagfilters.html' %} -
-from: -to: -search: - - -{% include 'watch_form.html' %} - {% endblock %}