mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Refactor workflow reports to be based on reports base template

pull/6257/head
Matt Westcott 2020-04-17 17:58:50 +01:00 zatwierdzone przez Matt Westcott
rodzic b2fba99817
commit 984eb4efcf
3 zmienionych plików z 131 dodań i 158 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
wagtail/admin/templates/wagtailadmin/reports/workflow.html
Wyświetl plik

@ -1,26 +1,14 @@
{% 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 %}
<header role="banner">
<div class="row nice-padding">
<div class="left">
<div class="col header-title">
<h1 class="icon icon-{{ header_icon }}">{% trans "Workflows" %}</h1>
</div>
</div>
<div class="right">
{% block actions %}
<div class="addbutton">
<a href="{% url 'wagtailadmin_reports:workflow_tasks' %}" class="button">{% trans "By Task" %}</a>
</div>
</div>
</div>
</header>
{{ block.super }}
{% endblock %}
<div class="nice-padding">
{% block results %}
{% if object_list %}
<table class="listing">
<thead>
@ -84,7 +72,6 @@
{% else %}
<p>{% trans "No pages have been submitted for moderation yet" %}</p>
{% endif %}
</div>
{% endblock %}
{% block extra_js %}

26
wagtail/admin/templates/wagtailadmin/reports/workflow_tasks.html
Wyświetl plik

@ -1,27 +1,14 @@
{% 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 %}
<header role="banner">
<div class="row nice-padding">
<div class="left">
<div class="col header-title">
<h1 class="icon icon-{{ header_icon }}">Workflows</h1>
</div>
</div>
<div class="right">
{% block actions %}
<div class="addbutton">
<a href="{% url 'wagtailadmin_reports:workflow' %}" class="button">By Workflow</a>
</div>
</div>
</div>
</header>
{{ block.super }}
{% endblock %}
<div class="nice-padding">
{% block results %}
{% if object_list %}
<table class="listing">
<thead>
@ -70,5 +57,4 @@
{% else %}
<p>{% blocktrans %}No pages have been submitted for moderation yet{% endblocktrans %}</p>
{% endif %}
</div>
{% endblock %}

4
wagtail/admin/views/reports.py
Wyświetl plik

@ -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):