wagtail 6.2.2__py3-none-any.whl → 6.3rc2__py3-none-any.whl

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

@@ -1,14 +1,8 @@
+{% extends "wagtailadmin/generic/listing_results.html" %}
 {% load i18n wagtailadmin_tags %}
-<div class="nice-padding">
-    {% if pages %}
-        <h2 role="alert">
-            {% blocktrans trimmed count counter=all_pages.count %}
-                There is one matching page
-            {% plural %}
-                There are {{ counter }} matching pages
-            {% endblocktrans %}
-        </h2>
 
+{% block before_results %}
+    <div class="nice-padding">
         {% search_other %}
 
         {% if object_list.supports_facet %}
@@ -16,34 +10,42 @@
                 <h3 id="page-types-title" class="filter-title">{% trans "Page types" %}</h3>
                 <ul class="filter-options">
                     {% if not selected_content_type %}
-                        <li class="w-bg-border-furniture">{% trans "All" %} ({{ all_pages.count }})</li>
+                        <li class="w-bg-border-furniture">{% trans "All" %} ({{ all_pages.count|intcomma }})</li>
                     {% else %}
-                        <li><a href="{% url 'wagtailadmin_pages:search' %}?q={{ query_string|urlencode }}">{% trans "All" %} ({{ all_pages.count }})</a></li>
+                        <li><a href="{{ index_url }}?q={{ query_string|urlencode }}">{% trans "All" %} ({{ all_pages.count|intcomma }})</a></li>
                     {% endif %}
 
                     {% for content_type, count in content_types %}
                         {% if content_type == selected_content_type %}
-                            <li class="w-bg-border-furniture">{{ content_type.model_class.get_verbose_name }} ({{ count }})</li>
+                            <li class="w-bg-border-furniture">{{ content_type.model_class.get_verbose_name }} ({{ count|intcomma }})</li>
                         {% else %}
-                            <li><a href="{% url 'wagtailadmin_pages:search' %}?q={{ query_string|urlencode }}&amp;content_type={{ content_type.app_label }}.{{ content_type.model|lower }}">{{ content_type.model_class.get_verbose_name }} ({{ count }})</a></li>
+                            <li><a href="{{ index_url }}?q={{ query_string|urlencode }}&amp;content_type={{ content_type.app_label }}.{{ content_type.model|lower }}">{{ content_type.model_class.get_verbose_name }} ({{ count|intcomma }})</a></li>
                         {% endif %}
                     {% endfor %}
                 </ul>
             </nav>
         {% endif %}
 
-        {% component table %}
-
-        {% if is_paginated %}
-            {% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj linkurl=index_url %}
-        {% endif %}
-    {% else %}
-        {% if query_string %}
-            <h2 role="alert">{% blocktrans trimmed %}Sorry, no pages match <em>{{ query_string }}</em>{% endblocktrans %}</h2>
-
-            {% search_other %}
+        {% if object_list %}
+            <h2 role="alert">
+                {% with page_count=all_pages.count %}
+                    {% blocktrans trimmed with counter=page_count|intcomma count counter_val=page_count %}
+                        There is one matching page
+                    {% plural %}
+                        There are {{ counter }} matching pages
+                    {% endblocktrans %}
+                {% endwith %}
+            </h2>
+        {% elif query_string %}
+            <h2 role="alert">
+                {% blocktrans trimmed %}Sorry, no pages match <em>{{ query_string }}</em>{% endblocktrans %}
+            </h2>
         {% else %}
             <p>{% trans 'Enter a search term above' %}</p>
         {% endif %}
