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

wagtail/admin/templates/wagtailadmin/pages/bulk_actions/confirm_bulk_unpublish.html

@@ -1,7 +1,11 @@
 {% extends 'wagtailadmin/bulk_actions/confirmation/base.html' %}
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{% blocktrans trimmed count counter=items|length %}Unpublish 1 page {% plural %}Unpublish {{ counter }} pages{% endblocktrans %}{% endblock %}
+{% block titletag %}
+    {% with counter_val=items|length %}
+        {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}Unpublish 1 page {% plural %}Unpublish {{ counter }} pages{% endblocktrans %}
+    {% endwith %}
+{% endblock %}
 
 {% block header %}
     {% include "wagtailadmin/shared/header.html" with title=_("Unpublish") icon="doc-empty-inverse" %}
@@ -15,13 +19,15 @@
                 <li>
                     <a href="{% url 'wagtailadmin_pages:edit' page.item.id %}" target="_blank" rel="noreferrer">{{ page.item.get_admin_display_title }}</a>
                     <p>
-                        {% if page.live_descendant_count %}
-                            {% blocktrans trimmed count counter=page.live_descendant_count %}
-                                This page has one subpage
-                            {% plural %}
-                                This page has {{ counter }} subpages
-                            {% endblocktrans %}
-                        {% endif %}
+                        {% with live_descendant_count=page.live_descendant_count %}
+                            {% if live_descendant_count %}
+                                {% blocktrans trimmed with counter=live_descendant_count|intcomma count counter_val=live_descendant_count %}
+                                    This page has one subpage
+                                {% plural %}
+                                    This page has {{ counter }} subpages
+                                {% endblocktrans %}
+                            {% endif %}
+                        {% endwith %}
                     </p>
                 </li>
             {% endfor %}

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

@@ -12,7 +12,7 @@
                 {% trans 'Are you sure you want to delete this page?' %}
 
                 {% if descendant_count %}
-                    {% blocktrans trimmed count counter=descendant_count %}
+                    {% blocktrans trimmed with counter=descendant_count descendant_count=descendant_count|intcomma count counter=counter %}
                         Deleting this page will also delete {{ descendant_count }} child page.
                     {% plural %}
                         Deleting this page will also delete {{ descendant_count }} more child pages.
