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

wagtail/admin/static/wagtailadmin/js/vendor.js.LICENSE.txt

@@ -58,3 +58,10 @@ object-assign
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
+/**!
+ * Sortable 1.15.3
+ * @author	RubaXa   <trash@rubaxa.org>
+ * @author	owenm    <owen23355@gmail.com>
+ * @license MIT
+ */

wagtail/admin/templates/wagtailadmin/404.html

@@ -2,6 +2,10 @@
 {% load wagtailadmin_tags wagtailcore_tags i18n %}
 {% block titletag %}{% trans "Error 404: Page not found" %}{% endblock %}
 
+{# Avoid loading all of Wagtail’s icons sprite and JavaScript as they're unused here. #}
+{% block icons_sprite %}{% endblock %}
+{% block js %}{% endblock %}
+
 {% block furniture %}
     <main class="page404__bg">
         <div class="w-w-full w-h-full w-max-w-6xl w-mx-auto w-flex w-items-center w-justify-center">

wagtail/admin/templates/wagtailadmin/chooser/browse.html

@@ -5,7 +5,8 @@
     {% trans "Choose a page" as choose_str %}
 {% endif %}
 
-{% include "wagtailadmin/shared/header.html" with title=choose_str subtitle=page_type_names|join:", " search_url="wagtailadmin_choose_page_search" query_parameters="page_type="|add:page_type_string icon="doc-empty-inverse" search_disable_async=True %}
+{% querystring as search_query_params %}
+{% include "wagtailadmin/shared/header.html" with title=choose_str subtitle=page_type_names|join:", " search_url="wagtailadmin_choose_page_search" query_parameters=search_query_params icon="doc-empty-inverse" search_disable_async=True %}
 
 <div class="nice-padding">
     {% include 'wagtailadmin/chooser/_link_types.html' with current='internal' %}

wagtail/admin/templates/wagtailadmin/chooser/tables/parent_page_cell.html

@@ -1,7 +1,7 @@
 {% load wagtailadmin_tags %}
 <td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
     {% if value %}
-        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}" class="navigate-parent">{{ value.get_admin_display_title }}</a>
+        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}{% querystring p=None q=None %}" class="navigate-parent">{{ value.get_admin_display_title }}</a>
         {% if show_locale_labels %}{% status value.locale.get_display_name classname="w-status--label" %}{% endif %}
     {% endif %}
 </td>

wagtail/admin/templates/wagtailadmin/collections/_privacy_switch.html

@@ -7,7 +7,14 @@
     {% dialog icon_name='view' id='set-privacy' data_url=privacy_url title=_("Change privacy") message_status='info' message_heading=_("Privacy settings determine who is able to view documents in this collection.") %}
     {% enddialog %}
 
-    <div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+    <div
+        class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}"
+        data-controller="w-zone"
+        data-action="w-privacy:changed@document->w-zone#switch"
+        data-w-zone-active-class="public"
+        data-w-zone-inactive-class="private"
+        data-w-zone-switch-key-value="isPublic"
+    >
         {% trans "Privacy" %}
         <button type="button" data-a11y-dialog-show="set-privacy" class="button button-small button-secondary">
             {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}

wagtail/admin/templates/wagtailadmin/generic/confirm_delete.html

@@ -2,15 +2,21 @@
 {% load i18n %}
 
 {% block main_content %}
-    {% if usage_url %}
-        {% include "wagtailadmin/shared/usage_summary.html" %}
-    {% endif %}
+    {% block usage_summary %}
+        {% if usage_url %}
+            {% include "wagtailadmin/shared/usage_summary.html" %}
+        {% endif %}
+    {% endblock %}
     {% if not is_protected %}