-    {% endif %}
-</div>
+    </div>
+{% endblock %}
+
+{% block no_results_message %}
+    {# This view has a custom no results message using the alert h2 like the results count message #}
+{% endblock %}

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

@@ -26,7 +26,6 @@
                 {% for codename, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th></th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">

wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_report.html

@@ -1,10 +1,10 @@
 {% load i18n wagtailadmin_tags %}
 <table class="listing {% block table_classname %}{% endblock %}">
-    <col />
+    <col width="35%" />
     <col width="12%" />
     <col width="12%" />
     <col width="12%" />
-    <col width="10%" />
+    <col />
     <thead>
         {% block post_parent_page_headers %}
             <tr class="table-headers">

wagtail/admin/templates/wagtailadmin/reports/listing/_list_page_types_usage.html

@@ -1,11 +1,11 @@
 {% load i18n wagtailadmin_tags wagtailcore_tags %}
 
 <table class="listing {% block table_classname %}{% endblock table_classname %}">
-    <col width="12%" />
-    <col width="12%" />
-    <col width="10%" />
+    <col width="25%" />
     <col width="20%" />
-    <col />
+    <col width="10%" />
+    <col width="30%" />
+    <col width="15%" />
     <thead>
         {% block post_parent_page_headers %}
             <tr class="table-headers">
@@ -42,9 +42,9 @@
                 </td>
                 <td class="count" valign="top">
                     {% if page_type.count > 0 %}
-                        <a href="{% url 'wagtailadmin_pages:type_use' content_type_app_name=page_type.app_label content_type_model_name=page_type.model %}">{{ page_type.count }}</a>
+                        <a href="{% url 'wagtailadmin_pages:type_use' content_type_app_name=page_type.app_label content_type_model_name=page_type.model %}">{{ page_type.count|intcomma }}</a>
                     {% else %}
-                        {{ page_type.count }}
+                        {{ page_type.count|intcomma }}
                     {% endif %}
                 </td>
                 <td class="last-edited-page" valign="top">

wagtail/admin/templates/wagtailadmin/reports/workflow_tasks_results.html

@@ -44,7 +44,7 @@
                         {% status task_state.get_status_display classname="w-status--primary" %}
                     </td>
                     <td>{{ task_state.started_at }}</td>
-                    <td>{{ task_state.finished_at }}</td>
+                    <td>{{ task_state.finished_at|default:"-" }}</td>
                 </tr>
             {% endfor %}
         </tbody>

wagtail/admin/templates/wagtailadmin/shared/action_menu/menu.html

@@ -0,0 +1,14 @@
+{% load wagtailadmin_tags %}
+
+{% if show_menu %}
+    {% dropdown_button button=default_menu_item toggle_icon="arrow-up" keep_mounted=True %}
+        {% if menu_items_fragment %}
+            {{ menu_items_fragment }}
+        {% endif %}
+        {% for item in rendered_menu_items %}
+            {{ item }}
+        {% endfor %}
+    {% enddropdown_button %}
+{% elif default_menu_item %}
+    {{ default_menu_item }}
+{% endif %}

wagtail/admin/templates/wagtailadmin/shared/action_menu/menu_item.html

@@ -0,0 +1,6 @@
+{% load wagtailadmin_tags %}
+{% if url %}
+    <a class="button{% if classname %} {{ classname }}{% endif %}" href="{{ url }}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</a>
+{% else %}
+    <button type="submit" name="{{ name }}" value="{{ label }}" class="button{% if classname %} {{ classname }}{% endif %}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</button>
+{% endif %}

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

@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags %}
+{% load i18n wagtailadmin_tags %}
 {% comment "text/markdown" %}
     Displays a user avatar using the avatar template
     Variables this template accepts:
@@ -8,9 +8,10 @@
     - `size` (string?) - small, large, square
     - `tooltip` (string?) - Modifier classes
     - `tooltip_html` (string?) - An HTML element to use for the tooltip content
+    - `edit_link` (boolean?) - Edit link to display underneath the avatar
 {% endcomment %}
 <span
-    class="{% classnames 'avatar' size classname %}"
+    class="{% classnames 'avatar' size classname edit_link|yesno:"avatar--edit," %}"
     {% if tooltip or tooltip_html %} data-controller="w-tooltip" {% endif %}
     {% if tooltip %} data-w-tooltip-content-value="{{ tooltip }}" {% endif %}
 >
@@ -22,10 +23,19 @@
     {% if size == 'small' %}
         <img src="{% avatar_url user size=25 %}" alt="" decoding="async" loading="lazy"/>
     {% elif size == 'large' %}
-        <img src="{% avatar_url user size=100 %}" alt="" decoding="async" loading="lazy"/>
+        <img src="{% avatar_url user size=80 %}" alt="" decoding="async" loading="lazy"/>
     {% elif size == 'square' %}
         <img src="{% avatar_url user %}" alt="" decoding="async" loading="lazy"/>
     {% else %}
         <img src="{% avatar_url user %}" alt="" decoding="async" loading="lazy"/>
     {% endif %}
+    {% if edit_link %}
+        <a
+            class="avatar__edit-link"
+            aria-label="{% trans 'Edit account avatar' %}"
+            href="{% url 'wagtailadmin_account' %}#avatar-section"
+        >
+            {% icon name="edit" %}
+        </a>
+    {% endif %}
 </span>

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

@@ -6,7 +6,6 @@
     - `classname` - if present, adds classname to the header class list
     - `title` - Displayed as `h1`
     - `subtitle` - Within the `h1` tag but smaller
-    - `description` - if present, displayed as a small text below the `h1` tag title
     - `search_url` - if present, display a search box. This is a URL route name (taking no parameters) to be used as the action for that search box
     - `search_form` - form object for the search form. Required if search_url is passed
     - `search_results_url` - URL to be used for async requests to search results, if not provided, the form's action URL will be used
@@ -14,7 +13,6 @@
     - `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
     - `icon` - name of an icon to place against the title
-    - `avatar` - if present, display an 'avatar' in place of icon. This is the URL to be used as the img src for avatar
     - `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
     - `action_text` - text for the 'action' button
@@ -36,13 +34,10 @@
                     <h1 class="w-header__title" id="header-title">
                         {% if icon %}
                             {% icon classname="w-header__glyph" name=icon %}
-                        {% elif avatar %}
-                            <div class="w-header__glyph avatar large"><img src="{{ avatar }}" alt="" /></div>
                         {% endif %}
                         {{ title }}{% if subtitle %} <span class="w-header__subtitle">{{ subtitle }}</span>{% endif %}
                     </h1>
                 {% endif %}
-                {% if description %}<div class="w-header__description">{{ description }}</div>{% endif %}
             </div>
             {% if search_url %}
                 <form

wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html

@@ -19,7 +19,7 @@
 
 {% endcomment %}
 {% fragment as nav_icon_classes %}w-w-4 w-h-4 group-hover:w-transform group-hover:w-scale-110{% endfragment %}
-{% fragment as nav_icon_button_classes %}w-w-slim-header w-h-slim-header w-bg-transparent w-border-transparent w-box-border w-py-3 w-px-3 w-flex w-justify-center w-items-center w-outline-offset-inside w-text-text-meta w-transition w-group hover:w-text-text-label focus:w-text-text-label expanded:w-text-text-label expanded:w-border-y-2 expanded:w-border-b-current w-shrink-0{% endfragment %}
+{% fragment as nav_icon_button_classes %}w-w-slim-header w-h-slim-header w-bg-transparent w-border-transparent w-box-border w-py-3 w-px-3 w-flex w-justify-center w-items-center w-outline-offset-inside w-text-text-meta w-transition w-group hover:w-text-text-label focus:w-text-text-label expanded:w-text-text-label expanded:w-border-y-2 expanded:w-border-b-current w-shrink-0 more-contrast:w-border more-contrast:w-border-border-interactive-more-contrast hover:more-contrast:w-border-border-interactive-more-contrast-hover{% endfragment %}
 {% fragment as nav_icon_counter_classes %}-w-mr-3 w-py-0.5 w-px-[0.325rem] w-translate-y-[-8px] rtl:w-translate-x-[4px] w-translate-x-[-4px] w-text-[0.5625rem] w-font-bold w-text-text-button w-border w-border-surface-page w-rounded-[1rem]{% endfragment %}
 {# Z index 99 to ensure header is always above  #}
 <div class="w-sticky w-top-0 w-z-header">

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

@@ -31,7 +31,10 @@
               w-font-semibold
               hover:w-border-surface-menus
               hover:w-text-text-label
-              w-transition"
+              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 %}"

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

@@ -9,7 +9,7 @@
 {% resolve_url linkurl as url_path %}
 
 <nav class="pagination" aria-label="{% trans 'Pagination' %}">
-    <p>{% blocktrans trimmed with page_num=items.number total_pages=items.paginator.num_pages %}Page {{ page_num }} of {{ total_pages }}.{% endblocktrans %}</p>
+    <p>{% blocktrans trimmed with page_num=items.number|intcomma total_pages=items.paginator.num_pages|intcomma %}Page {{ page_num }} of {{ total_pages }}.{% endblocktrans %}</p>
     <ul>
         <li class="prev">
             {% if items.has_previous %}

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

@@ -13,7 +13,7 @@
     {% icon name=toggle.icon_name classname=nav_icon_classes %}
     {% if toggle.has_counter %}
         <div data-side-panel-toggle-counter class="{{ nav_icon_counter_classes }} {{ toggle.counter_classname|default:'w-bg-surface-button-default'}}" {% if not count %}hidden{% endif %}>
-            {{ count }}
+            {{ count|intcomma }}
         </div>
     {% endif %}
 </button>

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

@@ -5,7 +5,7 @@
     {% trans 'Locale: ' as screen_reader_title_prefix %}
 
     {% if object.pk and translations %}
-        {% blocktrans trimmed asvar help_text %}
+        {% blocktrans trimmed with translations_total=translations_total|intcomma asvar help_text %}
             Available in {{ translations_total }} locales
         {% endblocktrans %}
     {% else %}

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

@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 <div class="w-py-6 w-space-y-3">
     <section class="w-flex w-space-x-3">
         <div class="w-flex w-flex-1">
@@ -13,7 +13,7 @@
                 {% if usage_url_text %}
                     {{ usage_url_text }}
                 {% else %}
-                    {% blocktrans trimmed count usage_count=usage_count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}
+                    {% blocktrans trimmed with counter=usage_count usage_count=usage_count|intcomma count counter=counter %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}
                 {% endif %}
             </a>
         </div>

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

@@ -1,64 +1,106 @@
-{% load i18n wagtailadmin_tags %}
+{% load i18n l10n wagtailadmin_tags %}
 
-{% wagtail_config as settings %}
+<div
+    class="w-preview"
+    data-controller="w-preview"
+    data-w-preview-has-errors-class="w-preview--has-errors"
+    data-w-preview-proxy-class="w-preview__proxy"
+    data-w-preview-selected-size-class="w-preview__size-button--selected"
+    data-w-preview-auto-update-interval-value="{{ auto_update_interval|unlocalize }}"
+    data-w-preview-url-value="{{ preview_url }}"
+    data-w-preview-w-progress-outlet="[data-controller='w-preview'] [data-controller='w-progress']"
+>
+    <div class="w-preview__sizes">
+        {% block size_buttons %}
+            {% for size in object.preview_sizes %}
+                <label class="w-preview__size-button">
+                    {% icon name=size.icon %}
+                    <input
+                        type="radio"
+                        class="w-preview__proxy"
+                        name="preview-size"
+                        value="{{ size.name }}"
+                        data-action="w-preview#togglePreviewSize"
+                        data-w-preview-target="size"
+                        aria-label="{{ size.label }}"
+                        data-device-width="{{ size.device_width|stringformat:'s' }}"
+                        {% if object.default_preview_size == size.name %}
+                            checked
+                        {% endif %}
+                    />
+                </label>
+            {% endfor %}
+        {% endblock %}
 
-<div class="preview-panel preview-panel--mobile" data-preview-panel data-action="{{ preview_url }}">
-    <div class="preview-panel__sizes">
-        <label class="preview-panel__size-button preview-panel__size-button--mobile">
-            {% icon name="mobile-alt" %}
-            <input type="radio" name="preview-size" value="mobile" data-device-width="375" data-default-size checked aria-label="{% trans 'Preview in mobile size' %}" />
-        </label>
-        <label class="preview-panel__size-button preview-panel__size-button--tablet">
-            {% icon name="tablet-alt" %}
-            <input type="radio" name="preview-size" value="tablet" data-device-width="768" aria-label="{% trans 'Preview in tablet size' %}" />
-        </label>
-        <label class="preview-panel__size-button preview-panel__size-button--desktop">
-            {% icon name="desktop" %}
-            <input type="radio" name="preview-size" value="desktop" data-device-width="1280" aria-label="{% trans 'Preview in desktop size' %}" />
-        </label>
-
-        <a href="{{ preview_url }}?mode={{ object.default_preview_mode|urlencode }}" target="_blank" rel="noreferrer" class="preview-panel__size-button preview-panel__size-button--new-tab" data-preview-new-tab aria-label="{% trans 'Preview in new tab' %}">{% icon name="link-external" %}</a>
-    </div>
-
-    <div class="preview-panel__spinner w-hidden" data-preview-spinner>
-        {% icon name="spinner" classname="default" %}
-        <span class="w-sr-only">{% trans 'Loading'%}</span>
+        {% 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>
+        {% endblock %}
     </div>
 
-    {% if not settings.WAGTAIL_AUTO_UPDATE_PREVIEW %}
-        <button class="button button-small button-secondary button--icon preview-panel__refresh-button" data-refresh-preview>{% icon name="rotate" %} Refresh</button>
+    {% if auto_update_interval %}
+        <div class="w-preview__spinner" data-w-preview-target="spinner" hidden>
+            {% icon name="spinner" classname="default" %}
+            <span class="w-sr-only">{% trans 'Loading'%}</span>
+        </div>
+    {% else %}
+        <button
+            type="button"
+            class="button button-small button-secondary button-longrunning button--icon w-preview__refresh-button"
+            data-controller="w-progress"
+            data-action="click->w-preview#setPreviewDataWithAlert click->w-progress#activate"
+            data-w-progress-active-value="{% trans 'Refreshing…' %}"
+            data-w-progress-duration-seconds-value="300"
+        >
+            {% icon name="rotate" classname="button-longrunning__icon" %}
+            {% icon name="spinner" %}
+            {# Using sr-only for the label as there might not be enough room for the label if the panel is resized #}
+            <em class="w-sr-only" data-w-progress-target="label">{% trans 'Refresh' %}</em>
+        </button>
     {% endif %}
 
-    <div class="preview-panel__area">
-        <div class="preview-panel__controls{% if has_multiple_modes %} preview-panel__controls--multiple{% endif %}">
-            <div id="preview-panel-error-banner" class="preview-panel__error-banner">
-                {% icon name='warning' classname='default' %}
-                <div>
-                    <h3 class="preview-panel__error-title">
-                        {% trans 'Preview is out of date' %}
-                    </h3>
-                    <p class="preview-panel__error-details">
-                        {% trans 'Correct the validation errors to resume preview (saving will highlight errors)' %}
-                    </p>
+    <div class="w-preview__area">
+        <div class="w-preview__controls{% if has_multiple_modes %} w-preview__controls--multiple{% endif %}">
+            {% block error_banner %}
+                <div id="w-preview-error-banner" class="w-preview__error-banner">
+                    {% icon name='warning' classname='default' %}
+                    <div>
+                        <h3 class="w-preview__error-title">
+                            {% trans 'Preview is out of date' %}
+                        </h3>
+                        <p class="w-preview__error-details">
+                            {% trans 'Correct the validation errors to resume preview (saving will highlight errors)' %}
+                        </p>
+                    </div>
                 </div>
-            </div>
-            {% if has_multiple_modes %}
-                {% rawformattedfield label_text=_("Preview mode") id_for_label="id_preview_mode" classname="preview-panel__modes" %}
-                    <select id="id_preview_mode" name="preview_mode" class="preview-panel__mode-select" data-preview-mode-select>
-                        {% for internal_name, display_name in object.preview_modes %}
-                            <option value="{{ internal_name }}"{% if internal_name == object.default_preview_mode %} selected{% endif %}>{{ display_name }}</option>
-                        {% endfor %}
-                    </select>
-                {% endrawformattedfield %}
-            {% endif %}
+            {% endblock %}
+            {% block mode_select %}
+                {% if has_multiple_modes %}
+                    {% rawformattedfield label_text=_("Preview mode") id_for_label="id_preview_mode" classname="w-preview__modes" %}
+                        <select id="id_preview_mode" name="preview_mode" class="w-preview__mode-select" data-w-preview-target="mode" data-action="w-preview#setPreviewMode">
+                            {% for internal_name, display_name in object.preview_modes %}
+                                <option value="{{ internal_name }}"{% if internal_name == object.default_preview_mode %} selected{% endif %}>{{ display_name }}</option>
+                            {% endfor %}
+                        </select>
+                    {% endrawformattedfield %}
+                {% endif %}
+            {% endblock %}
         </div>
 
-        <div class="preview-panel__wrapper">
-            <iframe id="preview-iframe" loading="lazy" title="{% trans 'Preview' %}" class="preview-panel__iframe" data-preview-iframe aria-describedby="preview-panel-error-banner">
-                <div>
-                     {# Add placeholder element to support styling content when iframe has loaded #}
-                </div>
-            </iframe>
+        <div class="w-preview__wrapper">
+            {% block iframe %}
+                <iframe
+                    id="w-preview-iframe"
+                    title="{% trans 'Preview' %}"
+                    class="w-preview__iframe"
+                    data-w-preview-target="iframe"
+                    data-action="load->w-preview#replaceIframe"
+                    aria-describedby="w-preview-error-banner"
+                >
+                    <div>
+                        {# Add placeholder element to support styling content when iframe has loaded #}
+                    </div>
+                </iframe>
+            {% endblock %}
         </div>
     </div>
 </div>

wagtail/admin/templates/wagtailadmin/{pages/_unsaved_changes_warning.html → shared/unsaved_changes_warning.html}

@@ -10,23 +10,23 @@
 >
     <div class="footer__save-warning footer__emphasise-span-tags" data-w-messages-target="container"></div>
     {% block message_templates %}
-        {% trans 'Save the page before leaving' as generic_save_page_message %}
+        {% trans 'Save your changes before leaving' as generic_save_message %}
         <template data-w-messages-target="template" data-type="edits">
             <div>
                 <b>{% blocktrans trimmed %}You have <span>unsaved edits</span>{% endblocktrans %}</b>
-                <p>{{ generic_save_page_message }}</p>
+                <p>{{ generic_save_message }}</p>
             </div>
         </template>
         <template data-w-messages-target="template" data-type="comments">
             <div>
                 <b>{% blocktrans trimmed %}You have <span>unsaved comments</span>{% endblocktrans %}</b>
-                <p>{{ generic_save_page_message }}</p>
+                <p>{{ generic_save_message }}</p>
             </div>
         </template>
         <template data-w-messages-target="template" data-type="all">
             <div>
                 <b>{% blocktrans trimmed %}You have <span>unsaved edits</span> and <span>comments</span>{% endblocktrans %}</b>
-                <p>{{ generic_save_page_message }}</p>
+                <p>{{ generic_save_message }}</p>
             </div>
         </template>
     {% endblock %}

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

@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 {% comment "text/markdown" %}
 This shared template is used to display the usage count for an object as a link
 to the object's usage page. It is used by the admin's delete and unpublish views.
@@ -11,7 +11,7 @@ Variables this template accepts:
 {% endcomment %}
 <p>
     <a href="{{ usage_url }}">
-        {% blocktrans trimmed with model_name=model_opts.verbose_name count usage_count=usage_count asvar usage_message %}
+        {% blocktrans trimmed with counter=usage_count model_name=model_opts.verbose_name usage_count=usage_count|intcomma count counter=counter asvar usage_message %}
             This {{ model_name }} is referenced {{ usage_count }} time.
         {% plural %}
             This {{ model_name }} is referenced {{ usage_count }} times.

wagtail/admin/templates/wagtailadmin/shared/workflow_history/detail.html

@@ -2,13 +2,7 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block main_content %}
-    <h2>{% icon object_icon classname="initial" %} {% latest_str object %}</h2>
-    <p>
-        <a href="{% admin_edit_url object %}" class="button button-small button-secondary">{% trans "Edit / Review" %}</a>
-        <a href="{% url workflow_history_url_name object.pk|admin_urlquote %}" class="button button-small button-secondary">{% trans "Workflow history" %}</a>
-    </p>
-
-    <h2>{% icon "clipboard-list" classname="initial" %} {{ workflow_state.workflow.name }}</h2>
+    <h2 class="w-mt-8">{% icon "clipboard-list" classname="initial" %} {{ workflow_state.workflow.name }}</h2>
 
     <p>
         {% blocktrans trimmed with modified_by=workflow_state.requested_by|user_display_name %}Requested by <b>{{ modified_by }}</b>{% endblocktrans %}

wagtail/admin/templates/wagtailadmin/shared/workflow_history/listing.html

@@ -0,0 +1 @@
+{% extends "wagtailadmin/generic/listing.html" %}

wagtail/admin/templates/wagtailadmin/shared/workflow_history/{list.html → listing_results.html}

@@ -1,25 +1,25 @@
+{% extends "wagtailadmin/generic/listing_results.html" %}
 {% load i18n wagtailadmin_tags %}
-{% load l10n %}
 
-<table class="listing">
-    <thead>
-        <tr>
-            <th>
-                {% trans 'Status' %}
-            </th>
-            <th>
-                {% trans 'Tasks' %}
-            </th>
-            <th>
-                {% trans 'Requested by' %}
-            </th>
-            <th>
-                {% trans 'Started at' %}
-            </th>
-        </tr>
-    </thead>
-    <tbody>
-        {% if workflow_states %}
+{% block results %}
+    <table class="listing">
+        <thead>
+            <tr>
+                <th>
+                    {% trans 'Status' %}
+                </th>
+                <th>
+                    {% trans 'Tasks' %}
+                </th>
+                <th>
+                    {% trans 'Requested by' %}
+                </th>
+                <th>
+                    {% trans 'Started at' %}
+                </th>
+            </tr>
+        </thead>
+        <tbody>
             {% for workflow_state in workflow_states %}
                 <tr>
                     <td>
@@ -46,20 +46,18 @@
                     <td>{% human_readable_date workflow_state.created_at %}</td>
                 </tr>
             {% endfor %}
+        </tbody>
+    </table>
+{% endblock %}
+
+{% block no_results_message %}
+    <p>
+        {% if page %}
+            {% trans "This page hasn't been submitted for moderation yet" %}
         {% else %}
-            {% block no_results %}
-                <tr><td class="no-results-message">
-                    <p>
-                        {% if page %}
-                            {% trans "This page hasn't been submitted for moderation yet" %}
-                        {% else %}
-                            {% blocktrans trimmed with model_name=model_opts.verbose_name %}
-                                This {{ model_name }} hasn't been submitted for moderation yet
-                            {% endblocktrans %}
-                        {% endif %}
-                    </p>
-                </td></tr>
-            {% endblock %}
+            {% blocktrans trimmed with model_name=model_opts.verbose_name %}
+                This {{ model_name }} hasn't been submitted for moderation yet
+            {% endblocktrans %}
         {% endif %}
-    </tbody>
-</table>
+    </p>
+{% endblock %}

wagtail/admin/templates/wagtailadmin/tables/references_cell.html

@@ -3,7 +3,7 @@
         {% for reference in value %}
             <li>
                 {% if edit_url %}
-                    <a href="{{ edit_url }}#content-path-{{ reference.content_path }}">
+                    <a href="{{ edit_url }}#:w:contentpath={{ reference.content_path }}">
                 {% endif %}
                 {{ reference.describe_source_field }}{% if edit_url %}</a>{% endif %}{% if describe_on_delete %}: {{ reference.describe_on_delete }}{% endif %}
             </li>