wagtail 7.0.1__py3-none-any.whl → 7.1__py3-none-any.whl

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

@@ -17,10 +17,12 @@
                         <th class="w-h4" scope="rowgroup">{{ category.1 }}</th>
                     </tr>
                     {% for shortcut in shortcuts %}
-                        <tr class="w-keyboard_shortcuts__key">
-                            <th scope="row">{{ shortcut.0 }}</th>
-                            <td><kbd>{{ shortcut.1 }}</kbd></td>
-                        </tr>
+                        {% if shortcut %}
+                            <tr class="w-keyboard_shortcuts__key">
+                                <th scope="row">{{ shortcut.0 }}</th>
+                                <td><kbd>{{ shortcut.1 }}</kbd></td>
+                            </tr>
+                        {% endif %}
                     {% endfor %}
                 </tbody>
             {% endfor %}

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

@@ -15,6 +15,8 @@
     - `header_controls` - Additional panel buttons to display in the header area.
     - `attrs` - Additional HTML attributes to render on the panel.
 
+    When making changes to this template, please ensure that the JavaScript-equivalent `CollapsiblePanel` component is also updated accordingly.
+
 {% endcomment %}
 {% fragment as prefix %}{% if id_prefix %}{{ id_prefix }}-{% endif %}{{ id }}{% endfragment %}
 {% fragment as panel_id %}{{ prefix }}-section{% endfragment %}

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

@@ -1,44 +1,60 @@
 {% load i18n wagtailadmin_tags %}
-<template id="w-a11y-result-row-template">
-    <div class="w-a11y-result__row" data-a11y-result-row>
-        <div>
-            <h3 class="w-a11y-result__header">
-                <span class="w-a11y-result__name" data-a11y-result-name></span>
-            </h3>
-            <div class="w-a11y-result__help" data-a11y-result-help></div>
+{% block result_template %}
+    <template id="w-a11y-result-row-template">
+        <div class="w-a11y-result__row" data-a11y-result-row>
+            <div>
+                <h3 class="w-a11y-result__header">
+                    <span class="w-a11y-result__name" data-a11y-result-name></span>
+                </h3>
+                <div class="w-a11y-result__help" data-a11y-result-help></div>
+            </div>
+            <button
+                class="w-a11y-result__selector"
+                data-a11y-result-selector
+                aria-label="{% trans 'Show issue' %}"
+                type="button"
+            >
+                <span class="w-a11y-result__selector-text" data-a11y-result-selector-text></span>
+                {% icon name="link-external" classname="w-a11y-result__icon" %}
+            </button>
         </div>
-        <button
-            class="w-a11y-result__selector"
-            data-a11y-result-selector
-            aria-label="{% trans 'Show issue' %}"
-            type="button"
-        >
-            <span class="w-a11y-result__selector-text" data-a11y-result-selector-text></span>
-            {% icon name="link-external" classname="w-a11y-result__icon" %}
-        </button>
-    </div>
-</template>
-<div class="w-divide-y w-divide-border-furniture w-py-6 w-pl-2 lg:w-pl-8">
-    <div>
-        <h2 class="w-my-5 w-text-16 w-font-bold w-text-text-label">
-            {% trans 'Content metrics' %}
-        </h2>
-        <div class="w-flex w-gap-10">
+    </template>
+{% endblock %}
+
+{% block content %}
+    <div class="w-divide-y w-divide-border-furniture w-py-6 w-pl-2 lg:w-pl-8 w-gap-3">
+        {% block metrics_section %}
             <div>
-                <h3 class="w-my-2 w-text-14 w-text-text-placeholder">{% trans 'Words' %}</h3>
-                <p class="w-font-semibold w-text-text-label" data-content-word-count>-</p>
+                <h2 class="w-my-5 w-text-16 w-font-bold w-text-text-label">
+                    {% trans 'Content metrics' %}
+                </h2>
+                <div class="w-flex w-flex-wrap w-gap-x-10 w-gap-y-4">
+                    {% block metrics %}
+                        <div>
+                            <h3 class="w-my-2 w-text-14 w-text-text-placeholder">{% trans 'Words' %}</h3>
+                            <p class="w-font-semibold w-text-text-label" data-content-word-count>-</p>
+                        </div>
+                        <div>
+                            <h3 class="w-my-2 w-text-14 w-text-text-placeholder">{% trans 'Reading time' %}</h3>
+                            <p class="w-font-semibold w-text-text-label" data-content-reading-time>-</p>
+                        </div>
+                    {% endblock %}
+                </div>
             </div>