-        <p>{{ view.confirmation_message }}</p>
-        <form action="{{ view.get_delete_url }}" method="POST">
-            {% csrf_token %}
-            <input type="submit" value="{% trans 'Yes, delete' %}" class="button serious" />
-            <a href="{{ view.get_success_url }}" class="button button-secondary">{% trans "No, don't delete" %}</a>
-        </form>
+        {% block confirmation_message %}
+            <p>{{ view.confirmation_message }}</p>
+        {% endblock %}
+        {% block form %}
+            <form action="{{ view.get_delete_url }}" method="POST">
+                {% csrf_token %}
+                <button type="submit" class="button serious">{% trans 'Yes, delete' %}</button>
+                <a href="{{ view.get_success_url }}" class="button button-secondary">{% trans "No, don't delete" %}</a>
+            </form>
+        {% endblock %}
     {% endif %}
 {% endblock %}

wagtail/admin/templates/wagtailadmin/generic/confirm_unpublish.html

@@ -1,31 +1,27 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/base.html" %}
 {% load i18n wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed with title=object_display_title %}Unpublish {{ title }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% include "wagtailadmin/shared/header.html" with title=_("Unpublish") subtitle=object_display_title icon=header_icon %}
 
-    <div class="nice-padding">
-        {% if usage_url %}
-            {% include "wagtailadmin/shared/usage_summary.html" %}
-        {% endif %}
-        {% block confirmation_text %}
-            <p>
-                {% blocktrans trimmed with model_name=model_opts.verbose_name %}
-                    Are you sure you want to unpublish this {{ model_name }}?
-                {% endblocktrans %}
-            </p>
-        {% endblock %}
+{% block main_content %}
+    {% if usage_url %}
+        {% include "wagtailadmin/shared/usage_summary.html" %}
+    {% endif %}
+    {% block confirmation_text %}
+        <p>
+            {% blocktrans trimmed with model_name=model_opts.verbose_name %}
+                Are you sure you want to unpublish this {{ model_name }}?
+            {% endblocktrans %}
+        </p>
+    {% endblock %}
 
-        <form action="{{ unpublish_url }}" method="POST">
-            {% csrf_token %}
+    <form action="{{ unpublish_url }}" method="POST">
+        {% csrf_token %}
 
-            {% block form_content %}
-            {% endblock %}
+        {% block form_content %}
+        {% endblock %}
 
-            <div>
-                <button class="button" type="submit">{% trans 'Yes, unpublish it' %}</button>
-                <a href="{{ next_url }}" class="button button-secondary">{% trans "No, don't unpublish" %}</a>
-            </div>
-        </form>
-    </div>
+        <div>
+            <button class="button" type="submit">{% trans 'Yes, unpublish it' %}</button>
+            <a href="{{ next_url }}" class="button button-secondary">{% trans "No, don't unpublish" %}</a>
+        </div>
+    </form>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/generic/form.html

@@ -7,7 +7,7 @@
         <div class="nice-padding w-mt-8">
             <h2 class="w-relative w-h1" id="header-title">
                 {% icon classname="w-absolute w-top-1 -w-left-11 w-max-w-[1em] w-max-h-[1em]" name=header_icon %}
-                {{ page_subtitle }}
+                {{ page_subtitle|default:page_title }}
             </h2>
         </div>
     {% else %}

wagtail/admin/templates/wagtailadmin/generic/preview_error.html

