From a8b440f404da7ccd52329a7d69b0982b1736e2bf Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 13 Jun 2019 12:45:39 -0700 Subject: editgroup selection as drop-down --- python/fatcat_web/templates/container_edit.html | 5 ++- python/fatcat_web/templates/edit_macros.html | 50 ++++++++++++++++--------- 2 files changed, 36 insertions(+), 19 deletions(-) (limited to 'python/fatcat_web/templates') diff --git a/python/fatcat_web/templates/container_edit.html b/python/fatcat_web/templates/container_edit.html index 6a08b1ae..91432d5e 100644 --- a/python/fatcat_web/templates/container_edit.html +++ b/python/fatcat_web/templates/container_edit.html @@ -10,8 +10,8 @@ {% endblock %} {{ form.hidden_tag() }} -
- {{ edit_macros.editgroup_dropdown(form, editgroup) }} +

Editgroup

+ {{ edit_macros.editgroup_dropdown(form, editgroup, potential_editgroups) }}

The Basics


@@ -71,6 +71,7 @@ $(document).ready(function() { $('.ui.accordion').accordion(); + $('.ui.dropdown') .dropdown(); var fixup_url_numbering = function(group_item) { items = Array.from(group_item.querySelectorAll(".list-group-item")) diff --git a/python/fatcat_web/templates/edit_macros.html b/python/fatcat_web/templates/edit_macros.html index 66da04e7..a207e51e 100644 --- a/python/fatcat_web/templates/edit_macros.html +++ b/python/fatcat_web/templates/edit_macros.html @@ -35,22 +35,38 @@ {%- endmacro %} -{% macro editgroup_dropdown(form, editgroup=None) -%} -
-
-

Editgroup Meta

-
-
- {% if editgroup %} -

You have an editgroup in progress, and this edit will be included by - default. You can override this below. - {% else %} -

No existing editgroup is in progress (or at least, not is selected). - An existing ID can be pasted in, or if you leave that blank but give a - description, a new editgroup will be created for this edit. - {% endif %} - {{ form_field_inline(form.editgroup_id) }} +{% macro editgroup_dropdown(form, editgroup=None, potential_editgroups=None) -%} + {% if editgroup %} +

You are updating an existing un-merged editgroup: {{ editgroup.editgroup_id }}. +

Description: {{ editgroup.description }} + {% else %} + {% if not potential_editgroups %} +

You have no un-submitted editgroups in progress; a new one will be + created. You can add a description for the whole group of edits: {{ form_field_inline(form.editgroup_description) }} -

-
+ {% else %} +

Select an in-progress editgroup for this change to be part of (or start a new one): + +

+ +

If starting a new editgroup, you can add a description for the whole group: + {{ form_field_inline(form.editgroup_description) }} + {% endif %} + {% endif %} {%- endmacro %} -- cgit v1.2.3