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

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

@@ -1,43 +1,18 @@
 {% extends "wagtailadmin/generic/create.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block main_content %}
-    <form action="{{ view.get_add_url }}" enctype="multipart/form-data" method="POST" novalidate>
-        {% csrf_token %}
+{% block form_content %}
+    {{ edit_handler.render_form_content }}
 
-        <div class="w-form-width">
-            {% block form %}{{ edit_handler.render_form_content }}{% endblock %}
+    <div class="w-form-width">
+        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
+            {% include "wagtailadmin/workflows/includes/workflow_pages_formset.html" with formset=pages_formset %}
+        {% endpanel %}
 
-            {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
-                {% include "wagtailadmin/workflows/includes/workflow_pages_formset.html" with formset=pages_formset %}
+        {% if has_workflow_enabled_models %}
+            {% panel id="workflow-content-types" icon="snippet" heading=_("Assign your workflow to snippets") %}
+                {% formattedfield field=content_type_form.content_types sr_only_label=True %}
             {% endpanel %}
-
-            {% if has_workflow_enabled_models %}
-                {% panel id="workflow-content-types" icon="snippet" heading=_("Assign your workflow to snippets") %}
-                    {% formattedfield field=content_type_form.content_types sr_only_label=True %}
-                {% endpanel %}
-            {% endif %}
-        </div>
-
-        {% block footer %}
-            <footer class="footer">
-                <div class="actions footer__container w-flex">
-                    {% block form_actions %}
-                        <button
-                            type="submit"
-                            class="button action-save button-longrunning w-flex-grow"
-                            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" %}
-                            <em data-w-progress-target="label">{% trans 'Create' %}</em>
-                        </button>
-                    {% endblock %}
-                </div>
-            </footer>
-        {% endblock %}
-    </form>
+        {% endif %}
+    </div>
 {% endblock %}

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

@@ -1,39 +1 @@
 {% extends "wagtailadmin/generic/create.html" %}
-{% load i18n wagtailadmin_tags %}
-
-{% block main_content %}
-    <form action="{{ view.get_add_url }}" enctype="multipart/form-data" method="POST" novalidate>
-        {% csrf_token %}
-
-        <ul class="fields">
-            {% for field in form %}
-                {% if not field.is_hidden %}
-                    <li>{% formattedfield field %}</li>
-                {% else %}
-                    {{ field }}
-                {% endif %}
-            {% endfor %}
-        </ul>
-
-        {% block footer %}
-            <footer class="footer">
-                <div class="actions footer__container w-flex">
-                    {% block form_actions %}
-                        <button
-                            type="submit"
-                            class="button action-save button-longrunning w-flex-grow"
-                            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" %}
-                            <em data-w-progress-target="label">{% trans 'Create' %}</em>
-                        </button>
-                    {% endblock %}
-                </div>
-            </footer>
-        {% endblock %}
-    </form>
-{% endblock %}

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

@@ -1,88 +1,58 @@
 {% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% 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 %}
+{% block form_content %}
+    {{ edit_handler.render_form_content }}
 
-        <div class="w-form-width">
-            {% block form %}{{ edit_handler.render_form_content }}{% endblock %}
+    <div class="w-form-width">
+        {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
+            {% if workflow.active %}
+                <p class="help-block help-info">
+                    {% icon name='help' %}
+                    {% url 'wagtailadmin_workflows:usage' workflow.pk as workflow_pages_url %}
+                    {% blocktrans trimmed %}
+                        Workflows apply to child pages too. If you select a parent page here, its child pages will also use this workflow.
+                        See <a href="{{ workflow_pages_url }}">the list of the pages</a> your workflow applies to.
+                    {% endblocktrans %}
+                </p>
 
-            {% panel id="workflow-pages" icon="doc-empty-inverse" heading=_("Assign your workflow to pages") %}
-                {% if workflow.active %}
-                    <p class="help-block help-info">
-                        {% icon name='help' %}
-                        {% url 'wagtailadmin_workflows:usage' workflow.pk as workflow_pages_url %}
-                        {% blocktrans trimmed %}
-                            Workflows apply to child pages too. If you select a parent page here, its child pages will also use this workflow.
-                            See <a href="{{ workflow_pages_url }}">the list of the pages</a> your workflow applies to.
-                        {% endblocktrans %}
-                    </p>
+                {% include "wagtailadmin/workflows/includes/workflow_pages_formset.html" with formset=pages_formset %}
+            {% else %}
+                <p class="help-block help-info">
+                    {% icon name='help' %}
+                    {% trans "This workflow is disabled so it cannot be assigned to any pages." %}
+                </p>
+            {% endif %}
+        {% endpanel %}
 
-                    {% include "wagtailadmin/workflows/includes/workflow_pages_formset.html" with formset=pages_formset %}
+        {% if has_workflow_enabled_models %}
+            {% panel id="workflow-content-types" icon="snippet" heading=_("Assign your workflow to snippets") %}
+                {% if workflow.active %}
+                    {% formattedfield field=content_type_form.content_types sr_only_label=True %}
                 {% else %}
                     <p class="help-block help-info">
                         {% icon name='help' %}
-                        {% trans "This workflow is disabled so it cannot be assigned to any pages." %}
+                        {% trans "This workflow is disabled so it cannot be assigned to any snippets." %}
                     </p>
                 {% endif %}
             {% endpanel %}
+        {% endif %}
+    </div>
+{% endblock %}
 
-            {% if has_workflow_enabled_models %}
-                {% panel id="workflow-content-types" icon="snippet" heading=_("Assign your workflow to snippets") %}
-                    {% if workflow.active %}
-                        {% formattedfield field=content_type_form.content_types sr_only_label=True %}
-                    {% else %}
-                        <p class="help-block help-info">
-                            {% icon name='help' %}
-                            {% trans "This workflow is disabled so it cannot be assigned to any snippets." %}
-                        </p>
-                    {% endif %}
-                {% endpanel %}
-            {% endif %}
-        </div>
-
-        {% block footer %}
-            <footer class="footer">
-                <div class="actions footer__container w-flex">
-                    {% block form_actions %}
-                        {% fragment as button %}
-                            <button
-                                type="submit"
-                                class="button action-save button-longrunning w-flex-grow"
-                                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" %}
-                                <em data-w-progress-target="label">{% trans 'Save' %}</em>
-                            </button>
-                        {% endfragment %}
-                        {% if can_enable or can_disable %}
-                            {% dropdown_button button=button toggle_icon="arrow-up" %}
-                                {% if can_enable %}
-                                    <button
-                                        class="button"
-                                        data-controller="w-action"
-                                        data-action="w-action#post"
-                                        data-w-action-continue-value="true"
-                                        data-w-action-url-value='{{ view.get_enable_url }}'
-                                        type="submit"
-                                    >
-                                        {{ view.enable_item_label }}
-                                    </button>
-                                {% elif can_disable %}
-                                    <a href="{{ view.get_delete_url }}" class="button">{{ view.delete_item_label }}</a>
-                                {% endif %}
-                            {% enddropdown_button %}
-                        {% else %}
-                            {{ button }}
-                        {% endif %}
-                    {% endblock %}
-                </div>
-            </footer>
-        {% endblock %}
-    </form>
+{% block extra_actions %}
+    {% if can_enable %}
+        <button
+            class="button"
+            data-controller="w-action"
+            data-action="w-action#post"
+            data-w-action-continue-value="true"
+            data-w-action-url-value='{{ view.get_enable_url }}'
+            type="submit"
+        >
+            {{ view.enable_item_label }}
+        </button>
+    {% elif can_disable %}
+        <a href="{{ view.get_delete_url }}" class="button">{{ view.delete_item_label }}</a>
+    {% endif %}
 {% endblock %}

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

@@ -1,72 +1,33 @@
 {% extends "wagtailadmin/generic/edit.html" %}
 {% load i18n wagtailadmin_tags %}
 
-{% block main_content %}
-    <form action="{{ view.edit_url }}" enctype="multipart/form-data" method="POST" novalidate>
-        {% csrf_token %}
+{% block form_content %}
+    {{ block.super }}
 
-        <ul class="fields">
-            {% for field in form %}
-                {% if not field.is_hidden %}
-                    <li>{% formattedfield field %}</li>
-                {% else %}
-                    {{ field }}
-                {% endif %}
-            {% endfor %}
-            <li>
-                <div class="help-block help-info">
-                    {% icon name='help' %}
-                    {% for workflow in object.active_workflows %}
-                        {% if forloop.first %}<strong>{% trans "Used on the following active workflows" %}:</strong> {% endif %}
-                        <a href="{% url 'wagtailadmin_workflows:edit' workflow.pk %}">{{ workflow.name }}</a>{% if not forloop.last %}, {% endif %}
-                    {% empty %}
-                        {% trans "Not used" %}
-                    {% endfor %}
-                </div>
-            </li>
-        </ul>
+    <div class="w-form-width help-block help-info">
+        {% icon name='help' %}
+        {% for workflow in object.active_workflows %}
+            {% if forloop.first %}<strong>{% trans "Used on the following active workflows" %}:</strong> {% endif %}
+            <a href="{% url 'wagtailadmin_workflows:edit' workflow.pk %}">{{ workflow.name }}</a>{% if not forloop.last %}, {% endif %}
+        {% empty %}
+            {% trans "Not used" %}
+        {% endfor %}
+    </div>
+{% endblock %}
 
-        {% block footer %}
-            <footer class="footer">
-                <div class="actions footer__container w-flex">
-                    {% block form_actions %}
-                        {% fragment as button %}
-                            <button
-                                type="submit"
-                                class="button action-save button-longrunning w-flex-grow"
-                                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" %}
-                                <em data-w-progress-target="label">{% trans 'Save' %}</em>
-                            </button>
-                        {% endfragment %}
-                        {% if can_enable or can_disable %}
-                            {% dropdown_button button=button toggle_icon="arrow-up" %}
-                                {% if can_enable %}
-                                    <button
-                                        class="button"
-                                        data-controller="w-action"
-                                        data-action="w-action#post"
-                                        data-w-action-continue-value="true"
-                                        data-w-action-url-value='{{ view.get_enable_url }}'
-                                        type="submit"
-                                    >
-                                        {{ view.enable_item_label }}
-                                    </button>
-                                {% elif can_disable %}
-                                    <a href="{{ view.get_delete_url }}" class="button">{{ view.delete_item_label }}</a>
-                                {% endif %}
-                            {% enddropdown_button %}
-                        {% else %}
-                            {{ button }}
-                        {% endif %}
-                    {% endblock %}
-                </div>
-            </footer>
-        {% endblock %}
-    </form>
+{% block extra_actions %}
+    {% if can_enable %}
+        <button
+            class="button"
+            data-controller="w-action"
+            data-action="w-action#post"
+            data-w-action-continue-value="true"
+            data-w-action-url-value='{{ view.get_enable_url }}'
+            type="submit"
+        >
+            {{ view.enable_item_label }}
+        </button>
+    {% elif can_disable %}
+        <a href="{{ view.get_delete_url }}" class="button">{{ view.delete_item_label }}</a>
+    {% endif %}
 {% endblock %}

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

@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 <td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
     {% 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>
@@ -6,6 +6,8 @@
         {% trans "Not used" %}
     {% endfor %}
     {% if value|length > 5 %}
-        {% blocktrans trimmed count counter=value|length|add:-5 %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
+        {% with counter_val=value|length|add:-5 %}
+            {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
+        {% endwith %}
     {% endif %}
 </td>

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

@@ -1,17 +1,17 @@
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 <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>
+                <li class="workflow-tasks__task" data-controller="w-tooltip" data-w-tooltip-content-value="{% blocktrans trimmed with forloop.counter|intcomma as step_number %}Step {{ step_number }}{% endblocktrans %}: {{ task.task.name }}">
+                    <div class="workflow-tasks__step">{% blocktrans trimmed with forloop.counter|intcomma 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 %}
+                {% blocktrans trimmed with counter=extra_count|intcomma count counter_val=extra_count %}+{{ counter }} more{% plural %}+{{ counter }} more{% endblocktrans %}
             </li>
         {% endif %}
     </ul>

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

@@ -1,13 +1,15 @@
 {% extends "wagtailadmin/tables/title_cell.html" %}
-{% load i18n %}
+{% load i18n wagtailadmin_tags %}
 
 {% block title %}
     <a href="{{ link_url }}">
-        {% blocktrans trimmed count counter=instance.all_pages.count %}
-            1 page
-        {% plural %}
-            {{ counter }} pages
-        {% endblocktrans %}
+        {% with instance.all_pages.count as counter_val %}
+            {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+                1 page
+            {% plural %}
+                {{ counter }} pages
+            {% endblocktrans %}
+        {% endwith %}
     </a>
 {% endblock %}
 
@@ -15,11 +17,13 @@
     {# 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 %}
+            {% with instance.content_types as counter_val %}
+                {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+                    1 snippet type
+                {% plural %}
+                    {{ counter }} snippet types
+                {% endblocktrans %}
+            {% endwith %}
         </div>
     {% endif %}
 {% endblock %}

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

@@ -2,11 +2,13 @@
 {% if tasks %}
     {% if search_form.is_searching %}
         <h2 role="alert">
-            {% blocktrans trimmed count counter=tasks.paginator.count %}
-                There is {{ counter }} match
-            {% plural %}
-                There are {{ counter }} matches
-            {% endblocktrans %}
+            {% with counter_val=tasks.paginator.count %}
+                {% blocktrans trimmed with counter=counter_val|intcomma count counter_val=counter_val %}
+                    There is {{ counter }} match
+                {% plural %}
+                    There are {{ counter }} matches
+                {% endblocktrans %}
+            {% endwith %}
         </h2>
     {% else %}
         <h2>{% trans "Tasks" %}</h2>

wagtail/admin/templatetags/wagtailadmin_tags.py

@@ -585,7 +585,14 @@ def bulk_action_choices(context, app_label, model_name):
 
 
 @register.inclusion_tag("wagtailadmin/shared/avatar.html")
-def avatar(user=None, classname=None, size=None, tooltip=None, tooltip_html=None):
+def avatar(
+    user=None,
+    classname=None,
+    size=None,
+    tooltip=None,
+    tooltip_html=None,
+    edit_link=False,
+):
     """
     Displays a user avatar using the avatar template
     Usage:
@@ -596,6 +603,7 @@ def avatar(user=None, classname=None, size=None, tooltip=None, tooltip_html=None
     :param size: default None (None|'small'|'large'|'square')
     :param tooltip: Optional tooltip to display under the avatar (string)
     :param tooltip_html: Optional tooltip as an HTML element for rich content (string)
+    :param edit_link: Optional edit link to display underneath the avatar (boolean)
     :return: Rendered template snippet
     """
     return {
@@ -604,6 +612,7 @@ def avatar(user=None, classname=None, size=None, tooltip=None, tooltip_html=None
         "size": size,
         "tooltip": tooltip,
         "tooltip_html": tooltip_html,
+        "edit_link": edit_link,
     }
 
 
@@ -674,16 +683,26 @@ def admin_theme_classname(context):
         if hasattr(user, "wagtail_userprofile")
         else "system"
     )
+    contrast_name = (
+        user.wagtail_userprofile.contrast
+        if hasattr(user, "wagtail_userprofile")
+        else "system"
+    )
     density_name = (
         user.wagtail_userprofile.density
         if hasattr(user, "wagtail_userprofile")
         else "default"
     )
-    return f"w-theme-{theme_name} w-density-{density_name}"
+    contrast_name = contrast_name.split("_")[0]
+    return f"w-theme-{theme_name} w-density-{density_name} w-contrast-{contrast_name}"
 
 
 @register.simple_tag
 def js_translation_strings():
+    warn(
+        "The `js_translation_strings` template tag will be removed in a future release.",
+        category=RemovedInWagtail70Warning,
+    )
     return mark_safe(json.dumps(get_js_translation_strings()))
 
 
@@ -859,16 +878,23 @@ def i18n_enabled():
 
 
 @register.simple_tag
-def locales():
-    return json.dumps(
-        [
-            {
-                "code": locale.language_code,
-                "display_name": force_str(locale.get_display_name()),
-            }
-            for locale in Locale.objects.all()
-        ]
-    )
+def locales(serialize=True):
+    result = [
+        {
+            "code": locale.language_code,
+            "display_name": force_str(locale.get_display_name()),
+        }
+        for locale in Locale.objects.all()
+    ]
+
+    if serialize:
+        warn(
+            "The `locales` template tag will be removed in a future release.",
+            category=RemovedInWagtail70Warning,
+        )
+        return json.dumps(result)
+
+    return result
 
 
 @register.simple_tag
@@ -936,21 +962,24 @@ def wagtail_config(context):
         "CSRF_HEADER_NAME": HttpHeaders.parse_header_name(
             getattr(settings, "CSRF_HEADER_NAME")
         ),
+        "ADMIN_API": {
+            "PAGES": reverse("wagtailadmin_api:pages:listing"),
+            "DOCUMENTS": reverse("wagtailadmin_api:documents:listing"),
+            "IMAGES": reverse("wagtailadmin_api:images:listing"),
+            # Used to add an extra query string on all API requests. Example value: '&order=-id'
+            "EXTRA_CHILDREN_PARAMETERS": "",
+        },
         "ADMIN_URLS": {
             "DISMISSIBLES": reverse("wagtailadmin_dismissibles"),
+            "PAGES": reverse("wagtailadmin_explore_root"),
         },
+        "I18N_ENABLED": i18n_enabled(),
+        "LOCALES": locales(serialize=False),
+        "STRINGS": get_js_translation_strings(),
     }
 
-    default_settings = {
-        "WAGTAIL_AUTO_UPDATE_PREVIEW": True,
-        "WAGTAIL_AUTO_UPDATE_PREVIEW_INTERVAL": 500,
-    }
-    config.update(
-        {
-            option: getattr(settings, option, default)
-            for option, default in default_settings.items()
-        }
-    )
+    if locale := context.get("locale"):
+        config["ACTIVE_CONTENT_LOCALE"] = locale.language_code
 
     return config