@@ -21,3 +21,6 @@
 {# Avoid loading all of Wagtail’s JavaScript for a fully static page. #}
 {% block js %}
 {% endblock %}
+
+{# Avoid loading Wagtail’s icons sprite. #}
+{% block icons_sprite %}{% endblock %}

wagtail/admin/templates/wagtailadmin/generic/revisions/compare.html

@@ -1,84 +1,71 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/base.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed with title=page_subtitle %}Comparing {{ title }}{% endblocktrans %}{% endblock %}
+{% block main_content %}
+    <table class="listing w-mt-8">
+        <col width="15%" />
+        <col />
 
-{% block content %}
-    {% include "wagtailadmin/shared/header.html" with title=_("Comparing") subtitle=page_subtitle icon=header_icon %}
+        <thead>
+            <tr>
+                <th>{% trans "Fields" %}</th>
+                <th>{% trans "Changes" %}</th>
+            </tr>
+        </thead>
 
-    <div class="nice-padding">
-
-        <p>
-            <a href="{{ history_url }}" class="button button-small">{{ history_label|capfirst }}</a>
-            <a href="{{ edit_url }}" class="button button-small button-secondary">{{ edit_label|capfirst }}</a>
-        </p>
-
-
-        <table class="listing">
-            <col width="15%" />
-            <col />
+        <tbody>
+            {% for comp in comparison %}
+                <tr>
+                    <td class="title" valign="top">
+                        <div class="title-wrapper">{{ comp.field_label }}:</div>
+                    </td>
+                    <td class="comparison{% if not comp.is_field %} no-padding{% endif %}">
+                        {% if comp.is_field %}
+                            {{ comp.htmldiff }}
+                        {% elif comp.is_child_relation %}
+                            {% for child_comp in comp.get_child_comparisons %}
+                                <div class="comparison__child-object {% if child_comp.is_addition %}addition{% elif child_comp.is_deletion %}deletion{% endif %}">
+                                    {% with child_comp.get_position_change as move %}
+                                        {% if move %}
+                                            <div class="help-block help-info">
+                                                {% icon name='help' %}
+                                                <p>
+                                                    {% if move > 0 %}
+                                                        {% blocktrans trimmed count counter=move %}
+                                                            Moved down 1 place.
+                                                        {% plural %}
+                                                            Moved down {{ counter }} places.
+                                                        {% endblocktrans %}
+                                                    {% elif move < 0 %}
+                                                        {% blocktrans trimmed count counter=move|abs %}
+                                                            Moved up 1 place.
+                                                        {% plural %}
+                                                            Moved up {{ counter }} places.
+                                                        {% endblocktrans %}
+                                                    {% endif %}
+                                                </p>
+                                            </div>
+                                        {% endif %}
+                                    {% endwith %}
 
-            <thead>
+                                    <dl class="comparison__list">
+                                        {% for field_comp in child_comp.get_field_comparisons %}
+                                            <dt>{{ field_comp.field_label }}</dt>
+                                            <dd>{{ field_comp.htmldiff }}</dd>
+                                        {% endfor %}
+                                    </dl>
+                                </div>
+                            {% endfor %}
+                        {% endif %}
+                    </td>
+                </tr>
+            {% empty %}
                 <tr>
-                    <th>{% trans "Fields" %}</th>
-                    <th>{% trans "Changes" %}</th>
+                    <td colspan="2" class="no-results-message">
+                        <p>{% trans "There are no differences between these two versions" %}</p>
+                    </td>
                 </tr>
-            </thead>
-
-            <tbody>
-                {% for comp in comparison %}
-                    <tr>
-                        <td class="title" valign="top">
-                            <div class="title-wrapper">{{ comp.field_label }}:</div>
-                        </td>
-                        <td class="comparison{% if not comp.is_field %} no-padding{% endif %}">
-                            {% if comp.is_field %}
-                                {{ comp.htmldiff }}
-                            {% elif comp.is_child_relation %}
-                                {% for child_comp in comp.get_child_comparisons %}
-                                    <div class="comparison__child-object {% if child_comp.is_addition %}addition{% elif child_comp.is_deletion %}deletion{% endif %}">
-                                        {% with child_comp.get_position_change as move %}
-                                            {% if move %}
-                                                <div class="help-block help-info">
-                                                    {% icon name='help' %}
-                                                    <p>
-                                                        {% if move > 0 %}
-                                                            {% blocktrans trimmed count counter=move %}
-                                                                Moved down 1 place.
-                                                            {% plural %}
-                                                                Moved down {{ counter }} places.
-                                                            {% endblocktrans %}
-                                                        {% elif move < 0 %}
-                                                            {% blocktrans trimmed count counter=move|abs %}
-                                                                Moved up 1 place.
-                                                            {% plural %}
-                                                                Moved up {{ counter }} places.
-                                                            {% endblocktrans %}
-                                                        {% endif %}
-                                                    </p>
-                                                </div>
-                                            {% endif %}
-                                        {% endwith %}
-
-                                        <dl class="comparison__list">
-                                            {% for field_comp in child_comp.get_field_comparisons %}
-                                                <dt>{{ field_comp.field_label }}</dt>
-                                                <dd>{{ field_comp.htmldiff }}</dd>
-                                            {% endfor %}
-                                        </dl>
-                                    </div>
-                                {% endfor %}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% empty %}
-                    <tr>
-                        <td colspan="2" class="no-results-message">
-                            <p>{% trans "There are no differences between these two versions" %}</p>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
+            {% endfor %}
+        </tbody>
+    </table>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/pages/_editor_js.html