@@ -21,20 +21,20 @@
                     {% if translation_count %} {# has translations #}
                         {% if translation_descendant_count %} {# has translations with descendants #}
                             {% if translation_count == 1 %}
-                                {% blocktrans trimmed count counter=translation_descendant_count %}
+                                {% blocktrans trimmed with counter=translation_descendant_count translation_descendant_count=translation_descendant_count|intcomma count counter=counter %}
                                     It will also delete 1 translation and its combined {{ translation_descendant_count }} translated child page.
                                 {% plural %}
                                     It will also delete 1 translation and its combined {{ translation_descendant_count }} translated child pages.
                                 {% endblocktrans %}
                             {% else %}
-                                {% blocktrans trimmed count counter=translation_descendant_count %}
+                                {% blocktrans trimmed with counter=translation_descendant_count translation_count=translation_count|intcomma translation_descendant_count=translation_descendant_count|intcomma count counter=counter %}
                                     It will also delete {{ translation_count }} translations and their combined {{ translation_descendant_count }} translated child page.
                                 {% plural %}
                                     It will also delete {{ translation_count }} translations and their combined {{ translation_descendant_count }} translated child pages.
                                 {% endblocktrans %}
                             {% endif %}
                         {% else %}
-                            {% blocktrans trimmed count counter=translation_count %}
+                            {% blocktrans trimmed with counter=translation_count translation_count=translation_count|intcomma count counter=counter %}
                                 It will also delete {{ translation_count }} translation.
                             {% plural %}
                                 It will also delete {{ translation_count }} translations.
@@ -44,20 +44,20 @@
                 {% elif translation_count %} {# no descendants #}
                     {% if translation_descendant_count %} {# has translations with descendants #}
                         {% if translation_count == 1 %}
-                            {% blocktrans trimmed count counter=translation_descendant_count %}
+                            {% blocktrans trimmed with counter=translation_descendant_count translation_descendant_count=translation_descendant_count|intcomma count counter=counter %}
                                 Deleting this page will also delete 1 translation and its combined {{ translation_descendant_count }} translated child page.
                             {% plural %}
                                 Deleting this page will also delete 1 translation and its combined {{ translation_descendant_count }} translated child pages.
                             {% endblocktrans %}
                         {% else %}
-                            {% blocktrans trimmed count counter=translation_descendant_count %}
+                            {% blocktrans trimmed with counter=translation_descendant_count translation_count=translation_count|intcomma translation_descendant_count=translation_descendant_count|intcomma count counter=counter%}
                                 Deleting this page will also delete {{ translation_count }} translations and their combined {{ translation_descendant_count }} translated child page.
                             {% plural %}
                                 Deleting this page will also delete {{ translation_count }} translations and their combined {{ translation_descendant_count }} translated child pages.
                             {% endblocktrans %}
                         {% endif %}
                     {% else %}
-                        {% blocktrans trimmed count counter=translation_count %}
+                        {% blocktrans trimmed with counter=translation_count descendant_count=descendant_count|intcomma translation_count=translation_count|intcomma count counter=counter %}
                             Deleting this page will also delete {{ translation_count }} translation of this page.
                         {% plural %}
                             This will also delete {{ descendant_count }} more child pages.
@@ -70,8 +70,8 @@
             <form action="{% url 'wagtailadmin_pages:delete' page.id %}" method="POST">
                 {% csrf_token %}
                 {% if confirm_before_delete %}
-                    <p id="id_confirm_site_name-warning" class="status-msg warning">
-                        {% blocktrans trimmed with total_pages=descendant_count|add:1 %}
+                    <p id="id_confirm_site_name-warning" class="status-msg failure">
+                        {% blocktrans trimmed with total_pages=descendant_count|add:1|intcomma %}
                             This action will delete total <b>{{ total_pages }}</b> pages.
                         {% endblocktrans %}
                     </p>

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

@@ -1,5 +1,5 @@
 {% extends "wagtailadmin/base.html" %}
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 {% block titletag %}{% blocktrans trimmed with title=page_to_move.get_admin_display_title %}Move {{ title }}{% endblocktrans %}{% endblock %}
 {% block content %}
     {% include "wagtailadmin/shared/header.html" with title=_("Move") subtitle=page_to_move.get_admin_display_title icon="doc-empty-inverse" %}
@@ -12,7 +12,7 @@
                 {% blocktrans trimmed with title=destination.get_admin_display_title %}Are you sure you want to move this page and all of its children into '{{ title }}'?{% endblocktrans %}
             {% endif %}
             {% if translations_to_move_count %}
-                {% blocktrans trimmed count counter=translations_to_move_count %}
+                {% blocktrans trimmed with counter=translations_to_move_count translations_to_move_count=translations_to_move_count|intcomma count counter=counter %}
                     This will also move one translation of this page and its child pages
                 {% plural %}
                     This will also move {{ translations_to_move_count }} translations of this page and their child pages

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

@@ -5,7 +5,7 @@
     <p>
         {% trans "Are you sure you want to unpublish this page?" %}
         {% if translation_count %}
-            {% blocktrans trimmed with translation_count=translation_count count counter=translation_count %}
+            {% blocktrans trimmed with counter=translation_count translation_count=translation_count|intcomma count counter=counter %}
                 This will also unpublish one translation of the page.
             {% plural %}
                 This will also unpublish all {{ translation_count }} translations of the page.
@@ -21,20 +21,20 @@
         {% fragment as text %}
             {% if translation_descendant_count %}
                 {% if translation_descendant_count == 1 %}
-                    {% blocktrans trimmed count counter=live_descendant_count %}
+                    {% blocktrans trimmed with counter=live_descendant_count live_descendant_count=live_descendant_count|intcomma count counter=counter %}
                         This page has one subpage and its translations have a combined one translated child page. Unpublish these too
                     {% plural %}
                         This page has {{ live_descendant_count }} child pages and its translations have a combined one translated child page. Unpublish these too
                     {% endblocktrans %}
                 {% else %}
-                    {% blocktrans trimmed count counter=live_descendant_count %}
+                    {% blocktrans trimmed with counter=live_descendant_count live_descendant_count=live_descendant_count|intcomma translation_descendant_count=translation_descendant_count|intcomma count counter=counter %}
                         This page has one child page and its translations have a combined {{ translation_descendant_count }} translated child pages. Unpublish these too
                     {% plural %}
                         This page has {{ live_descendant_count }} child pages and its translations have a combined {{ translation_descendant_count }} translated child pages. Unpublish these too
                     {% endblocktrans %}
                 {% endif %}
             {% else %}
-                {% blocktrans trimmed count counter=live_descendant_count %}
+                {% blocktrans trimmed with counter=live_descendant_count live_descendant_count=live_descendant_count|intcomma count counter=counter %}
                     This page has one subpage. Unpublish this too
                 {% plural %}
                     This page has {{ live_descendant_count }} subpages. Unpublish these too

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

@@ -1,7 +1,6 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/form.html" %}
 {% load wagtailadmin_tags %}
 {% load i18n %}
-{% block bodyclass %}editor-view{% endblock %}
 
 {% block content %}
     {% get_comments_enabled as comments_enabled %}
@@ -18,7 +17,7 @@
         data-controller="w-init w-unsaved"
         data-action="w-unsaved#submit beforeunload@window->w-unsaved#confirm change->w-unsaved#check keyup->w-unsaved#check"
         data-w-init-event-value="{% if comments_enabled %}w-comments:init{% endif %}"
-        data-w-unsaved-confirmation-value="{{ _("This page has unsaved changes.") }}"
+        data-w-unsaved-confirmation-value="true"
         data-w-unsaved-force-value="{% if has_unsaved_changes %}true{% else %}false{% endif %}"
         data-w-unsaved-watch-value="edits{% if comments_enabled %} comments{% endif %}"
     >
@@ -34,38 +33,20 @@
 
         {{ edit_handler.render_form_content }}
 
-        <footer class="footer w-grid md:w-grid-flow-col">
-            <nav class="actions actions--primary footer__container" aria-label="{% trans 'Actions' %}">
-                {{ action_menu.render_html }}
-                {% block extra_footer_actions %}
-                {% endblock %}
-            </nav>
-            {% include "wagtailadmin/pages/_unsaved_changes_warning.html" %}
-        </footer>
+        {% block footer %}
+            {{ block.super }}
+            {# Reuse the footer container, but redefine the actions content down below to use component classes #}
+        {% endblock %}
     </form>
 
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-
-    {% comment %}
-        Additional js from widgets media. Allows for custom widgets in admin panel.
-    {% endcomment %}
-    {{ media.js }}
-
-    <script>
-        // Set wagtailConfig.ACTIVE_CONTENT_LOCALE if this is a translated page
-        // This value may be used by JS widgets on the form
-        {% if locale %}
-            window.wagtailConfig = window.wagtailConfig || {};
-            window.wagtailConfig.ACTIVE_CONTENT_LOCALE = '{{ locale.language_code|escapejs }}';
-        {% endif %}
-    </script>
-{% endblock %}
+{% block actions %}
+    {{ action_menu.render_html }}
+    {% block extra_footer_actions %}
+        {% comment %}
+            While undocumented, this block is used by some packages to add
+            additional actions *outside* of the dropdown menu.
+        {% endcomment %}
+    {% endblock %}
+{% endblock%}

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

@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/form.html" %}
 {% load wagtailadmin_tags %}
 {% load i18n %}
 {% load l10n %}
@@ -22,7 +22,7 @@
             data-controller="w-init w-unsaved"
             data-action="w-unsaved#submit beforeunload@window->w-unsaved#confirm change->w-unsaved#check keyup->w-unsaved#check"
             data-w-init-event-value="{% if comments_enabled %}w-comments:init{% endif %}"
-            data-w-unsaved-confirmation-value="{{ _("This page has unsaved changes.") }}"
+            data-w-unsaved-confirmation-value="true"
             data-w-unsaved-force-value="{% if has_unsaved_changes %}true{% else %}false{% endif %}"
             data-w-unsaved-watch-value="edits{% if comments_enabled %} comments{% endif %}"
         >
@@ -35,40 +35,25 @@
                 <input type="hidden" name="revision" value="{{ revision.id|unlocalize }}" />
             {% endif %}
 
-            <footer class="footer w-grid md:w-grid-flow-col">
-                <nav class="actions actions--primary footer__container" aria-label="{% trans 'Actions' %}">
-                    {{ action_menu.render_html }}
-                    {% block extra_footer_actions %}
-                    {% endblock %}
-                </nav>
-                {% include "wagtailadmin/pages/_unsaved_changes_warning.html" %}
-            </footer>
+            {% block footer %}
+                {{ block.super }}
+                {# Reuse the footer container, but redefine the actions content down below to use component classes #}
+            {% endblock %}
         </form>
     {% endblock %}
 {% endblock %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
+{% block actions %}
+    {{ action_menu.render_html }}
+    {% block extra_footer_actions %}
+        {% comment %}
+            While undocumented, this block is used by some packages to add
+            additional actions *outside* of the dropdown menu.
+        {% endcomment %}
+    {% endblock %}
+{% endblock%}
 
 {% block extra_js %}
     {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-
-    {% comment %}
-        Additional js from widgets media. Allows for custom widgets in admin panel.
-    {% endcomment %}
-    {{ media.js }}
-
-    <script>
-        // Set wagtailConfig.ACTIVE_CONTENT_LOCALE if this is a translated page
-        // This value may be used by JS widgets on the form
-        {% if locale %}
-            window.wagtailConfig = window.wagtailConfig || {};
-            window.wagtailConfig.ACTIVE_CONTENT_LOCALE = '{{ locale.language_code|escapejs }}';
-        {% endif %}
-    </script>
-
     {% include "wagtailadmin/shared/_workflow_init.html" %}
 {% endblock %}

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

@@ -6,3 +6,9 @@
     {% page_permissions parent_page as parent_page_perms %}
     {% include 'wagtailadmin/pages/page_listing_header.html' with title=header_title search_url=index_results_url page_perms=parent_page_perms %}
 {% endblock %}
+
+{% block extra_js %}
+    {# Used by the privacy switch for the parent page in the status side panel. #}
+    {{ block.super }}
+    <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
+{% endblock %}

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

@@ -0,0 +1,60 @@
+{% extends "wagtailadmin/pages/index_results.html" %}
+{% load wagtailadmin_tags i18n %}
+
+{% block before_results %}
+    {% if not is_searching and not is_filtering %}
+        {% comment %}
+            Messages about any special implications / treatment of pages in the current section (e.g. they are unroutable
+            because no site is associated) are only shown if we are not searching or filtering. This is because search /
+            filter results include descendant pages, for which the message would not necessarily be accurate.
+        {% endcomment %}
+
+        {% if parent_page.is_root %}
+            <div class="nice-padding">
+                <div class="help-block help-info">
+                    {% icon name='help' %}
+                    {% if perms.wagtailcore.add_site %}
+                        {% url 'wagtailsites:index' as wagtailsites_index_url %}
+                        <p>
+                            {% blocktrans trimmed %}
+                                The root level is where you can add new sites to your Wagtail installation. Pages created here will not be accessible at any URL until they are associated with a site.
+                            {% endblocktrans %}
+                            {% if wagtailsites_index_url %}
+                                <a href="{{ wagtailsites_index_url }}">{% trans "Configure a site now." %}</a>
+                            {% endif %}
+                        </p>
+                        <p>
+                            {% blocktrans trimmed %}
+                                If you just want to add pages to an existing site, create them as children of the homepage instead.
+                            {% endblocktrans %}
+                        </p>
+                    {% else %}
+                        {% blocktrans trimmed %}
+                            Pages created here will not be accessible at any URL. To add pages to an existing site, create them as children of the homepage.
+                        {% endblocktrans %}
+                    {% endif %}
+                </div>
+            </div>
+            {# get_url_parts will return None is the page has no site #}
+        {% elif not parent_page.get_url_parts %}
+            <div class="nice-padding">
+                <div class="help-block help-warning">
+                    {% icon name='warning' %}
+                    {% if perms.wagtailcore.add_site %}
+                        {% url 'wagtailsites:index' as wagtailsites_index_url %}
+                        {% blocktrans trimmed %}
+                            There is no site set up for this location. Pages created here will not be accessible at any URL until a site is associated with this location.
+                        {% endblocktrans %}
+                        {% if wagtailsites_index_url %}
+                            <a href="{{ wagtailsites_index_url }}">{% trans "Configure a site now." %}</a>
+                        {% endif %}
+                    {% else %}
+                        {% blocktrans trimmed %}
+                            There is no site record for this location. Pages created here will not be accessible at any URL.
+                        {% endblocktrans %}
+                    {% endif %}
+                </div>
+            </div>
+        {% endif %}
+    {% endif %}
+{% endblock %}

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

@@ -1,36 +1 @@
-{% extends "wagtailadmin/generic/index.html" %}
-{% load wagtailadmin_tags i18n %}
-
-{% block header %}
-    {% include 'wagtailadmin/shared/headers/slim_header.html' with title=header_title icon_name=header_icon search_url=index_results_url buttons=header_buttons %}
-{% endblock %}
-
-{% block listing %}
-    <div id="listing-results">
-        {% comment %}
-            This div will be replaced on AJAX refreshes.
-            Do not add page furniture here unless you intend it to disappear on AJAX refresh
-        {% endcomment %}
-        {% include 'wagtailadmin/pages/index_results.html' %}
-    </div>
-{% endblock %}
-{% block bulk_actions %}
-    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=_("Select all pages in listing") app_label='wagtailcore' model_name='page' objects=page_obj %}
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-
-    <script src="{% versioned_static 'wagtailadmin/js/privacy-switch.js' %}"></script>
-
-    {% comment %}
-    The first column will display checkboxes only if ordering is not being carried out, in which case
-    that column will have the drag and drop buttons to enable ordering
-    {% endcomment %}
-    {% if not show_ordering_column %}
-        <script>
-            window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'PAGE';
-        </script>
-        <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
-    {% endif %}
-{% endblock %}
+{% extends "wagtailadmin/pages/listing.html" %}

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

@@ -1,4 +1,4 @@
-{% load wagtailadmin_tags i18n %}
+{% load wagtailadmin_tags %}
 
 {% if view.active_filters %}
     {% include "wagtailadmin/shared/active_filters.html" with active_filters=view.active_filters %}
@@ -13,55 +13,7 @@
 <form id="page-reorder-form">
     {% csrf_token %}
 
-    {% if parent_page %}
-        {% if parent_page.is_root %}
-            <div class="nice-padding">
-                <div class="help-block help-info">
-                    {% icon name='help' %}
-                    {% if perms.wagtailcore.add_site %}
-                        {% url 'wagtailsites:index' as wagtailsites_index_url %}
-                        <p>
-                            {% blocktrans trimmed %}
-                                The root level is where you can add new sites to your Wagtail installation. Pages created here will not be accessible at any URL until they are associated with a site.
-                            {% endblocktrans %}
-                            {% if wagtailsites_index_url %}
-                                <a href="{{ wagtailsites_index_url }}">{% trans "Configure a site now." %}</a>
-                            {% endif %}
-                        </p>
-                        <p>
-                            {% blocktrans trimmed %}
-                                If you just want to add pages to an existing site, create them as children of the homepage instead.
-                            {% endblocktrans %}
-                        </p>
-                    {% else %}
-                        {% blocktrans trimmed %}
-                            Pages created here will not be accessible at any URL. To add pages to an existing site, create them as children of the homepage.
-                        {% endblocktrans %}
-                    {% endif %}
-                </div>
-            </div>
-            {# get_url_parts will return None is the page has no site #}
-        {% elif not parent_page.get_url_parts %}
-            <div class="nice-padding">
-                <div class="help-block help-warning">
-                    {% icon name='warning' %}
-                    {% if perms.wagtailcore.add_site %}
-                        {% url 'wagtailsites:index' as wagtailsites_index_url %}
-                        {% blocktrans trimmed %}
-                            There is no site set up for this location. Pages created here will not be accessible at any URL until a site is associated with this location.
-                        {% endblocktrans %}
-                        {% if wagtailsites_index_url %}
-                            <a href="{{ wagtailsites_index_url }}">{% trans "Configure a site now." %}</a>
-                        {% endif %}
-                    {% else %}
-                        {% blocktrans trimmed %}
-                            There is no site record for this location. Pages created here will not be accessible at any URL.
-                        {% endblocktrans %}
-                    {% endif %}
-                </div>
-            </div>
-        {% endif %}
-    {% endif %}
+    {% block before_results %}{% endblock %}
 
     {% component table %}
 

wagtail/admin/templates/wagtailadmin/pages/listing/_locked_indicator.html

@@ -8,7 +8,7 @@
 
 {% if page.locked %}
     <span
-        class="indicator locked-indicator {% if page.locked_by_id == request.user.pk %}indicator--is-inverse{% endif %}"
+        class="indicator {% if page.locked_by_id != request.user.pk %}indicator--is-dimmed{% endif %}"
         title="{% if page.locked_by_id == request.user.pk %}{% trans 'This page is locked, by you, to further editing' %}{% else %}{% trans 'This page is locked to further editing' %}{% endif %}"
     >
         {% icon name="lock" classname="initial" %}

wagtail/admin/templates/wagtailadmin/pages/listing/_ordering_cell.html

@@ -11,7 +11,7 @@
         <span class="w-sr-only">
             {% trans 'Drag' %}
             <span>
-                {% blocktranslate trimmed with index=row.index|add:1 total=table.row_count %}Item {{ index }} of {{ total }}{% endblocktranslate %}
+                {% blocktranslate trimmed with index=row.index|add:1|intcomma total=table.row_count|intcomma %}Item {{ index }} of {{ total }}{% endblocktranslate %}
             </span>
         </span>
     </button>

wagtail/admin/templates/wagtailadmin/pages/listing/_page_header_buttons.html

@@ -2,7 +2,7 @@
 
 {% trans "Actions" as title %}
 <nav aria-label="{{ title }}">
-    {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=title toggle_classname="w-p-0 w-w-8 w-h-slim-header hover:w-scale-110 w-transition w-outline-offset-inside w-relative w-z-30" toggle_tooltip_offset="[0, -2]" %}
+    {% dropdown toggle_icon="dots-horizontal" toggle_aria_label=title toggle_classname="w-p-0 w-outline-offset-inside w-relative w-z-30" toggle_tooltip_offset="[0, -2]" %}
         {% block content %}
             {% include "wagtailadmin/pages/listing/_dropdown_items.html" with buttons=buttons only %}
         {% endblock %}

wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_column_header.html

@@ -4,7 +4,7 @@
 {% block after_label %}
     {% if result_scope == "whole_tree" %}
         {% if items_count %}
-            {% blocktranslate trimmed %}
+            {% blocktranslate trimmed with start_index=start_index|intcomma end_index=end_index|intcomma items_count=items_count|intcomma %}
                 {{ start_index }}-{{ end_index }} of {{ items_count }} across entire site.
             {% endblocktranslate %}
         {% else %}
@@ -17,7 +17,7 @@
         </a>
     {% elif result_scope == "parent" %}
         {% if items_count %}
-            {% blocktranslate trimmed with title=parent_page.get_admin_display_title %}
+            {% blocktranslate trimmed with title=parent_page.get_admin_display_title start_index=start_index|intcomma end_index=end_index|intcomma items_count=items_count|intcomma %}
                 {{ start_index }}-{{ end_index }} of {{ items_count }} in '<span class="w-title-ellipsis">{{ title }}</span>'.
             {% endblocktranslate %}
         {% else %}
@@ -29,7 +29,7 @@
             {% translate "Search the whole site" %}
         </a>
     {% else %}
-        {% blocktranslate trimmed %}
+        {% blocktranslate trimmed with start_index=start_index|intcomma end_index=end_index|intcomma items_count=items_count|intcomma %}
             {{ start_index }}-{{ end_index }} of {{ items_count }}
         {% endblocktranslate %}
     {% endif %}

wagtail/admin/templates/wagtailadmin/pages/listing/_pagination.html

@@ -5,7 +5,7 @@ Pagination for page listings. Used by the `{% paginate %}` template tag.
 {% endcomment %}
 
 <nav class="pagination" aria-label="{% trans 'Pagination' %}">
-    <p>{% blocktrans trimmed with page_number=page.number num_pages=paginator.num_pages %}
+    <p>{% blocktrans trimmed with page_number=page.number|intcomma num_pages=paginator.num_pages|intcomma %}
         Page {{ page_number }} of {{ num_pages }}.
     {% endblocktrans %}</p>
     <ul>

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

@@ -0,0 +1,24 @@
+{% extends "wagtailadmin/generic/index.html" %}
+{% load wagtailadmin_tags i18n %}
+{% comment %}
+    A base template for listing pages in the Wagtail admin. This is used as-is
+    by non-explorable listings, e.g. in a `PageListingViewSet`'s `IndexView` and
+    in the main "Search" view. It is also extended by explorable_index.html for
+    additional functionality.
+{% endcomment %}
+
+{% block bulk_actions %}
+    {% include 'wagtailadmin/bulk_actions/footer.html' with select_all_obj_text=_("Select all pages in listing") app_label='wagtailcore' model_name='page' objects=page_obj %}
+{% endblock %}
+
+{% block extra_js %}
+    {{ block.super }}
+
+    {% comment %}
+    The first column will display checkboxes only if ordering is not being carried out, in which case
+    that column will have the drag and drop buttons to enable ordering
+    {% endcomment %}
+    {% if not show_ordering_column %}
+        <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
+    {% endif %}
+{% endblock %}

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

@@ -1,20 +1 @@
-{% extends "wagtailadmin/base.html" %}
-{% load wagtailadmin_tags i18n %}
-{% block titletag %}{% trans 'Search' %}{% endblock %}
-{% block extra_js %}
-    {{ block.super }}
-    <script>
-        window.wagtailConfig.BULK_ACTION_ITEM_TYPE = 'PAGE';
-    </script>
-    <script defer src="{% versioned_static 'wagtailadmin/js/bulk-actions.js' %}"></script>
-{% endblock %}
-
-{% block content %}
-    {% url 'wagtailadmin_pages:search_results' as search_results_url %}
-    {% include "wagtailadmin/shared/header.html" with title=_("Search") search_url="wagtailadmin_pages:search" icon="search" search_results_url=search_results_url search_target="#page-results" %}
-    <div id="page-results">
-        {% include "wagtailadmin/pages/search_results.html" %}
-    </div>
-    {% trans "Select all pages in listing" as select_all_text %}
-    {% include 'wagtailadmin/bulk_actions/footer.html' with app_label='wagtailcore' model_name='page' objects=page_obj select_all_obj_text=select_all_text %}
-{% endblock %}
+{% extends "wagtailadmin/pages/listing.html" %}