From 5c88e4a883bfda83394bd9b6982c2f7bdaaad8c2 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 26 Feb 2021 13:35:15 -0800 Subject: web: improve editgroup display/form/submit --- python/fatcat_web/templates/editgroup_view.html | 96 +++++++++++++++++-------- 1 file changed, 68 insertions(+), 28 deletions(-) (limited to 'python/fatcat_web/templates/editgroup_view.html') diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html index c4f23066..6a9793f7 100644 --- a/python/fatcat_web/templates/editgroup_view.html +++ b/python/fatcat_web/templates/editgroup_view.html @@ -51,33 +51,6 @@ {# extended by changelog_entry #} {% block editgroupheader %} -{% if not editgroup.changelog_index %} -
- {% if auth_to.accept %} -
- - -

- {% endif %} - {% if auth_to.submit %} - {% if editgroup.submitted %} -
- - -

-
- - -
- {% else %} -
- - -
- {% endif %} - {% endif %} -
-{% endif %}

Editgroup editgroup_{{ editgroup.editgroup_id }}

@@ -91,6 +64,73 @@

An editgroup is a set of entity edits, bundled together into a coherent, reviewable bundle. {% endif %} + +

+ + {% if editgroup.changelog_index %} + {% set editing_status = "completed" %} + {% set submit_status = "completed" %} + {% set accept_status = "completed" %} + {% elif editgroup.submitted %} + {% set editing_status = "completed" %} + {% set submit_status = "completed" %} + {% set accept_status = "active" %} + {% else %} + {% set editing_status = "completed" %} + {% set submit_status = "active" %} + {% set accept_status = "" %} + {% endif %} + +
+
+
+ {% if not editgroup.changelog_index and auth_to.submit and editgroup.submitted %} +
+ + +
+ {% else %} + Edit + {% endif %} +
+
Make changes to entities
+
+
+ +
+
+
+ {% if not editgroup.changelog_index and auth_to.submit and not editgroup.submitted %} +
+ + +
+ {% else %} + Submitted + {% endif %} +
+
For review and feedback from others
+
+
+ +
+
+
+ {% if not editgroup.changelog_index and auth_to.accept %} +
+ + +
+ {% else %} + Accepted + {% endif %} +
+
Changes added to catalog
+
+
+ +
+ {% endblock %} @@ -195,7 +235,7 @@ Markdown is allowed

-- cgit v1.2.3