wagtail 6.0.2__py3-none-any.whl → 6.1rc1__py3-none-any.whl

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

@@ -4,13 +4,14 @@
     Variables accepted by this template:
 
     - `breadcrumbs_items` - breadcrumbs items to be rendered, in the format of [{"url": str, "label": str}]
-    - `actions` - prerendered actions to be displayed in the header
+    - `buttons` - buttons to be rendered beside the final breadcrumbs item
     - `side_panels` - list of side panels to be rendered
     - `history_url` - URL to the history view for the current object
     - `title` - title of the current page, to be displayed as a hidden h1 for screen readers
     - `search_url` - URL to the search view, should respond with a partial template for the results
     - `search_form` - form to be rendered for search
     - `filters` - filters to be rendered
+    - `icon_name` - name of the icon to be used in the header
 
     When including this template, use the `only` parameter whenever possible to
     ensure that the above variables are indeed the only ones needed for this
@@ -40,17 +41,23 @@
 
                         {% block breadcrumbs %}
                             {% if breadcrumbs_items %}
-                                {% breadcrumbs breadcrumbs_items %}
+                                {% breadcrumbs breadcrumbs_items icon_name=icon_name %}
                             {% endif %}
                         {% endblock %}
 
                         {# Allow actions to be passed as a prerendered variable or defined by extending the template via block_actions #}
-                        {% fragment as block_actions %}{% block actions %}{% endblock %}{% endfragment %}
-                        {% if actions or block_actions %}
+                        {% fragment stripped as actions %}
+                            {% block actions %}
+                                {% for button in buttons %}
+                                    {% component button %}
+                                {% endfor %}
+                            {% endblock %}
+                        {% endfragment %}
+                        {% if actions %}
                             {# Actions divider #}
                             <div class="w-w-px w-h-[30px] w-ml-auto sm:w-ml-0 w-bg-border-furniture"></div>
-                            <div id="w-slim-header-buttons" class="w-flex w-items-center w-ml-3">
-                                {% firstof actions block_actions %}
+                            <div id="w-slim-header-buttons" class="w-flex w-items-center w-ml-2.5 w-gap-1">
+                                {{ actions }}
                             </div>
                         {% endif %}
                     {% endblock %}
@@ -71,6 +78,7 @@
                         data-action="change->w-swap#submitLazy input->w-swap#submitLazy"
                         data-w-swap-src-value="{{ search_url }}"
                         data-w-swap-target-value="#listing-results"
+                        data-w-swap-reflect-value="true"
                     >
                         {% if search_form %}
                             {% for field in search_form %}
@@ -83,15 +91,19 @@
                                 id="filters-drilldown"
                                 class="w-drilldown"
                                 data-controller="w-drilldown"
-                                data-action="w-swap:success@document->w-drilldown#updateParams w-dropdown:hide->w-drilldown#delayedClose w-dropdown:clickaway->w-drilldown#preventOutletClickaway"
-                                data-w-drilldown-count-attr-value="data-w-active-filter-name"
-                                data-w-drilldown-w-action-outlet="[data-w-active-filter-name][data-controller='w-action']"
+                                data-action="w-swap:success@document->w-drilldown#updateCount w-dropdown:hide->w-drilldown#delayedClose w-dropdown:clickaway->w-drilldown#preventOutletClickaway"
+                                data-w-drilldown-count-attr-value="data-w-active-filter-id"
+                                data-w-drilldown-w-action-outlet="[data-w-active-filter-id][data-controller='w-action']"
                                 data-w-drilldown-w-dropdown-outlet="#filters-drilldown [data-controller='w-dropdown']"
                             >
                                 {% include "wagtailadmin/shared/headers/_filters.html" with filters=filters only %}
                             </div>
                         {% endif %}
 
+                        {% block extra_form_fields %}
+                            {# Add any extra form fields here #}
+                        {% endblock %}
+
                         {% comment %}
                             Add an initial disabled & hidden submit button so that
                             pressing 'Enter' will not submit form. Reload is not

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

@@ -1,6 +1,6 @@
 {% load wagtailadmin_tags i18n %}
 
-<button type="button" class="w-human-readable-date" data-controller="w-tooltip" data-w-tooltip-content-value="{{ date|date:"DATETIME_FORMAT" }}" data-w-tooltip-placement-value="{{ placement }}">
+<button type="button" class="w-human-readable-date" data-controller="w-tooltip" data-w-tooltip-content-value="{{ date|date:tooltip_format }}" data-w-tooltip-placement-value="{{ placement }}">
     <time class="w-human-readable-date__date" datetime="{{ date|date:"c" }}">
         {{ date|timesince_simple|capfirst }}
     </time>

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

@@ -0,0 +1,29 @@
+{% load wagtailadmin_tags i18n %}
+{% dialog icon_name="keyboard" classname="w-keyboard-shortcuts" id="keyboard-shortcuts-dialog" title=_("Keyboard shortcuts") %}
+    <table class="w-w-full">
+        <caption class="w-sr-only">
+            {% trans "All keyboard shortcuts" %}
+        </caption>
+        <thead class="w-sr-only">
+            <tr>
+                <th scope="col">{% trans "Section" %}</th>
+                <th scope="col">{% trans "Keyboard shortcut" %}</th>
+            </tr>
+        </thead>
+        {% block shortcuts %}
+            {% for category, shortcuts in shortcuts.items %}
+                <tbody class="w-w-full" id="keyboard-shortut-group-{{ category.0 }}">
+                    <tr class="w-keyboard-shortcuts__category" colspan="2">
+                        <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>
+                    {% endfor %}
+                </tbody>
+            {% endfor %}
+        {% endblock %}
+    </table>
+{% enddialog %}

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

@@ -4,8 +4,9 @@
         class="{{ nav_icon_button_classes }}"
         aria-label="{{ toggle.aria_label }}"
         aria-expanded="false"
-        data-controller="w-tooltip"
+        data-controller="w-tooltip{% if toggle.keyboard_shortcut %} w-kbd{% endif %}"
         data-side-panel-toggle="{{ panel.name }}"
+        {% if toggle.keyboard_shortcut %}data-w-kbd-key-value="{{ toggle.keyboard_shortcut }}" data-w-kbd-scope-value="global"{% endif %}
         data-w-tooltip-content-value="{{ panel.title }}"
         data-w-tooltip-offset-value="[0, 0]"
 >

wagtail/admin/templates/wagtailadmin/skeleton.html

@@ -15,7 +15,8 @@
         {% block branding_favicon %}{% endblock %}
     </head>
     {% sidebar_collapsed as sidebar_collapsed %}
-    <body id="wagtail" class="{% block bodyclass %}{% endblock %} {% if sidebar_collapsed %}sidebar-collapsed{% endif %} {% if messages %}has-messages{% endif %}" data-controller="w-init" data-w-init-ready-class="ready">
+    {% fragment as bodyclass %}{% block bodyclass %}{% endblock %}{% endfragment %}
+    <body id="wagtail" class="{% classnames bodyclass sidebar_collapsed|yesno:"sidebar-collapsed," messages|yesno:"has-messages," %}" data-controller="w-init" data-w-init-ready-class="ready">
         <div data-sprite></div>
 
         <script src="{% versioned_static 'wagtailadmin/js/icons.js' %}" data-icon-url="{% url 'wagtailadmin_sprite' %}"></script>

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

@@ -0,0 +1,9 @@
+<td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
+    {% if value %}
+        <ul>
+            {% for item in value %}
+                <li>{{ item }}</li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+</td>

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

@@ -17,11 +17,13 @@
             {% endif %}
         {% endblock %}
     </div>
-    {% if buttons %}
-        <ul class="actions">
-            {% block buttons %}
-                {% include "wagtailadmin/shared/buttons.html" %}
-            {% endblock %}
-        </ul>
-    {% endif %}
+    {% block extra %}
+        {% if buttons %}
+            <ul class="actions">
+                {% block buttons %}
+                    {% include "wagtailadmin/shared/buttons.html" %}
+                {% endblock %}
+            </ul>
+        {% endif %}
+    {% endblock %}
 </td>

wagtail/admin/templates/wagtailadmin/widgets/draftail_rich_text_area.html

@@ -1 +1 @@
-{% include 'django/forms/widgets/hidden.html' %}<script>window.draftail.initEditor('#{{ widget.attrs.id|escapejs }}', {{ widget.options_json|safe }}, document.currentScript)</script>
+{% include 'django/forms/widgets/hidden.html' %}

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

@@ -1,30 +1,11 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/create.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ media.js }}
-{% endblock %}
-
-{% block main_header %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title subtitle=page_subtitle icon=header_icon merged=1 only %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <form action="{{ view.get_add_url }}" enctype="multipart/form-data" method="POST" novalidate>
         {% csrf_token %}
 
-        <div class="nice-padding w-form-width">
+        <div class="w-form-width">
             {% block form %}{{ edit_handler.render_form_content }}{% endblock %}
 
             {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
@@ -45,8 +26,10 @@
                         <button
                             type="submit"
                             class="button action-save button-longrunning w-flex-grow"
-                            data-controller="w-progress"
+                            data-controller="w-progress w-kbd"
                             data-action="w-progress#activate"
+                            data-w-kbd-key-value="mod+s"
+                            data-w-kbd-scope-value="global"
                             data-w-progress-active-value="{% trans 'Creating…' %}"
                         >
                             {% icon name="spinner" %}

wagtail/admin/templates/wagtailadmin/workflows/create_task.html

@@ -1,22 +1,11 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/create.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block titletag %}{{ view.page_title }}{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <form action="{{ view.get_add_url }}" enctype="multipart/form-data" method="POST" novalidate>
         {% csrf_token %}
 
-        <ul class="fields nice-padding">
+        <ul class="fields">
             {% for field in form %}
                 {% if not field.is_hidden %}
                     <li>{% formattedfield field %}</li>
@@ -33,8 +22,10 @@
                         <button
                             type="submit"
                             class="button action-save button-longrunning w-flex-grow"
-                            data-controller="w-progress"
+                            data-controller="w-progress w-kbd"
                             data-action="w-progress#activate"
+                            data-w-kbd-key-value="mod+s"
+                            data-w-kbd-scope-value="global"
                             data-w-progress-active-value="{% trans 'Creating…' %}"
                         >
                             {% icon name="spinner" %}

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

@@ -1,30 +1,11 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ media.js }}
-{% endblock %}
-
-{% block main_header %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title subtitle=page_subtitle icon=header_icon merged=1 only %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <form action="{% block form_action %}{{ view.edit_url }}{% endblock %}"{% if is_multipart %} enctype="multipart/form-data"{% endif %} method="POST" novalidate>
         {% csrf_token %}
 
-        <div class="nice-padding w-form-width">
+        <div class="w-form-width">
             {% block form %}{{ edit_handler.render_form_content }}{% endblock %}
 
             {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
@@ -69,8 +50,10 @@
                             <button
                                 type="submit"
                                 class="button action-save button-longrunning w-flex-grow"
-                                data-controller="w-progress"
+                                data-controller="w-progress w-kbd"
                                 data-action="w-progress#activate"
+                                data-w-kbd-key-value="mod+s"
+                                data-w-kbd-scope-value="global"
                                 data-w-progress-active-value="{% trans 'Saving…' %}"
                             >
                                 {% icon name="spinner" %}

wagtail/admin/templates/wagtailadmin/workflows/edit_task.html

@@ -1,20 +1,11 @@
-{% extends "wagtailadmin/generic/base.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}
-
-{% block content %}
-    {% block header %}
-        {{ block.super }}
-    {% endblock %}
-
+{% block main_content %}
     <form action="{{ view.edit_url }}" enctype="multipart/form-data" method="POST" novalidate>
         {% csrf_token %}
 
-        <ul class="fields nice-padding">
+        <ul class="fields">
             {% for field in form %}
                 {% if not field.is_hidden %}
                     <li>{% formattedfield field %}</li>
@@ -43,8 +34,10 @@
                             <button
                                 type="submit"
                                 class="button action-save button-longrunning w-flex-grow"
-                                data-controller="w-progress"
+                                data-controller="w-progress w-kbd"
                                 data-action="w-progress#activate"
+                                data-w-kbd-key-value="mod+s"
+                                data-w-kbd-scope-value="global"
                                 data-w-progress-active-value="{% trans 'Saving…' %}"
                             >
                                 {% icon name="spinner" %}

wagtail/admin/templates/wagtailadmin/workflows/includes/task_usage_cell.html

@@ -1,11 +1,11 @@
 {% load i18n %}
 <td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
-    {% for workflow in value|slice:":5" %}
-        <a href="{% url 'wagtailadmin_workflows:edit' workflow.pk %}">{{ workflow.name }}{% if not forloop.last %}, {% endif %}</a>
+    {% for workflow_task in value|slice:":5" %}
+        <a href="{% url 'wagtailadmin_workflows:edit' workflow_task.workflow.pk %}">{{ workflow_task.workflow.name }}{% if not forloop.last %}, {% endif %}</a>
     {% empty %}
         {% trans "Not used" %}
     {% endfor %}
-    {% if value.count > 5 %}
-        {% blocktrans trimmed count counter=value.count|add:-5 %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
+    {% if value|length > 5 %}
+        {% blocktrans trimmed count counter=value|length|add:-5 %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
     {% endif %}
 </td>

wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_tasks_cell.html

@@ -0,0 +1,18 @@
+{% load i18n %}
+<td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
+    <ul class="workflow-tasks">
+        {% for task in tasks %}
+            <a href="{% url 'wagtailadmin_workflows:edit_task' task.task_id %}">
+                <li class="workflow-tasks__task" data-controller="w-tooltip" data-w-tooltip-content-value="{% blocktrans trimmed with forloop.counter as step_number %}Step {{ step_number }}{% endblocktrans %}: {{ task.task.name }}">
+                    <div class="workflow-tasks__step">{% blocktrans trimmed with forloop.counter as step_number %}Step {{ step_number }}{% endblocktrans %}</div>
+                    <h4 class="workflow-tasks__name">{{ task.task.name }}</h4>
+                </li>
+            </a>
+        {% endfor %}
+        {% if extra_count > 0 %}
+            <li class="workflow-tasks__extra-tasks">
+                {% blocktrans trimmed count counter=extra_count %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
+            </li>
+        {% endif %}
+    </ul>
+</td>

wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_title_cell.html

@@ -0,0 +1,7 @@
+{% extends "wagtailadmin/tables/title_cell.html" %}
+{% load i18n wagtailadmin_tags %}
+
+{% block title %}
+    {{ block.super }}
+    {% if not instance.active %}{% status _("Disabled") %}{% endif %}
+{% endblock %}

wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_used_by_cell.html

@@ -0,0 +1,25 @@
+{% extends "wagtailadmin/tables/title_cell.html" %}
+{% load i18n %}
+
+{% block title %}
+    <a href="{{ link_url }}">
+        {% blocktrans trimmed count counter=instance.all_pages.count %}
+            1 page
+        {% plural %}
+            {{ counter }} pages
+        {% endblocktrans %}
+    </a>
+{% endblock %}
+
+{% block extra %}
+    {# Only show snippet type count if there's a model with workflows enabled #}
+    {% if workflow_enabled_models %}
+        <div>
+            {% blocktrans trimmed count counter=instance.content_types %}
+                1 snippet type
+            {% plural %}
+                {{ counter }} snippet types
+            {% endblocktrans %}
+        </div>
+    {% endif %}
+{% endblock %}

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

@@ -1,100 +1 @@
 {% extends "wagtailadmin/generic/index.html" %}
-{% load i18n wagtailadmin_tags %}
-
-{% block main_header %}
-    {% fragment as workflow_actions %}
-        <a href="{% url "wagtailadmin_workflows:index" %}?show_disabled={% if showing_disabled %}false{% else %}true{% endif %}" class="button button-secondary button--icon w-inline-flex w-items-center w-gap-2">
-            {% if showing_disabled %}
-                {% icon name="no-view" %}{% trans "Hide disabled workflows" %}
-            {% else %}
-                {% icon name="view" %}{% trans "Show disabled workflows" %}
-            {% endif %}
-        </a>
-        <a href="{% url view.add_url_name %}" class="button bicolor button--icon">{% icon name="plus" wrapped=1 %}{{ view.add_item_label }}</a>
-    {% endfragment %}
-    {% include "wagtailadmin/shared/header.html" with title=view.page_title icon=view.header_icon extra_actions=workflow_actions %}
-{% endblock %}
-
-{% block listing %}
-    <div class="nice-padding">
-        {% if workflows %}
-            <table class="listing">
-                <thead>
-                    <tr>
-                        <th>
-                            {% trans "Name" %}
-                        </th>
-                        <th>
-                            {% trans "Used by" %}
-                        </th>
-                        <th>
-                            {% trans "Tasks" %}
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for workflow in workflows %}
-                        <tr>
-                            <td class="title">
-                                <div class="title-wrapper">
-                                    <a href="{% url view.edit_url_name workflow.pk %}">{{ workflow }}</a>
-                                    {% if not workflow.active %}{% status _("Disabled") %}{% endif %}
-                                </div>
-                            </td>
-                            <td class="title">
-                                <div class="title-wrapper">
-                                    <a href="{% url 'wagtailadmin_workflows:usage' workflow.pk %}">
-                                        {% blocktrans trimmed count counter=workflow.all_pages.count %}
-                                            1 page
-                                        {% plural %}
-                                            {{ counter }} pages
-                                        {% endblocktrans %}
-                                    </a>
-                                </div>
-                                {# Only show snippet type count if there's a model with workflows enabled #}
-                                {% if workflow_enabled_models %}
-                                    <div>
-                                        {% blocktrans trimmed count counter=workflow.content_types %}
-                                            1 snippet type
-                                        {% plural %}
-                                            {{ counter }} snippet types
-                                        {% endblocktrans %}
-                                    </div>
-                                {% endif %}
-                            </td>
-                            <td>
-                                <ul class="workflow-tasks">
-                                    {% for task in workflow.tasks|slice:":5" %}
-                                        <a href="{% url 'wagtailadmin_workflows:edit_task' task.pk %}">
-                                            <li class="workflow-tasks__task" data-controller="w-tooltip" data-w-tooltip-content-value="{% blocktrans trimmed with forloop.counter as step_number %}Step {{ step_number }}{% endblocktrans %}: {{ task.name }}">
-                                                <div class="workflow-tasks__step">{% blocktrans trimmed with forloop.counter as step_number %}Step {{ step_number }}{% endblocktrans %}</div>
-                                                <h4 class="workflow-tasks__name">{{ task.name }}</h4>
-                                            </li>
-                                        </a>
-                                    {% endfor %}
-                                    {% if workflow.tasks.count > 5 %}
-                                        <li class="workflow-tasks__extra-tasks">
-                                            {% blocktrans trimmed count counter=workflow.tasks.count|add:-5 %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
-                                        </li>
-                                    {% endif %}
-                                </ul>
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        {% else %}
-            {% url view.add_url_name as add_url %}
-            {% if showing_disabled %}
-                <p>{% blocktrans trimmed %}No workflows have been created. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
-            {% else %}
-                <p>{% blocktrans trimmed %}There are no enabled workflows. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
-            {% endif %}
-        {% endif %}
-    </div>
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-{% endblock %}

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

@@ -0,0 +1,10 @@
+{% extends "wagtailadmin/generic/index_results.html" %}
+{% load i18n %}
+
+{% block no_results_message %}
+    {% if showing_disabled %}
+        <p>{% blocktrans trimmed %}No workflows have been created. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
+    {% else %}
+        <p>{% blocktrans trimmed %}There are no enabled workflows. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
+    {% endif %}
+{% endblock %}

wagtail/admin/templates/wagtailadmin/workflows/task_index.html

@@ -1,31 +1 @@
 {% extends "wagtailadmin/generic/index.html" %}
-{% load i18n wagtailadmin_tags %}
-
-{% block main_header %}
-    {% fragment as workflow_actions %}
-        <a href="{% url "wagtailadmin_workflows:task_index" %}?show_disabled={% if showing_disabled %}false{% else %}true{% endif %}" class="button button-secondary button--icon w-inline-flex w-items-center w-gap-2">
-            {% if showing_disabled %}
-                {% icon name="no-view" %}{% trans "Hide disabled tasks" %}
-            {% else %}
-                {% icon name="view" %}{% trans "Show disabled tasks" %}
-            {% endif %}
-        </a>
-        <a href="{% url view.add_url_name %}" class="button bicolor button--icon">{% icon name="plus" wrapped=1 %}{{ view.add_item_label }}</a>
-    {% endfragment %}
-    {% include "wagtailadmin/shared/header.html" with title=page_title icon=header_icon extra_actions=workflow_actions %}
-{% endblock %}
-
-{% block listing %}
-    <div class="nice-padding">
-        {% if tasks %}
-            {% component table %}
-        {% else %}
-            {% url view.add_url_name as add_url %}
-            {% if showing_disabled %}
-                <p>{% blocktrans trimmed %}No tasks have been created. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
-            {% else %}
-                <p>{% blocktrans trimmed %}There are no enabled tasks. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
-            {% endif %}
-        {% endif %}
-    </div>
-{% endblock %}

wagtail/admin/templates/wagtailadmin/workflows/task_index_results.html

@@ -0,0 +1,10 @@
+{% extends "wagtailadmin/generic/index_results.html" %}
+{% load i18n wagtailadmin_tags %}
+
+{% block no_results_message %}
+    {% if showing_disabled %}
+        <p>{% blocktrans trimmed %}No tasks have been created. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
+    {% else %}
+        <p>{% blocktrans trimmed %}There are no enabled tasks. Why not <a href="{{ add_url }}">add one</a>?{% endblocktrans %}</p>
+    {% endif %}
+{% endblock %}

wagtail/admin/templates/wagtailadmin/workflows/usage.html

@@ -1,4 +1,4 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/listing.html" %}
 {% load i18n %}
 {% block titletag %}{% blocktrans trimmed with name=workflow.name %}Pages that use workflow '{{ name }}'{% endblocktrans %}{% endblock %}
 {% block content %}