Improve Process editing template layout.

diff --git a/templates/_macros.html b/templates/_macros.html
index cb1bb452d16f3671ab7108a159b1c581ec063890..14395914052efd6511eddc6cc82bbe947dda62c4 100644 (file)
--- a/templates/_macros.html
+++ b/templates/_macros.html
@@ -18,6 +18,7 @@
 
 
 {% macro simple_checkbox_table(title, items, type_name, list_name, add_string="add", historical=false) %}
+{% if items|length > 0 %}
 <table>
 {% for item in items %}
 <tr>
@@ -30,7 +31,8 @@
 </tr>
 {% endfor %}
 </table>
-{{add_string}}: <input name="{{title}}" list="{{list_name}}" autocomplete="off" />
+{% endif %}
+{{add_string}}: <input name="{{title}}" type="text" list="{{list_name}}" autocomplete="off" />
 {% endmacro %}
 
 

diff --git a/templates/process.html b/templates/process.html
index c765ca7a3594b6969c342ad452c48a4db7dc0952..064e83da1dae009da6c1c396a978d114d59b2a65 100644 (file)
--- a/templates/process.html
+++ b/templates/process.html
@@ -4,9 +4,23 @@
 
 
 {% block css %}
-input[name="title"] {
+input[type="text"] {
   width: 100em;
 }
+details > summary::after {
+  content: '[+]';
+}
+details summary {
+  list-style: none;
+}
+details[open] > summary::after {
+  content: '[-]';
+}
+table.main > tbody > tr > td, table.main > tbody > tr > th {
+  border-bottom: 0.1em solid #bbbbbb;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+}
 {% endblock %}
 
 
@@ -21,19 +35,34 @@ input[name="title"] {
 <input type="hidden" name="step_{{step_id}}_parent_id" value="{{step_node.parent_id or ''}}" />
 {% endif %}
 </td>
-<td>{% for i in range(indent) %}+{%endfor %}
+
+{% if step_node.is_explicit and not step_node.seen %}
+<td colspan=2>
+<details>
+<summary>
+{% else %}
+<td>
+{% endif %}
+
+{% for i in range(indent) %}+{%endfor %}
 {% if step_node.is_suppressed %}<del>{% endif %}
 {% if step_node.seen %}
 <a href="process?id={{step_node.process.id_}}">({{step_node.process.title.newest|e}})</a>
 {% else %}
 <a href="process?id={{step_node.process.id_}}">{{step_node.process.title.newest|e}}</a>
 {% endif %}
-{% if step_node.is_suppressed %}<del>{% endif %}
+{% if step_node.is_suppressed %}</del>{% endif %}
+
+
+{% if step_node.is_explicit and not step_node.seen %}
+</summary>
+<div>add sub-step: <input name="new_step_to_{{step_id}}" list="process_candidates" autocomplete="off" size="100" /></div>
+</details>
+{% endif %}
+
 </td>
 <td>
-{% if step_node.is_explicit %}
-add sub-step: <input name="new_step_to_{{step_id}}" list="process_candidates" autocomplete="off" />
-{% elif not step_node.seen %}
+{% if (not step_node.is_explicit) and (not step_node.seen) %}
 <input type="checkbox" name="suppresses" value="{{step_id}}" {% if step_node.is_suppressed %}checked{% endif %}> suppress
 {% endif %}
 </td>
@@ -48,9 +77,15 @@ add sub-step: <input name="new_step_to_{{step_id}}" list="process_candidates" au
 
 
 {% block content %}
-<h3>{% if is_new %}NEW {% endif %}process</h3>
+<h3>
+{% if is_new %}
+add NEW process
+{% else %}
+edit process of ID {{process.id_}}
+{% endif %}
+</h3>
 <form action="process?id={{process.id_ or ''}}" method="POST">
-<table>
+<table class="main">
 
 <tr>
 <th>title</th>