@@ -5,7 +5,5 @@
 {% endcomment %}
 
 <script src="{% versioned_static 'wagtailadmin/js/comments.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/vendor/rangy-core.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/expanding-formset.js' %}"></script>
 <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
 {% hook_output 'insert_editor_js' %}

wagtail/admin/templates/wagtailadmin/pages/edit.html

@@ -14,7 +14,7 @@
 
         <form
             id="page-edit-form"
-            action="{% url 'wagtailadmin_pages:edit' page.id %}"
+            action="{{ action_url }}"
             method="POST"
             novalidate
             {% if form.is_multipart %}enctype="multipart/form-data"{% endif %}
@@ -31,10 +31,6 @@
             <input type="hidden" name="next" value="{{ next }}">
             {{ edit_handler.render_form_content }}
 
-            {% if is_revision %}
-                <input type="hidden" name="revision" value="{{ revision.id|unlocalize }}" />
-            {% endif %}
-
             {% block footer %}
                 {{ block.super }}
                 {# Reuse the footer container, but redefine the actions content down below to use component classes #}

wagtail/admin/templates/wagtailadmin/panels/inline_panel_child.html

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

wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_form.html

@@ -13,5 +13,5 @@
 {% endfor %}
 
 <td>
-    <button class="button button-small no" type="button" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</button>
+    <button class="button button-small no" type="button" id="{{ form.DELETE.id_for_label }}-button" data-action="w-formset#delete">{% trans "Delete" %}</button>
 </td>

wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html

@@ -2,7 +2,7 @@
 
 {% fragment as icon %}{% block icon %}{% endblock %}{% endfragment %}
 {% fragment as heading %}{% block title %}{% endblock %}{% endfragment %}
-{% panel id=heading|slugify heading=heading icon=icon %}
+{% panel id=heading|slugify heading=heading icon=icon attrs=formset.attrs %}
 
     {{ formset.management_form }}
 
@@ -28,9 +28,9 @@
                 {% endfor %}
             </tr>
         </thead>
-        <tbody id="id_{{ formset.prefix }}-FORMS">
+        <tbody id="id_{{ formset.prefix }}-FORMS" data-w-formset-target="forms">
             {% for form in formset.forms %}
-                <tr id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
+                <tr id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} hidden data-w-formset-target="deleted"{% else %} data-w-formset-target="child"{% endif %}>
                     {% if form.non_field_errors %}
                         <p class="error-message">
                             {% for error in form.non_field_errors %}
@@ -44,30 +44,14 @@
         </tbody>
     </table>
 
-    <template id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-        <tr id="inline_child_{{ formset.empty_form.prefix }}">
+    <template id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE" data-w-formset-target="template">
+        <tr id="inline_child_{{ formset.empty_form.prefix }}" data-w-formset-target="child">
             {% include "wagtailadmin/permissions/includes/collection_member_permissions_form.html" with form=formset.empty_form only %}
         </tr>
     </template>
 
     <p class="add">
