diff --git a/isic/core/templates/core/base.html b/isic/core/templates/core/base.html index e8b7e83af..eac196bea 100644 --- a/isic/core/templates/core/base.html +++ b/isic/core/templates/core/base.html @@ -56,26 +56,14 @@ const controller = new AbortController(); return { - quickfindOpen: false, findText: '', results: {}, openQuickfindModal() { - this.quickfindOpen = true; - // x-show defers the style change asynchronously, so focusing - // immediately (or via $nextTick) races with it. Observe the - // actual DOM mutation to focus once the element is visible. - const input = this.$refs.quickfind; - const modal = input.closest('[x-show]'); - const observer = new MutationObserver(() => { - if (modal.style.display !== 'none') { - input.focus(); - observer.disconnect(); - } - }); - observer.observe(modal, {attributes: true, attributeFilter: ['style']}); + this.$refs.quickfindModal.showModal(); + this.$nextTick(() => this.$refs.quickfind.focus()); }, closeQuickfindModal() { - this.quickfindOpen = false; + this.$refs.quickfindModal.close(); }, async performFind() { if (this.findText.length < 3) { @@ -114,7 +102,7 @@ {% block head_extra %}{% endblock %} - + {% include 'core/partials/navbar.html' %}
diff --git a/isic/core/templates/core/collection_create_doi.html b/isic/core/templates/core/collection_create_doi.html index e1b2ca02f..fd0a40d79 100644 --- a/isic/core/templates/core/collection_create_doi.html +++ b/isic/core/templates/core/collection_create_doi.html @@ -2,21 +2,13 @@ {% load static %} {% block content %} -
Create a Draft DOI for {{ collection.name }}back to collection
+
Create a Draft DOI for {{ collection.name }}
+ ← back to collection {% if error %} -
-
-
- -
-
-
-

{{ error }}

-
-
-
+
+ + {{ error }}
{% else %}
@@ -26,68 +18,61 @@
{{ collection.description|json_script:"collection-description" }}
-
-
- + +
+ -

+

Note: This description will be saved to the collection and used in the DOI metadata. Modifying this field will update the collection's description.

-
+ -
-
{# the cut is a hack to let the token (SimpleLazyObject) be serializable by json_script #} - {{ csrf_token|cut:""|json_script:"csrf-token" }} + {{ csrf_token|cut:""|json_script:"csrf-token" }} + - - - - - - - - - - - - - - -
File NameSizeDescription
-
-
+ + + + + + + + + + + + +
File NameSizeDescription
-
+

Related Identifiers

-

Add references to related publications or supplemental materials +

Add references to related publications or supplemental materials that complement this dataset.

-
@@ -129,7 +114,7 @@

- diff --git a/isic/core/templates/core/collection_create_or_edit.html b/isic/core/templates/core/collection_create_or_edit.html index 08b4779a6..94087c632 100644 --- a/isic/core/templates/core/collection_create_or_edit.html +++ b/isic/core/templates/core/collection_create_or_edit.html @@ -2,87 +2,51 @@ {% block content %} {% if collection and collection.locked %} -
-
-
- -
-
-
-

This collection is locked for editing.

-
-
-
+
+ + This collection is locked for editing.
{% else %} -
+ {% csrf_token %} {{ form.non_field_errors }} -
-
-
- {% if not collection %} -
- Create a Collection -
-

- A Collection is a container for a set of images. Collections can be used as the basis for sharing images or creating studies. - A Collection can be public or private, and each of the individual images within it can be public or private. -

- {% else %} -
- Edit Collection -
- {% endif %} -
+ {% if not collection %} +
Create a Collection
+

+ A Collection is a container for a set of images. Collections can be used as the basis for sharing images or creating studies. + A Collection can be public or private, and each of the individual images within it can be public or private. +

+ {% else %} +
Edit Collection
+ {% endif %} -
-
- -
-
- -
-

{{ form.name.help_text }}

- {{ form.name.errors }} -
-
+
+ + + {{ form.name.errors }} +
-
- -
- -

{{ form.description.help_text|safe }}

- {{ form.description.errors }} -
-
+
+ + +

{{ form.description.help_text|safe }}

+ {{ form.description.errors }} +
-
- -
- -
- A public collection can't contain private images. -
- {{ form.public.errors }} -
-
-
+
+ +

A public collection can't contain private images.

+ {{ form.public.errors }} +
-
-
- -
- + + {% endif %} {% endblock %} diff --git a/isic/core/templates/core/collection_detail.html b/isic/core/templates/core/collection_detail.html index 0d2a9a7e3..3ef4d58f9 100644 --- a/isic/core/templates/core/collection_detail.html +++ b/isic/core/templates/core/collection_detail.html @@ -27,11 +27,7 @@ {% include 'core/partials/collection_detail_actions.html' %}
- + {% include 'core/partials/collection_share_modal.html' %} {% partialdef detail-item %}
  • @@ -69,10 +65,10 @@ {% endwith %}
  • Attribution: - +