+        {% endblock %}
+        {% block issues_section %}
             <div>
-                <h3 class="w-my-2 w-text-14 w-text-text-placeholder">{% trans 'Reading time' %}</h3>
-                <p class="w-font-semibold w-text-text-label" data-content-reading-time>-</p>
+                <h2 class="w-flex w-items-center w-gap-2 w-my-5 w-text-16 w-font-bold">
+                    <span>{% trans 'Issues found' %}</span><span class="w-a11y-result__count" data-a11y-result-count>0</span>
+                </h2>
+                {% block issues %}
+                    <div class="w-flex w-flex-col w-gap-2.5" data-checks-panel></div>
+                {% endblock %}
             </div>
-        </div>
-    </div>
-    <div class="w-mt-3">
-        <h2 class="w-flex w-items-center w-gap-2 w-my-5 w-text-16 w-font-bold">
-            <span>{% trans 'Issues found' %}</span><span class="w-a11y-result__count" data-a11y-result-count>0</span>
-        </h2>
-        <div class="w-flex w-flex-col w-gap-2.5" data-checks-panel></div>
+        {% endblock %}
     </div>
-</div>
-{{ axe_configuration|json_script:"accessibility-axe-configuration" }}
+{% endblock %}
+
+{% block axe_config %}
+    {{ axe_configuration|json_script:"accessibility-axe-configuration" }}
+{% endblock %}

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

@@ -1,14 +1,21 @@
 {% load i18n %}
 
