wagtail 6.3.1__py3-none-any.whl → 6.4rc1__py3-none-any.whl

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html

@@ -1,40 +1,30 @@
 {% extends "wagtailadmin/generic/form.html" %}
 {% load i18n wagtailadmin_tags %}
-{% block titletag %}{% trans "Add search promotion" %}{% endblock %}
-{% block content %}
-    {% trans "Add search pick" as add_str %}
-    {% include "wagtailadmin/shared/header.html" with title=add_str icon="pick" %}
 
-    <div class="nice-padding">
-        <div class="help-block help-info">
-            {% icon name='help' %}
-            {% blocktrans trimmed %}
-                <p>Promoted search results are a means of recommending specific pages or external links that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with the less common term "<em>giving</em>".</p>
-            {% endblocktrans %}
+{% block before_form %}
+    <div class="help-block help-info w-form-width">
+        {% icon name='help' %}
+        {% blocktrans trimmed %}
+            <p>Promoted search results are a means of recommending specific pages or external links that might not organically come high up in search results. E.g recommending your primary donation page to a user searching with the less common term "<em>giving</em>".</p>
+        {% endblocktrans %}
 
-            {% blocktrans trimmed %}
-                <p>The "Search term(s)/phrase" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>
-            {% endblocktrans %}
-        </div>
-        <form action="{% url 'wagtailsearchpromotions:add' %}" method="POST" novalidate>
-            {% csrf_token %}
-
-            <ul class="fields">
-                <li>
-                    {% include "wagtailsearchpromotions/queries/chooser_field.html" with field=query_form.query_string only %}
-                </li>
-                <li>
-                    {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
-                </li>
-            </ul>
-
-            {% block footer %}
-                {{ block.super }}
-            {% endblock %}
-        </form>
+        {% blocktrans trimmed %}
+            <p>The "Search term(s)/phrase" field below must contain the full and exact search for which you wish to provide recommended results, <em>including</em> any misspellings/user error. To help, you can choose from search terms that have been popular with users of your site.</p>
+        {% endblocktrans %}
     </div>
 {% endblock %}
 
+{% block form_content %}
+    <ul class="fields">
+        <li>
+            {% include "wagtailsearchpromotions/queries/chooser_field.html" with field=form.query_string only %}
+        </li>
+        <li>
+            {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
+        </li>
+    </ul>
+{% endblock %}
+
 {% block extra_js %}
     {{ block.super }}
     <script src="{% versioned_static 'wagtailsearchpromotions/js/query-chooser-modal.js' %}"></script>
@@ -44,7 +34,7 @@
         {% include "wagtailsearchpromotions/queries/chooser_field.js" only %}
 
         $(function() {
-            createQueryChooser('{{ query_form.query_string.auto_id }}');
+            createQueryChooser('{{ form.query_string.auto_id }}');
         });
     </script>
 {% endblock %}

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/confirm_delete.html

@@ -1,15 +1,6 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/confirm_delete.html" %}
 {% load i18n %}
 {% block titletag %}{% blocktrans trimmed with query=query.query_string %}Delete {{ query }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% trans "Delete" as delete_str %}
-    {% include "wagtailadmin/shared/header.html" with title=delete_str subtitle=query.query_string %}
-
-    <div class="nice-padding">
-        <p>{% trans "Are you sure you want to delete all promoted results for this search term?" %}</p>
-        <form action="{% url 'wagtailsearchpromotions:delete' query.id %}" method="POST">
-            {% csrf_token %}
-            <input type="submit" value="{% trans 'Yes, delete' %}" class="button serious" />
-        </form>
-    </div>
+{% block confirmation_message %}
+    <p>{% trans "Are you sure you want to delete all promoted results for this search term?" %}</p>
 {% endblock %}

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html

@@ -1,37 +1,14 @@
-{% extends "wagtailadmin/generic/form.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed with query=query.query_string %}Editing {{ query }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% trans "Editing" as editing_str %}
-    {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=query.query_string icon="pick"  %}
-
-    <form action="{% url 'wagtailsearchpromotions:edit' query.id %}" method="POST" class="nice-padding" novalidate>
-        {% csrf_token %}
-
-        <ul class="fields">
-            <li>
-                {% include "wagtailsearchpromotions/queries/chooser_field.html" with field=query_form.query_string only %}
-            </li>
-            <li>
-                {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
-            </li>
-        </ul>
-
-        {% block footer %}
-            {{ block.super }}
-        {% endblock %}
-    </form>
-{% endblock %}
-
-{% block extra_actions %}
-    {% comment %}
-        The view hasn't extended from generic EditView, so we cannot use the new
-        header buttons in the breadcrumbs for the Delete button. Instead, we'll
-        add a Delete button to the footer actions.
-    {% endcomment %}
-    {% if can_delete %}
-        <a href="{{ delete_url }}" class="button">{{ delete_item_label }}</a>
-    {% endif %}
+{% block form_content %}
+    <ul class="fields">
+        <li>
+            {% include "wagtailsearchpromotions/queries/chooser_field.html" with field=form.query_string only %}
+        </li>
+        <li>
+            {% include "wagtailsearchpromotions/includes/searchpromotions_formset.html" with formset=searchpicks_formset only %}
+        </li>
+    </ul>
 {% endblock %}
 
 {% block extra_js %}
@@ -43,7 +20,7 @@
         {% include "wagtailsearchpromotions/queries/chooser_field.js" only %}
 
         $(function() {
-            createQueryChooser('{{ query_form.query_string.auto_id }}');
+            createQueryChooser('{{ form.query_string.auto_id }}');
         });
     </script>
 {% endblock %}

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotion_form.html

@@ -7,6 +7,7 @@
     {% fragment as header_controls %}
         <button type="button" class="button button--icon text-replace" data-inline-panel-child-move-up>{% icon name="arrow-up" %}{% trans "Move up" %}</button>
         <button type="button" class="button button--icon text-replace" data-inline-panel-child-move-down>{% icon name="arrow-down" %}{% trans "Move down" %}</button>
+        <button type="button" class="button button--icon text-replace" data-inline-panel-child-drag>{% icon name="grip" %}{% trans "Drag" %}</button>
         <button type="button" class="button button--icon text-replace" id="{{ form.DELETE.id_for_label }}-button">{% icon name="bin" %}{% trans "Delete" %}</button>
     {% endfragment %}
 

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/includes/searchpromotions_formset.js

@@ -1,5 +1,6 @@
+/* global InlinePanel */
+
 $(function () {
-  // eslint-disable-next-line no-undef
   var panel = new InlinePanel({
     formsetPrefix: 'id_{{ formset.prefix }}',
     emptyChildFormPrefix: '{{ formset.empty_form.prefix }}',

wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/index.html

@@ -1,2 +1 @@
 {% extends "wagtailadmin/generic/index.html" %}
-{% load i18n %}