-        <button class="button bicolor button--icon" id="id_{{ formset.prefix }}-ADD" value="Add" type="button">{% icon name="plus" wrapped=1 %}{% block add_button_label %}{% endblock %}</button>
+        <button class="button bicolor button--icon" id="id_{{ formset.prefix }}-ADD" value="Add" type="button" data-action="w-formset#add">{% icon name="plus" wrapped=1 %}{% block add_button_label %}{% endblock %}</button>
     </p>
 
-    <script>
-        $(function() {
-            buildExpandingFormset('id_{{ formset.prefix }}', {
-                onInit: function(index) {
-                    var deleteInputId = 'id_{{ formset.prefix }}-' + index + '-DELETE';
-                    var childId = 'inline_child_{{ formset.prefix }}-' + index;
-                    $('#' + deleteInputId + '-button').on('click', function() {
-                        /* set 'deleted' form field to true */
-                        $('#' + deleteInputId).val('1');
-                        $('#' + childId).fadeOut();
-                    });
-                }
-            });
-        });
-    </script>
-
 {% endpanel%}

wagtail/admin/templates/wagtailadmin/shared/formatted_field.html

@@ -23,8 +23,8 @@
         </label>
     {% endif %}
 
-    {# It’s possible to customise the fields’ layout based on widget type. #}
-    {# Customising fields based on the field type is only supported for backwards compatibility. #}
+    {# It’s possible to customize the fields’ layout based on widget type. #}
+    {# Customizing fields based on the field type is only supported for backwards compatibility. #}
     <div class="w-field {{ field_classname }}{% if has_errors %} w-field--error{% endif %}{% if show_add_comment_button %} w-field--commentable{% endif %}" data-field{% if contentpath %} data-contentpath="{{ contentpath }}"{% endif %}>
 
         {# Always associate a wrapping div with the field, so JS error rendering knows where to put error messages. #}

wagtail/admin/templates/wagtailadmin/shared/header.html

@@ -11,7 +11,7 @@
     - `search_results_url` - URL to be used for async requests to search results, if not provided, the form's action URL will be used
     - `search_target` - A selector string to be used as the target for the search results to be swapped into. Defaults to '#listing-results'
     - `search_disable_async` - If True, the default header async search functionality will not be used
-    - `query_parameters` - a query string (without the '?') to be placed after the search URL
+    - `query_parameters` - a query string (with or without the '?') to be placed after the search URL
     - `icon` - name of an icon to place against the title
     - `merged` - if true, add the classname 'w-header--merged'
     - `action_url` - if present, display an 'action' button. This is the URL to be used as the link URL for the button
@@ -42,7 +42,7 @@
             {% if search_url %}
                 <form
                     class="col search-form"
-                    action="{% url search_url %}{% if query_parameters %}?{{ query_parameters }}{% endif %}"
+                    action="{% url search_url %}{% if query_parameters %}{% if query_parameters.0 != '?' %}?{% endif %}{{ query_parameters }}{% endif %}"
                     method="get"
                     novalidate
                     role="search"

wagtail/admin/templates/wagtailadmin/shared/page_status_tag_new.html

@@ -10,45 +10,38 @@
 {% comment %} Unable to use pageurl template tag here due to issues in unit tests where request is not yet available - see #10157 {% endcomment %}
 {% if page.live and page.url is not None %}
     {% test_page_is_public page as is_public %}
-
-    <a href="{{ page.url }}" target="_blank" rel="noreferrer"
-       class="
-              page-status-tag
-              u-text-uppercase
-              w-inline-flex
-              w-items-center
-              w-justify-center
-              w-whitespace-nowrap
-              w-px-1
-              w-ml-3
-              w-text-11
-              w-rounded-sm
-              w-bg-transparent
-              w-text-text-meta
-              w-border
-              w-border-border-furniture
-              w-no-underline
-              w-font-semibold
-              hover:w-border-surface-menus
-              hover:w-text-text-label
-              w-transition
-              more-contrast:w-border
-              more-contrast:w-border-border-interactive-more-contrast
-              hover:more-contrast:w-border-border-interactive-more-contrast-hover"
-       aria-label="{% if is_public %}{% trans 'Visible to all. Visit the live page' %}{% else %}{% trans 'Private. Visit the live page' %}{% endif %}"
-       data-controller="w-tooltip"
-       data-w-tooltip-content-value="{% if is_public %}{% trans 'Visible to all' %}{% else %}{% trans 'Private' %}{% endif %}"
-       data-w-tooltip-offset-value="[0, 13]"
+    {% trans 'Live' as live_label %}
+    {% comment %} Two copies of the tag, visibility is toggled by the privacy switch JS {% endcomment %}
+    <a
+        href="{{ page.url }}"
+        target="_blank"
+        rel="noreferrer"
+        class="{% classnames 'page-status-tag' is_public|yesno:',w-hidden' %}"
+        aria-label="{% trans 'Visible to all. Visit the live page' %}"
+        data-controller="w-tooltip w-zone"
+        data-action="w-privacy:changed@document->w-zone#switch"
+        data-w-tooltip-content-value="{% trans 'Visible to all' %}"
+        data-w-tooltip-offset-value="[0, 13]"
+        data-w-zone-inactive-class="w-hidden"
+        data-w-zone-switch-key-value="isPublic"
     >
-
-        {% with icon_classes='privacy-indicator-icon w-w-4 w-h-4 w-mr-1' %}
-            {% if is_public %}
-                {% icon name="view" classname=icon_classes %}
-            {% else %}
-                {% icon name="no-view" classname=icon_classes %}
-            {% endif %}
-        {% endwith %}
-
-        {% trans 'Live' %}
+        {% icon classname='w-w-4 w-h-4 w-mr-1' name="view" %}
+        {{ live_label }}
+    </a>
+    <a
+        href="{{ page.url }}"
+        target="_blank"
+        rel="noreferrer"
+        class="{% classnames 'page-status-tag' is_public|yesno:'w-hidden,' %}"
+        aria-label="{% trans 'Private. Visit the live page' %}"
+        data-controller="w-tooltip w-zone"
+        data-action="w-privacy:changed@document->w-zone#switch"
+        data-w-tooltip-content-value="{% trans 'Private' %}"
+        data-w-tooltip-offset-value="[0, 13]"
+        data-w-zone-inactive-class="w-hidden"
+        data-w-zone-switch-key-value="!isPublic"
+    >
+        {% icon classname='w-w-4 w-h-4 w-mr-1' name="no-view" %}
+        {{ live_label }}
     </a>
 {% endif %}

wagtail/admin/templates/wagtailadmin/shared/revisions/confirm_unschedule.html

@@ -1,20 +1,16 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/base.html" %}
 {% load i18n %}
-{% block titletag %}{% blocktrans trimmed with title=object_display_title %}Unschedule Revision {{ revision.id }} for {{ title }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% include "wagtailadmin/shared/header.html" with title=_("Unschedule") subtitle=subtitle icon=header_icon %}
 
-    <div class="nice-padding">
-        <p>{% trans "Are you sure you want to unschedule this revision?" %}</p>
-        <form action="{{ revisions_unschedule_url }}" method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="next" value="{{ next }}">
-            <ul class="fields">
-                <li>
-                    <input type="submit" value="{% trans 'Yes, unschedule' %}" class="button">
-                    <a href="{{ next_url }}" class="button button-secondary">{% trans "No, don't unschedule" %}</a>
-                </li>
-            </ul>
-        </form>
-    </div>
+{% block main_content %}
+    <p>{% trans "Are you sure you want to unschedule this revision?" %}</p>
+    <form action="{{ revisions_unschedule_url }}" method="POST">
+        {% csrf_token %}
+        <input type="hidden" name="next" value="{{ next }}">
+        <ul class="fields">
+            <li>
+                <input type="submit" value="{% trans 'Yes, unschedule' %}" class="button">
+                <a href="{{ next_url }}" class="button button-secondary">{% trans "No, don't unschedule" %}</a>
+            </li>
+        </ul>
+    </form>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/shared/side_panels/includes/status/privacy.html

@@ -2,10 +2,16 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block content %}
-    {% test_page_is_public page as is_public %}
+    {% if page.id %}{% test_page_is_public page as is_public %}{% else %}{% test_page_is_public parent_page as is_public %}{% endif %}
 
     {# The swap between public and private text is done using JS inside of privacy-switch.js when the response from the modal comes back #}
-    <div class="{% if not is_public %}w-hidden{% endif %}" data-privacy-sidebar-public>
+    <div
+        class="{% if not is_public %}w-hidden{% endif %}"
+        data-controller="w-zone"
+        data-action="w-privacy:changed@document->w-zone#switch"
+        data-w-zone-inactive-class="w-hidden"
+        data-w-zone-switch-key-value="isPublic"
+    >
         {% trans 'Page visibility: ' as screen_reader_title_prefix %}
         {% trans 'Visible to all' as title %}
         {% trans 'Once live anyone can view' as help_text %}
@@ -13,7 +19,13 @@
             {{ block.super }}
         {% endwith %}
     </div>
-    <div class="{% if is_public %}w-hidden{% endif %}" data-privacy-sidebar-private>
+    <div
+        class="!w-my-0 {% if is_public %}w-hidden{% endif %}"
+        data-controller="w-zone"
+        data-action="w-privacy:changed@document->w-zone#switch"
+        data-w-zone-inactive-class="w-hidden"
+        data-w-zone-switch-key-value="!isPublic"
+    >
         {% trans 'Private' as title %}
         {% trans 'Not visible to the public' as help_text %}
         {% with icon_name='no-view' %}

wagtail/admin/templates/wagtailadmin/shared/side_panels/preview.html

@@ -33,7 +33,7 @@
         {% endblock %}
 
         {% block new_tab_button %}
-            <a href="{{ preview_url }}?mode={{ object.default_preview_mode|urlencode }}" target="_blank" rel="noreferrer" class="w-preview__size-button" data-w-preview-target="newTab" data-action="w-preview#openPreviewInNewTab" aria-label="{% trans 'Preview in new tab' %}">{% icon name="link-external" %}</a>
+            <a href="{{ preview_url }}?mode={{ object.default_preview_mode|urlencode }}" target="_blank" rel="noreferrer" class="w-preview__size-button" data-w-preview-target="newTab" data-action="w-preview#openPreviewInNewTab:prevent" aria-label="{% trans 'Preview in new tab' %}">{% icon name="link-external" %}</a>
         {% endblock %}
     </div>
 

wagtail/admin/templates/wagtailadmin/skeleton.html

@@ -17,9 +17,11 @@
     {% sidebar_collapsed as sidebar_collapsed %}
     {% fragment as bodyclass %}{% block bodyclass %}{% endblock %}{% endfragment %}
     <body id="wagtail" class="{% classnames bodyclass sidebar_collapsed|yesno:"sidebar-collapsed," messages|yesno:"has-messages," %}" data-controller="w-init" data-w-init-ready-class="ready">
-        <div data-sprite></div>
+        {% block icons_sprite %}
+            <div data-sprite></div>
 
-        <script src="{% versioned_static 'wagtailadmin/js/icons.js' %}" data-icon-url="{% icon_sprite_url %}"></script>
+            <script src="{% versioned_static 'wagtailadmin/js/icons.js' %}" data-icon-url="{% icon_sprite_url %}"></script>
+        {% endblock %}
 
         <noscript class="capabilitymessage">
             {% blocktrans trimmed %}