-{# Comment Notifications Toggle  #}
-{% if form.show_comments_toggle %}
-    <div class="w-relative w-flex w-justify-end w-mt-1 w-ml-8" data-comment-notifications hidden>
-        <label class="switch w-p-0 w-m-0 w-font-normal w-flex w-justify-between w-text-14 w-space-x-2">
-            {% trans "Comment notifications" %}
-            {{ form.comment_notifications }}
-            <span class="switch__toggle"></span>
-        </label>
-    </div>
-{% endif %}
+{% block notifications_toggle %}
+    {# Comment Notifications Toggle  #}
+    {% if form.show_comments_toggle %}
+        <div class="w-relative w-flex w-justify-end w-mt-1 w-ml-8" data-comment-notifications hidden>
+            <label class="switch w-p-0 w-m-0 w-font-normal w-flex w-justify-between w-text-14 w-space-x-2">
+                {% trans "Comment notifications" %}
+                {{ form.comment_notifications }}
+                <span class="switch__toggle"></span>
+            </label>
+        </div>
+    {% endif %}
+{% endblock notifications_toggle %}
 
-<div id="comments"></div>
+{% block content %}
+    <div id="comments">
+        {% block comments %}
+        {% endblock %}
+    </div>
+{% endblock %}

wagtail/admin/templates/wagtailadmin/shared/tabs/tab_nav_link.html

@@ -9,7 +9,7 @@
     - `classname` - {string?} Extra css classes to pass to this component
 {% endcomment %}
 
-<a id="tab-label-{{ tab_id }}" href="#tab-{{ tab_id }}" class="w-tabs__tab {{ classname }}" role="tab" aria-selected="false" tabindex="-1">
+<a id="tab-label-{{ tab_id }}" href="#tab-{{ tab_id }}" class="w-tabs__tab {{ classname }}" role="tab" aria-selected="false" tabindex="-1" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger">
     {{ title }}
     <div class="w-tabs__errors" data-controller="w-count" data-w-count-active-class="!w-flex" data-w-count-container-value="#tab-{{ tab_id }}">
         <span aria-hidden="true" data-w-count-target="total"></span>

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

@@ -19,15 +19,15 @@
     </p>
 
 
-    <div class="w-tabs" data-tabs>
+    <div class="w-tabs" data-controller="w-tabs" data-action="popstate@window->w-tabs#select" data-w-tabs-use-location-value="true">
         <div class="w-tabs__wrapper">
-            <div role="tablist" class="w-tabs__list ">
+            <div role="tablist" class="w-tabs__list " data-action="keydown.right->w-tabs#selectNext keydown.left->w-tabs#selectPrevious keydown.home->w-tabs#selectFirst keydown.end->w-tabs#selectLast">
                 {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id="tasks" title=_("Tasks") %}
                 {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id="timeline" title=_("Timeline") %}
             </div>
         </div>
         <div class="tab-content">
-            <section id="tab-tasks" role="tabpanel" data-tab="tasks" aria-labelledby="tab-label-tasks" hidden>
+            <section id="tab-tasks" role="tabpanel" aria-labelledby="tab-label-tasks" data-w-tabs-target="panel" hidden>
                 <table class="workflow-progress-table workflow-progress-table--tasks">
                     <colgroup width="20%"></colgroup>
                     {% for task in tasks %}
@@ -87,7 +87,7 @@
                 </table>
             </section>
 
-            <section id="tab-timeline" role="tabpanel" data-tab="timeline" aria-labelledby="tab-label-timeline" hidden>
+            <section id="tab-timeline" role="tabpanel" aria-labelledby="tab-label-timeline" data-w-tabs-target="panel" hidden>
                 <table class="workflow-progress-table workflow-progress-table--timeline">
                     <colgroup width="20%"></colgroup>
                     <colgroup width="80%"></colgroup>

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

@@ -3,8 +3,8 @@
     {% if value is None %}
         {% icon title=value|stringformat:'s' name="help" classname="default" %}
     {% elif value %}
-        {% icon title=value|stringformat:'s' name="success" classname="default w-text-positive-100" %}
+        {% icon title=value|stringformat:'s' name="check" classname="default w-text-positive-100" %}
     {% else %}
-        {% icon title=value|stringformat:'s' name="error" classname="default w-text-critical-100" %}
+        {% icon title=value|stringformat:'s' name="cross" classname="default w-text-text-error" %}
     {% endif %}
 </td>

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

@@ -1 +1 @@
-<td><a href="{{ download_url }}" class="nolink" download>{{ value }}</a></td>
+<td class="wrap-anywhere"><a href="{{ download_url }}" class="nolink" download>{{ value }}</a></td>

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

@@ -0,0 +1,11 @@
+{% load i18n l10n wagtailadmin_tags %}
+
+<td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
+    <a href="{{ instance.usage_url }}">
+        {% blocktrans trimmed with usage_count=raw_value|intcomma count usage_count_counter=raw_value %}
+            Used {{ usage_count }} time
+        {% plural %}
+            Used {{ usage_count }} times
+        {% endblocktrans %}
+    </a>
+</td>

wagtail/admin/templates/wagtailadmin/userbar/base.html

@@ -3,9 +3,12 @@
 <template id="wagtail-userbar-template">
     {# In preview panels, we still render the userbar UI, but hidden by default. #}
     <aside {% if request.in_preview_panel %}hidden{% endif %}>
-        <div class="w-userbar w-userbar--{{ position|default:'bottom-right' }} {% admin_theme_classname %}" data-wagtail-userbar part="userbar">
-            <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/core.css' %}">
-            {% hook_output 'insert_global_admin_css' %}
+        <div class="w-userbar w-userbar--{{ position|default:'bottom-right' }} {% admin_theme_classname %}" data-wagtail-userbar data-wagtail-userbar-origin="{{ origin|default:"" }}" part="userbar">
+            {% block css %}
+                <link rel="stylesheet" href="{% absolute_static 'wagtailadmin/css/core.css' %}">
+                {# For headless userbar: the contents of the hook also need absolute URLs #}
+                {% hook_output 'insert_global_admin_css' %}
+            {% endblock %}
             <div class="w-userbar-nav">
 
                 <svg class="w-hidden">
@@ -28,9 +31,11 @@
                     <span class="w-sr-only">{% trans 'View Wagtail quick actions' %}</span>
                 </button>
                 <ul aria-labelledby="wagtail-userbar-trigger" class="w-userbar-items" id="wagtail-userbar-items" role="menu">
-                    {% for item in items %}
-                        {{ item|safe }}
-                    {% endfor %}
+                    {% block items %}
+                        {% for item in items %}
+                            {{ item|safe }}
+                        {% endfor %}
+                    {% endblock %}
                 </ul>
             </div>
         </div>
@@ -38,6 +43,8 @@
     </aside>
 </template>
 <wagtail-userbar></wagtail-userbar>
-<script src="{% versioned_static 'wagtailadmin/js/vendor.js' %}"></script>
-<script src="{% versioned_static 'wagtailadmin/js/userbar.js' %}"></script>
+{% block js %}
+    <script src="{% absolute_static 'wagtailadmin/js/vendor.js' %}"></script>
+    <script src="{% absolute_static 'wagtailadmin/js/userbar.js' %}"></script>
+{% endblock %}
 <!-- end Wagtail user bar embed code -->

wagtail/admin/templates/wagtailadmin/userbar/item_accessibility.html

@@ -13,23 +13,23 @@
         <span class="w-a11y-result__count" data-a11y-result-count></span>
     {% endfragment %}
     {% fragment as dialog_classname %}w-dialog--userbar {% admin_theme_classname %}{% endfragment %}
-    {% dialog id="accessibility-results" theme="floating" classname=dialog_classname title=dialog_title subtitle=issues_found a11y_count="a11y_count" %}
-        {# Contents of the dialog created in JS based on these templates. #}
-        <template id="w-a11y-result-row-template">
-            <div class="w-a11y-result__row" data-a11y-result-row>
-                <div>
-                    <h3 class="w-a11y-result__header">
-                        <span class="w-a11y-result__name" data-a11y-result-name></span>
-                    </h3>
-                    <div class="w-a11y-result__help" data-a11y-result-help></div>
-                </div>
-                <button class="w-a11y-result__selector" data-a11y-result-selector aria-label="{% trans 'Show issue' %}" type="button">
-                    {% icon name="crosshairs" classname="w-a11y-result__icon" %}
-                </button>
-            </div>
-        </template>
-        <template id="w-a11y-result-outline-template">
-            <div class="w-a11y-result__outline" data-a11y-result-outline></div>
-        </template>
+    {% dialog id="accessibility-results" theme="floating" classname=dialog_classname title=dialog_title subtitle=issues_found a11y_count="a11y_count" dialog_root_selector="[data-wagtail-userbar]" %}
     {% enddialog %}
+    {# Contents of the dialog created in JS based on these templates. #}
+    <template id="w-a11y-result-row-template">
+        <div class="w-a11y-result__row" data-a11y-result-row>
+            <div>
+                <h3 class="w-a11y-result__header">
+                    <span class="w-a11y-result__name" data-a11y-result-name></span>
+                </h3>
+                <div class="w-a11y-result__help" data-a11y-result-help></div>
+            </div>
+            <button class="w-a11y-result__selector" data-a11y-result-selector aria-label="{% trans 'Show issue' %}" type="button">
+                {% icon name="crosshairs" classname="w-a11y-result__icon" %}
+            </button>
+        </div>
+    </template>
+    <template id="w-a11y-result-outline-template">
+        <div class="w-a11y-result__outline" data-a11y-result-outline></div>
+    </template>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/userbar/item_admin.html

@@ -2,7 +2,8 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_home' %}" target="_parent" role="menuitem">
+    {% base_url_setting default="" as base_url %}
+    <a href="{{ base_url }}{% url 'wagtailadmin_home' %}" target="_parent" role="menuitem">
         {% icon name="key" classname="w-action-icon" %}
         {% trans 'Go to Wagtail admin' %}
     </a>

wagtail/admin/templates/wagtailadmin/userbar/item_page_add.html

@@ -2,7 +2,8 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_pages:add_subpage' self.page.id %}" target="_parent" role="menuitem">
+    {% base_url_setting default="" as base_url %}
+    <a href="{{ base_url }}{% url 'wagtailadmin_pages:add_subpage' self.page.id %}" target="_parent" role="menuitem">
         {% icon name="plus" classname="w-action-icon" %}
         {% trans 'Add a child page' %}
     </a>

wagtail/admin/templates/wagtailadmin/userbar/item_page_edit.html

@@ -2,7 +2,8 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_pages:edit' self.page.id %}" target="_parent" role="menuitem">
+    {% base_url_setting default="" as base_url %}
+    <a href="{{ base_url }}{% url 'wagtailadmin_pages:edit' self.page.id %}" target="_parent" role="menuitem">
         {% icon name="edit" classname="w-action-icon" %}
         {% trans 'Edit this page' %}
     </a>

wagtail/admin/templates/wagtailadmin/userbar/item_page_explore.html

@@ -2,7 +2,8 @@
 {% load i18n wagtailadmin_tags %}
 
 {% block item_content %}
-    <a href="{% url 'wagtailadmin_explore' self.parent_page.id %}" target="_parent" role="menuitem">
+    {% base_url_setting default="" as base_url %}
+    <a href="{{ base_url }}{% url 'wagtailadmin_explore' self.parent_page.id %}" target="_parent" role="menuitem">
         {% icon name="folder-open-inverse" classname="w-action-icon" %}
         {% trans 'Show in Explorer' %}
     </a>

wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html

@@ -2,9 +2,9 @@
 {% include "wagtailadmin/shared/header.html" with title=_("Choose a task") merged=1 icon="thumbtack" %}
 
 {% if can_create %}
-    <div class="w-tabs" data-tabs data-tabs-disable-url>
+    <div class="w-tabs" data-controller="w-tabs" data-w-tabs-use-location-value="false">
         <div class="w-tabs__wrapper w-overflow-hidden">
-            <div role="tablist" class="w-tabs__list w-w-full">
+            <div role="tablist" class="w-tabs__list w-w-full" data-action="keydown.right->w-tabs#selectNext keydown.left->w-tabs#selectPrevious keydown.home->w-tabs#selectFirst keydown.end->w-tabs#selectLast">
                 {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='new' title=_("New") %}
                 {% include 'wagtailadmin/shared/tabs/tab_nav_link.html' with tab_id='existing' title=_("Existing") %}
             </div>
@@ -16,6 +16,7 @@
                 class="w-tabs__panel"
                 role="tabpanel"
                 aria-labelledby="tab-label-new"
+                data-w-tabs-target="panel"
                 hidden
             >
                 {% include "wagtailadmin/workflows/task_chooser/includes/create_tab.html" %}
@@ -25,6 +26,7 @@
                 class="w-tabs__panel"
                 role="tabpanel"
                 aria-labelledby="tab-label-existing"
+                data-w-tabs-target="panel"
                 hidden
             >
                 <form

wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/results.html

@@ -69,7 +69,7 @@
             {% trans "You haven't created any tasks." %}
             {% if can_create %}
                 {% blocktrans trimmed %}
-                    Why not <a class="create-one-now" href="#tab-new" data-tab-trigger>create one now</a>?
+                    Why not <a class="create-one-now" href="#tab-new" data-action="w-tabs#select:prevent" data-w-tabs-target="trigger" data-w-tabs-focus-param="true">create one now</a>?
                 {% endblocktrans %}
             {% endif %}
         </p>

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -13,11 +13,11 @@ from django.shortcuts import resolve_url as resolve_url_func
 from django.template import Context
 from django.template.base import token_kwargs
 from django.template.defaultfilters import stringfilter
-from django.templatetags.static import static
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 from django.utils import timezone
 from django.utils.encoding import force_str
+from django.utils.formats import get_format
 from django.utils.html import avoid_wrapping, json_script
 from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
@@ -32,7 +32,9 @@ from wagtail.admin.localization import get_js_translation_strings
 from wagtail.admin.menu import admin_menu
 from wagtail.admin.search import admin_search_areas
 from wagtail.admin.staticfiles import versioned_static as versioned_static_func
+from wagtail.admin.telepath import JSContext
 from wagtail.admin.ui import sidebar
+from wagtail.admin.ui.menus import MenuItem
 from wagtail.admin.utils import (
     get_admin_base_url,
     get_keyboard_key_labels_from_request,
@@ -42,7 +44,8 @@ from wagtail.admin.utils import (
 )
 from wagtail.admin.views.bulk_action.registry import bulk_action_registry
 from wagtail.admin.views.pages.utils import get_breadcrumbs_items_for_page
-from wagtail.admin.widgets import Button, ButtonWithDropdown, PageListingButton
+from wagtail.admin.widgets import Button, ButtonWithDropdown
+from wagtail.admin.widgets.button import ListingButton
 from wagtail.coreutils import (
     camelcase_to_underscore,
     get_content_type_label,
@@ -54,7 +57,6 @@ from wagtail.models import (
     Page,
     PageViewRestriction,
 )
-from wagtail.telepath import JSContext
 from wagtail.users.utils import get_gravatar_url
 
 register = template.Library()
@@ -421,9 +423,18 @@ def page_listing_buttons(context, page, user, next_url=None):
     next_url = next_url or context["request"].path
     button_hooks = hooks.get_hooks("register_page_listing_buttons")
 
-    buttons = []
+    hook_buttons = []
     for hook in button_hooks:
-        buttons.extend(hook(page=page, next_url=next_url, user=user))
+        hook_buttons.extend(hook(page=page, next_url=next_url, user=user))
+
+    buttons = []
+    for button in hook_buttons:
+        # Allow hooks to return either Button or MenuItem instances
+        if isinstance(button, MenuItem):
+            if button.is_shown(user):
+                buttons.append(ListingButton.from_menu_item(button))
+        elif button.show:
+            buttons.append(button)
 
     buttons.sort()
 
@@ -440,13 +451,21 @@ def page_header_buttons(context, page, user, view_name):
     next_url = context["request"].path
     button_hooks = hooks.get_hooks("register_page_header_buttons")
 
-    buttons = []
+    hook_buttons = []
     for hook in button_hooks:
-        buttons.extend(
+        hook_buttons.extend(
             hook(page=page, user=user, next_url=next_url, view_name=view_name)
         )
 
-    buttons = [b for b in buttons if b.show]
+    buttons = []
+    for button in hook_buttons:
+        # Allow hooks to return either Button or MenuItem instances
+        if isinstance(button, MenuItem):
+            if button.is_shown(user):
+                buttons.append(Button.from_menu_item(button))
+        elif button.show:
+            buttons.append(button)
+
     buttons.sort()
     return {
         "buttons": buttons,
@@ -468,7 +487,7 @@ def bulk_action_choices(context, app_label, model_name):
         next_url = context["request"].path
 
     bulk_action_buttons = [
-        PageListingButton(
+        ListingButton(
             action.display_name,
             reverse(
                 "wagtail_bulk_action", args=[app_label, model_name, action.action_type]
@@ -614,7 +633,7 @@ def admin_theme_classname(context):
     """
     Retrieves the theme name for the current user.
     """
-    user = context["request"].user
+    user = getattr(context.get("request"), "user", None)
     theme_name = (
         user.wagtail_userprofile.theme
         if hasattr(user, "wagtail_userprofile")
@@ -648,12 +667,13 @@ def admin_theme_color_scheme(context):
 
 
 @register.simple_tag
-def notification_static(path):
+def absolute_static(path):
     """
-    Variant of the {% static %}` tag for use in notification emails - tries to form
-    a full URL using WAGTAILADMIN_BASE_URL if the static URL isn't already a full URL.
+    Variant of the {% versioned_static %}` tag for use in external systems, such as
+    notification emails. Tries to form a full URL using WAGTAILADMIN_BASE_URL
+    if the static URL isn't already a full URL.
     """
-    return urljoin(base_url_setting(), static(path))
+    return urljoin(base_url_setting(), versioned_static_func(path))
 
 
 @register.simple_tag
@@ -909,6 +929,14 @@ def wagtail_config(context):
     if locale := context.get("locale"):
         config["ACTIVE_CONTENT_LOCALE"] = locale.language_code
 
+    user = getattr(context.get("request"), "user", None)
+
+    config["KEYBOARD_SHORTCUTS_ENABLED"] = (
+        user.wagtail_userprofile.keyboard_shortcuts
+        if hasattr(user, "wagtail_userprofile")
+        else True
+    )
+
     return config
 
 
@@ -950,28 +978,33 @@ def fragment(parser, token):
     Store a template fragment as a variable.
 
     Usage:
+
+    .. code-block:: html+django
+
         {% fragment as header_title %}
             {% blocktrans trimmed %}Welcome to the {{ site_name }} Wagtail CMS{% endblocktrans %}
         {% endfragment %}
+        {% include "my/custom/header.html" with title=header_title %}
 
-    Copy-paste of slippers’ fragment template tag.
-    See https://github.com/mixxorz/slippers/blob/254c720e6bb02eb46ae07d104863fce41d4d3164/slippers/templatetags/slippers.py#L173.
+    Adopted from `slippers' fragment template tag <https://mitchel.me/slippers/docs/template-tags-filters/#fragment>`_ with a few tweaks.
 
     To strip leading and trailing whitespace produced in the fragment, use the
-    `stripped` option. This is useful if you need to check if the resulting
+    ``stripped`` option. This is useful if you need to check if the resulting
     fragment is empty (after leading and trailing spaces are removed):
 
+    .. code-block:: html+django
+
         {% fragment stripped as recipient %}
             {{ title }} {{ first_name }} {{ last_name }}
-        {% endfragment }
+        {% endfragment %}
         {% if recipient %}
             Recipient: {{ recipient }}
         {% endif %}
 
     Note that the stripped option only strips leading and trailing spaces, unlike
-    {% blocktrans trimmed %} that also does line-by-line stripping. This is because
+    ``{% blocktrans trimmed %}`` that also does line-by-line stripping. This is because
     the fragment may contain HTML tags that are sensitive to whitespace, such as
-    <pre> and <code>.
+    ``<pre>`` and ``<code>``.
     """
     error_message = "The syntax for fragment is {% fragment as variable_name %}"
 
@@ -1141,6 +1174,7 @@ def formattedfield(
     show_add_comment_button=False,
     label_text=None,
     error_message_id=None,
+    wrapper_id=None,
 ):
     """
     Renders a form field in standard Wagtail admin layout.
@@ -1157,6 +1191,7 @@ def formattedfield(
     - `show_add_comment_button` - Display a comment control within Wagtail forms.
     - `label_text` - Manually set this if the field’s HTML is hard-coded.
     - `error_message_id` - ID of the error message container element.
+    - `wrapper_id` - ID of the overall wrapper element.
     """
 
     label_for = id_for_label or (field and field.id_for_label) or ""
@@ -1168,6 +1203,7 @@ def formattedfield(
         "icon": icon,
         "show_add_comment_button": show_add_comment_button,
         "error_message_id": error_message_id,
+        "wrapper_id": wrapper_id,
         "label_for": label_for,
         "label_id": f"{label_for}-label" if label_for else "",
         "label_text": label_text or (field and field.label) or "",
@@ -1227,6 +1263,7 @@ def formattedfieldfromcontext(context):
         "show_add_comment_button",
         "label_text",
         "error_message_id",
+        "wrapper_id",
     ):
         if arg in context:
             kwargs[arg] = context[arg]
@@ -1309,15 +1346,11 @@ def keyboard_shortcuts_dialog(context):
             ("actions-model", _("Actions")): [
                 (_("Save changes"), f"{KEYS.MOD} + s"),
                 (_("Preview"), f"{KEYS.MOD} + p"),
-                (
-                    _("Add or show comments"),
-                    f"{KEYS.CTRL} + {KEYS.ALT} + m",
-                ),
-            ]
-            if comments_enabled
-            else [
-                (_("Save changes"), f"{KEYS.MOD} + s"),
-                (_("Preview"), f"{KEYS.MOD} + p"),
+                (_("Toggle sidebar"), "["),
+                (_("Toggle minimap"), "]"),
+                (_("Add or show comments"), f"{KEYS.CTRL} + {KEYS.ALT} + m")
+                if comments_enabled
+                else None,
             ],
             ("rich-text-content", _("Text content")): [
                 (_("Insert or edit a link"), f"{KEYS.MOD} + k")
@@ -1337,9 +1370,9 @@ def keyboard_shortcuts_dialog(context):
 @register.inclusion_tag("wagtailadmin/shared/human_readable_date.html")
 def human_readable_date(date, description=None, placement="top"):
     if isinstance(date, datetime.datetime):
-        tooltip_format = getattr(settings, "DATETIME_FORMAT", "N j, Y, P")
+        tooltip_format = get_format("DATETIME_FORMAT") or "N j, Y, P"
     elif isinstance(date, datetime.date):
-        tooltip_format = getattr(settings, "DATE_FORMAT", "N j, Y")
+        tooltip_format = get_format("DATE_FORMAT") or "N j, Y"
     return {
         "date": date,
         "description": description,