diff --git a/wagtail/admin/templates/wagtailadmin/generic/confirm_unpublish.html b/wagtail/admin/templates/wagtailadmin/generic/confirm_unpublish.html index 9d6c3346ae..dc346053e3 100644 --- a/wagtail/admin/templates/wagtailadmin/generic/confirm_unpublish.html +++ b/wagtail/admin/templates/wagtailadmin/generic/confirm_unpublish.html @@ -1,31 +1,27 @@ -{% extends "wagtailadmin/base.html" %} +{% extends "wagtailadmin/generic/base.html" %} {% load i18n wagtailadmin_tags %} -{% block titletag %}{% blocktrans trimmed with title=object_display_title %}Unpublish {{ title }}{% endblocktrans %}{% endblock %} -{% block content %} - {% include "wagtailadmin/shared/header.html" with title=_("Unpublish") subtitle=object_display_title icon=header_icon %} -
- {% if usage_url %} - {% include "wagtailadmin/shared/usage_summary.html" %} - {% endif %} - {% block confirmation_text %} -

- {% blocktrans trimmed with model_name=model_opts.verbose_name %} - Are you sure you want to unpublish this {{ model_name }}? - {% endblocktrans %} -

+{% block main_content %} + {% if usage_url %} + {% include "wagtailadmin/shared/usage_summary.html" %} + {% endif %} + {% block confirmation_text %} +

+ {% blocktrans trimmed with model_name=model_opts.verbose_name %} + Are you sure you want to unpublish this {{ model_name }}? + {% endblocktrans %} +

+ {% endblock %} + +
+ {% csrf_token %} + + {% block form_content %} {% endblock %} - - {% csrf_token %} - - {% block form_content %} - {% endblock %} - -
- - {% trans "No, don't unpublish" %} -
-
-
+
+ + {% trans "No, don't unpublish" %} +
+ {% endblock %} diff --git a/wagtail/admin/views/generic/models.py b/wagtail/admin/views/generic/models.py index e3f23288d6..7ed413a465 100644 --- a/wagtail/admin/views/generic/models.py +++ b/wagtail/admin/views/generic/models.py @@ -1324,6 +1324,7 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView): edit_url_name = None unpublish_url_name = None usage_url_name = None + page_title = gettext_lazy("Unpublish") success_message = gettext_lazy("'%(object)s' unpublished.") template_name = "wagtailadmin/generic/confirm_unpublish.html" @@ -1344,12 +1345,15 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView): def get_usage(self): return ReferenceIndex.get_grouped_references_to(self.object) + def get_breadcrumbs_items(self): + return [] + def get_objects_to_unpublish(self): # Hook to allow child classes to have more objects to unpublish (e.g. page descendants) return [self.object] - def get_object_display_title(self): - return str(self.object) + def get_page_subtitle(self): + return get_latest_str(self.object) def get_success_message(self): if self.success_message is None: @@ -1415,7 +1419,6 @@ class UnpublishView(HookResponseMixin, WagtailAdminTemplateMixin, TemplateView): context = super().get_context_data(**kwargs) context["model_opts"] = self.object._meta context["object"] = self.object - context["object_display_title"] = self.get_object_display_title() context["unpublish_url"] = self.get_unpublish_url() context["next_url"] = self.get_next_url() context["usage_url"] = self.get_usage_url()