diff --git a/wagtail/admin/templates/wagtailadmin/reports/workflow.html b/wagtail/admin/templates/wagtailadmin/reports/workflow.html
index 52c8cd002e..610f48b12f 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/workflow.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/workflow.html
@@ -1,90 +1,77 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n l10n wagtailadmin_tags wagtailui_tags %}
+{% extends 'wagtailadmin/reports/base_report.html' %}
+{% load i18n wagtailadmin_tags wagtailui_tags %}
-{% block titletag %}{% trans "Workflows" %}{% endblock %}
-
-{% block content %}
-
- {% trans "Workflows" %}
-
- {% trans 'Workflow' %} - | -- {% trans 'Page' %} - | -- {% trans 'Status' %} - | -- {% trans 'Tasks' %} - | -- {% trans 'Requested by' %} - | -- {% trans 'Started at' %} - | -
---|---|---|---|---|---|
- {{ workflow_state.workflow }} - | -- - {{ workflow_state.page.get_admin_display_title }} - - | -- - {{ workflow_state.get_status_display }} - - | -
- {{ workflow_name }}- {% trans 'Approved task' as approved_title %} - {% trans 'Incomplete task' as incomplete_title %} - {% for task in workflow_state.all_tasks_with_status %} - - {% if task.status == 'approved' %} - {% wagtail_icon name="success" title=approved_title %} - {% else %} - {% wagtail_icon name="radio-empty" title=incomplete_title %} - {% endif %} - - {% endfor %} - |
- {{ workflow_state.requested_by.get_full_name|default:workflow_state.requested_by.get_username }} | -{{ workflow_state.created_at }} | -
{% trans "No pages have been submitted for moderation yet" %}
- {% endif %} +{% block actions %} + + {{ block.super }} +{% endblock %} + +{% block results %} + {% if object_list %} ++ {% trans 'Workflow' %} + | ++ {% trans 'Page' %} + | ++ {% trans 'Status' %} + | ++ {% trans 'Tasks' %} + | ++ {% trans 'Requested by' %} + | ++ {% trans 'Started at' %} + | +
---|---|---|---|---|---|
+ {{ workflow_state.workflow }} + | ++ + {{ workflow_state.page.get_admin_display_title }} + + | ++ + {{ workflow_state.get_status_display }} + + | +
+ {{ workflow_name }}+ {% trans 'Approved task' as approved_title %} + {% trans 'Incomplete task' as incomplete_title %} + {% for task in workflow_state.all_tasks_with_status %} + + {% if task.status == 'approved' %} + {% wagtail_icon name="success" title=approved_title %} + {% else %} + {% wagtail_icon name="radio-empty" title=incomplete_title %} + {% endif %} + + {% endfor %} + |
+ {{ workflow_state.requested_by.get_full_name|default:workflow_state.requested_by.get_username }} | +{{ workflow_state.created_at }} | +
{% trans "No pages have been submitted for moderation yet" %}
+ {% endif %} {% endblock %} {% block extra_js %} diff --git a/wagtail/admin/templates/wagtailadmin/reports/workflow_tasks.html b/wagtail/admin/templates/wagtailadmin/reports/workflow_tasks.html index 31e4cc2aea..a11c9e649c 100644 --- a/wagtail/admin/templates/wagtailadmin/reports/workflow_tasks.html +++ b/wagtail/admin/templates/wagtailadmin/reports/workflow_tasks.html @@ -1,74 +1,60 @@ -{% extends "wagtailadmin/base.html" %} -{% load i18n l10n wagtailadmin_tags wagtailui_tags %} +{% extends 'wagtailadmin/reports/base_report.html' %} +{% load i18n wagtailadmin_tags %} -{% block titletag %}{% trans "Workflows" %}{% endblock %} - -{% block content %} - {% trans "Workflows" as title_str %} - -- {% trans 'Task' %} - | -- {% trans 'Page' %} - | -- {% trans 'Status' %} - | -- {% trans 'Started at' %} - | -- {% trans 'Completed at' %} - | -
---|---|---|---|---|
- {{ task_state.task }} - | -- {% with task_state.workflow_state.page as page %} - - {{ page.get_admin_display_title }} - - {% endwith %} - | -
-
- {{ task_state.get_status_display }}
-
- |
- {{ task_state.started_at }} | -{{ task_state.finished_at }} | -
{% blocktrans %}No pages have been submitted for moderation yet{% endblocktrans %}
- {% endif %} +{% block actions %} + + {{ block.super }} +{% endblock %} + +{% block results %} + {% if object_list %} ++ {% trans 'Task' %} + | ++ {% trans 'Page' %} + | ++ {% trans 'Status' %} + | ++ {% trans 'Started at' %} + | ++ {% trans 'Completed at' %} + | +
---|---|---|---|---|
+ {{ task_state.task }} + | ++ {% with task_state.workflow_state.page as page %} + + {{ page.get_admin_display_title }} + + {% endwith %} + | +
+
+ {{ task_state.get_status_display }}
+
+ |
+ {{ task_state.started_at }} | +{{ task_state.finished_at }} | +
{% blocktrans %}No pages have been submitted for moderation yet{% endblocktrans %}
+ {% endif %} {% endblock %} diff --git a/wagtail/admin/views/reports.py b/wagtail/admin/views/reports.py index f0e2d28467..9ea22bda8a 100644 --- a/wagtail/admin/views/reports.py +++ b/wagtail/admin/views/reports.py @@ -275,7 +275,7 @@ class LockedPagesView(PageReportView): class WorkflowView(ReportView): template_name = 'wagtailadmin/reports/workflow.html' - title = _('Workflow') + title = _('Workflows') header_icon = 'clipboard-list' def get_queryset(self): @@ -285,7 +285,7 @@ class WorkflowView(ReportView): class WorkflowTasksView(ReportView): template_name = 'wagtailadmin/reports/workflow_tasks.html' - title = _('Workflow') + title = _('Workflows') header_icon = 'clipboard-list' def get_queryset(self):