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

Adopt shared header template in workflows (#8850) 

Co-authored-by: Thibaud Colas <thibaudcolas@gmail.com>
pull/8854/head
Paarth Agarwal 2022-07-16 03:21:50 +05:30 zatwierdzone przez GitHub
rodzic d4b37357ab
commit d8c3d26de7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 24 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
CHANGELOG.txt
Wyświetl plik

@ -56,7 +56,7 @@ Changelog
* Introduce new template fragment and block level enclosure tags for easier template composition (Thibaud Colas)
* Add a `classnames` template tag to easily build up classes from variables provided to a template (Paarth Agarwal)
* Migrate the dashboard (home) view header to the shared header template and update designs (Paarth Agarwal)
* Switch all report views and the redirects listing view to use Wagtail’s reusable header component (Paarth Agarwal)
* Switch all report views and workflow and redirects listing views to use Wagtail’s reusable header component (Paarth Agarwal)
* Update classes and styles for the shared header templates to align with UI guidelines (Paarth Agarwal)
* Clean up multiple eslint rules usage and configs to align better with the Wagtail coding guidelines (LB (Ben Johnston))
* Add inline toolbar for Draftail, to avoid clashing with the page’s header (Thibaud Colas)

2
docs/releases/4.0.md
Wyświetl plik

@ -83,7 +83,7 @@ Wagtail’s page preview is now available in a side panel within the page editor
* Update classes and styles for the shared header templates to align with UI guidelines (Paarth Agarwal)
* Clean up multiple eslint rules usage and configs to align better with the Wagtail coding guidelines (LB (Ben Johnston))
* Make ModelAdmin InspectView footer actions consistent with other parts of the UI (Thibaud Colas)
* Switch all report views and the redirects listing view to use Wagtail’s reusable header component (Paarth Agarwal)
* Switch all report views and workflow and redirects listing views to use Wagtail’s reusable header component (Paarth Agarwal)
* Add support for Twitter and other text-only embeds in Draftail embed previews (Iman Syed, Paarth Agarwal)
### Bug fixes

33
wagtail/admin/templates/wagtailadmin/workflows/index.html
Wyświetl plik

@ -2,28 +2,17 @@
{% load i18n wagtailadmin_tags %}
{% block content %}
<header class="w-header" role="banner">
<div class="row">
<div class="left">
<div class="col">
<h1 class="w-header__title">
{% if view.header_icon %}{% icon class_name="w-header__glyph" name=view.header_icon %}{% endif %}
{{ view.page_title }}{% if view.subtitle %} <span class="header__subtitle">{{ view.subtitle }}</span>{% endif %}
</h1>
</div>
</div>
<div class="right">
<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 icon icon-plus">{{ view.add_item_label }}</a>
</div>
</div>
</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 icon icon-plus">{{ view.add_item_label }}</a>
{% endfragment %}
{% include "wagtailadmin/shared/header.html" with title=view.page_title icon=view.header_icon extra_actions=workflow_actions %}
<div class="nice-padding">
{% if workflows %}

33
wagtail/admin/templates/wagtailadmin/workflows/task_index.html
Wyświetl plik

@ -2,28 +2,17 @@
{% load i18n wagtailadmin_tags %}
{% block content %}
<header class="w-header" role="banner">
<div class="row">
<div class="left">
<div class="col">
<h1 class="w-header__title">
{% if view.header_icon %}{% icon class_name="w-header__glyph" name=view.header_icon %}{% endif %}
{{ view.page_title }}{% if view.subtitle %} <span class="w-header__subtitle">{{ view.subtitle }}</span>{% endif %}
</h1>
</div>
</div>
<div class="right">
<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 icon icon-plus">{{ view.add_item_label }}</a>
</div>
</div>
</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 icon icon-plus">{{ view.add_item_label }}</a>
{% endfragment %}
{% include "wagtailadmin/shared/header.html" with title=view.page_title icon=view.header_icon extra_actions=workflow_actions %}
<div class="nice-padding">
{% if tasks %}