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

Refactor all `field_as_li.html` includes 

`field_as_li.html` merely wraps a <li> and includes `field.html`.

Remove `field_as_li.html` template

It is no longer used.

Historical mention in 1.0 release notes [^1] has
been left intact.

[^1]: docs/releases/1.0.rst

Relates to
pull/9961/head
Storm B. Heg 2023-07-14 15:10:30 +02:00 zatwierdzone przez LB (Ben Johnston)
rodzic ecb2126cea
commit a4d29494ac
34 zmienionych plików z 176 dodań i 53 usunięć
docs/releases
wagtail
admin/templates/wagtailadmin
contrib
forms/templates/wagtailforms
redirects/templates/wagtailredirects
simple_translation/templates/simple_translation/admin
styleguide/templates/wagtailstyleguide
documents/templates/wagtaildocs/documents
embeds/templates/wagtailembeds/chooser
images/templates/wagtailimages
search/templates/wagtailsearch/queries/chooser
test/testapp/templates/tests/generic_view_templates
users/templates/wagtailusers

1
CHANGELOG.txt
Wyświetl plik

@ -95,6 +95,7 @@ Changelog
* Maintenance: Update uuid to v9 and Jest to v29, with `jest-environment-jsdom` and new snapshot format (LB (Ben) Johnston)
* Maintenance: Update test cases producing undesirable console output due to missing mocks, uncaught errors, warnings (LB (Ben) Johnston)
* Maintenance: Remove unused snippets _header_with_history.html template (Thibaud Colas)
* Maintenance: Remove `"wagtailadmin/shared/field_as_li.html"` template include (Storm Heg)
5.0.2 (21.06.2023)

19
docs/releases/5.1.md
Wyświetl plik

@ -151,6 +151,7 @@ This feature was developed by Aman Pandey as part of the Google Summer of Code p
* Remove unused snippets _header_with_history.html template (Thibaud Colas)
* Migrate dialog instantiation to a new `w-dialog` Stimulus controller, including in the Userbar (Loveth Omokaro, LB (Ben) Johnston)
* Support dialog template cloning using a new `w-teleport` Stimulus controller (Loveth Omokaro, LB (Ben) Johnston)
* Remove `"wagtailadmin/shared/field_as_li.html"` template include (Storm Heg)
## Upgrade considerations
@ -300,6 +301,24 @@ The undocumented shared include `wagtailadmin/shared/last_updated.html` is no lo
{% human_readable_date my_model.timestamp %}
```
### Shared include `field_as_li.html` is no longer available
The documented include `"wagtailadmin/shared/field_as_li.html"` has been removed, if being used it will need to be replaced with `"wagtailadmin/shared/field.html"` wrapped within `li` tags.
#### Before
```html+django
{% include "wagtailadmin/shared/field_as_li.html" %}
```
#### After
```html+django
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
```
### Tag (Tagit) field usage now relies on data attributes
The `AdminTagWidget` widget has now been migrated to a Stimulus controller, if using this widget in Python, no changes are needed to adopt the new approach.

4
wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html
Wyświetl plik

@ -9,7 +9,9 @@
{% csrf_token %}
<ul class="fields">
{% for field in form %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li><input type="submit" value="{% trans 'Insert anchor' %}" class="button" /></li>
</ul>

4
wagtail/admin/templates/wagtailadmin/chooser/email_link.html
Wyświetl plik

@ -9,7 +9,9 @@
{% csrf_token %}
<ul class="fields">
{% for field in form %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li><input type="submit" value="{% trans 'Insert link' %}" class="button" /></li>
</ul>

4
wagtail/admin/templates/wagtailadmin/chooser/external_link.html
Wyświetl plik

@ -9,7 +9,9 @@
{% csrf_token %}
<ul class="fields">
{% for field in form %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li><input type="submit" value="{% trans 'Insert link' %}" class="button" /></li>
</ul>

4
wagtail/admin/templates/wagtailadmin/chooser/phone_link.html
Wyświetl plik

@ -9,7 +9,9 @@
{% csrf_token %}
<ul class="fields">
{% for field in form %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li><input type="submit" value="{% trans 'Insert link' %}" class="button" /></li>
</ul>

4
wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html
Wyświetl plik

@ -36,7 +36,9 @@
{% if filter_form.visible_fields %}
<ul class="fields">
{% for field in filter_form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
</ul>
{% endif %}

4
wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html
Wyświetl plik

@ -13,7 +13,9 @@
<ul class="fields">
{% for field in creation_form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
<li>
{% if create_action_clicked_label %}

4
wagtail/admin/templates/wagtailadmin/generic/form.html
Wyświetl plik

@ -19,7 +19,9 @@
<ul class="fields">
{% block visible_fields %}
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
{% endblock %}

4
wagtail/admin/templates/wagtailadmin/generic/multiple_upload/edit_form.html
Wyświetl plik

@ -9,7 +9,9 @@
{% if field.is_hidden %}
{{ field }}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endif %}
{% endfor %}
<li>

24
wagtail/admin/templates/wagtailadmin/pages/copy.html
Wyświetl plik

@ -11,20 +11,32 @@
<input type="hidden" name="next" value="{{ next }}" />
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.new_title %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.new_slug %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.new_parent_page %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.new_title %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.new_slug %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.new_parent_page %}
</li>
{% if form.copy_subpages %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.copy_subpages %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.copy_subpages %}
</li>
{% endif %}
{% if form.publish_copies %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.publish_copies %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.publish_copies %}
</li>
{% endif %}
{% if form.alias %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.alias %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.alias %}
</li>
{% endif %}
</ul>

4
wagtail/admin/templates/wagtailadmin/pages/move_choose_destination.html
Wyświetl plik

@ -10,7 +10,9 @@
{% csrf_token %}
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=move_form.new_parent_page %}
<li>
{% include "wagtailadmin/shared/field.html" with field=move_form.new_parent_page %}
</li>
</ul>
<input type="submit" value="{% trans 'Confirm' %}" class="button">

1
wagtail/admin/templates/wagtailadmin/shared/field_as_li.html
Wyświetl plik

@ -1 +0,0 @@
<li>{% include "wagtailadmin/shared/field.html" %}</li>

4
wagtail/admin/templates/wagtailadmin/workflows/create_task.html
Wyświetl plik

@ -18,7 +18,9 @@
<ul class="fields nice-padding">
{% for field in form %}
{% if not field.is_hidden %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% else %}
{{ field }}
{% endif %}

4
wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
Wyświetl plik

@ -17,7 +17,9 @@
<ul class="fields nice-padding">
{% for field in form %}
{% if not field.is_hidden %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% else %}
{{ field }}
{% endif %}

8
wagtail/admin/templates/wagtailadmin/workflows/task_chooser/chooser.html
Wyświetl plik

@ -33,7 +33,9 @@
<form class="task-search" action="{% url 'wagtailadmin_workflows:task_chooser_results' %}" method="GET" novalidate>
<ul class="fields">
{% for field in search_form %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
</ul>
</form>
@ -48,7 +50,9 @@
<form class="task-search" action="{% url 'wagtailadmin_workflows:task_chooser_results' %}" method="GET" novalidate>
<ul class="fields">
{% for field in search_form %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
</ul>
</form>

4
wagtail/admin/templates/wagtailadmin/workflows/task_chooser/includes/create_form.html
Wyświetl plik

@ -15,7 +15,9 @@
{% if field.is_hidden %}
{{ field }}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endif %}
{% endfor %}
<li>

4
wagtail/contrib/forms/templates/wagtailforms/submissions_index.html
Wyświetl plik

@ -110,7 +110,9 @@
{% icon name="spinner" %}{% trans 'Apply filters' %}
</button>
{% for field in select_date_form %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
</form>
</div>

4
wagtail/contrib/redirects/templates/wagtailredirects/add.html
Wyświetl plik

@ -12,7 +12,9 @@
<ul class="fields">
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li>

4
wagtail/contrib/redirects/templates/wagtailredirects/choose_import_file.html
Wyświetl plik

@ -23,7 +23,9 @@
<ul class="fields">
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li>

4
wagtail/contrib/redirects/templates/wagtailredirects/confirm_import.html
Wyświetl plik

@ -16,7 +16,9 @@
<ul class="fields">
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li>

4
wagtail/contrib/redirects/templates/wagtailredirects/edit.html
Wyświetl plik

@ -12,7 +12,9 @@
<ul class="fields">
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
<li>

4
wagtail/contrib/simple_translation/templates/simple_translation/admin/submit_translation.html
Wyświetl plik

@ -18,7 +18,9 @@
<ul class="fields">
{% block visible_fields %}
{% for field in form.visible_fields %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endfor %}
{% endblock %}
{% if form.show_submit %}

4
wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
Wyświetl plik

@ -472,7 +472,9 @@
{% if field.name == 'file' %}
{% include "wagtailimages/images/_file_field.html" %}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endif %}
{% endfor %}
<li><button type="submit" class="button">{% trans 'Save' %}</button><a href="#" class="button no">{% trans "Delete image" %}</a></li>

4
wagtail/documents/templates/wagtaildocs/documents/add.html
Wyświetl plik

@ -57,7 +57,9 @@
{% if field.is_hidden %}
{{ field }}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endif %}
{% endfor %}
<li>

4
wagtail/documents/templates/wagtaildocs/documents/edit.html
Wyświetl plik

@ -32,7 +32,9 @@
{% elif field.is_hidden %}
{{ field }}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" %}
<li>
{% include "wagtailadmin/shared/field.html" %}
</li>
{% endif %}
{% endfor %}
<li>

4
wagtail/embeds/templates/wagtailembeds/chooser/chooser.html
Wyświetl plik

@ -9,7 +9,9 @@
{% csrf_token %}
<ul class="fields">
{% for field in form %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
<li>
<button

4
wagtail/images/templates/wagtailimages/chooser/chooser.html
Wyświetl plik

@ -5,7 +5,9 @@
<form data-chooser-modal-search action="{{ results_url }}" method="GET" autocomplete="off" novalidate>
<ul class="fields">
{% for field in filter_form %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
{% if popular_tags %}
<li class="taglist w-label-3">

4
wagtail/images/templates/wagtailimages/images/add.html
Wyświetl plik

@ -58,7 +58,9 @@
{% if field.is_hidden %}
{{ field }}
{% else %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endif %}
{% endfor %}
<li><input type="submit" value="{% trans 'Save' %}" class="button" /></li>

4
wagtail/search/templates/wagtailsearch/queries/chooser/chooser.html
Wyświetl plik

@ -6,7 +6,9 @@
<form class="query-search full-width" action="{% url 'wagtailsearch_admin:queries_chooserresults' %}" method="GET" autocomplete="off" novalidate>
<ul class="fields">
{% for field in searchform %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=field %}
</li>
{% endfor %}
<li class="submit"><input type="submit" value="{% trans 'Search' %}" class="button" /></li>
</ul>

4
wagtail/test/testapp/templates/tests/generic_view_templates/edit.html
Wyświetl plik

@ -6,7 +6,9 @@
<div class="tab-content">
{% csrf_token %}
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.content %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.content %}
</li>
<li>
<input type="submit" value="Save" class="button"/>
</li>

4
wagtail/users/templates/wagtailusers/groups/create.html
Wyświetl plik

@ -20,7 +20,9 @@
<ul class="fields">
{% block fields %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.name %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.name %}
</li>
{% block extra_fields %}{% endblock extra_fields %}
{% endblock fields %}
<li>

32
wagtail/users/templates/wagtailusers/users/create.html
Wyświetl plik

@ -29,17 +29,29 @@
<ul class="fields">
{% block fields %}
{% if form.separate_username_field %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.username_field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.username_field %}
</li>
{% endif %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.email %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.first_name %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.last_name %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.email %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.first_name %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.last_name %}
</li>
{% block extra_fields %}{% endblock extra_fields %}
{% if form.password1 %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.password1 %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.password1 %}
</li>
{% endif %}
{% if form.password2 %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.password2 %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.password2 %}
</li>
{% endif %}
{% endblock fields %}
@ -59,8 +71,12 @@
aria-labelledby="tab-label-roles"
>
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_superuser %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.groups %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.groups %}
</li>
<li><button class="button">{% trans "Add user" %}</button></li>
</ul>
</section>

36
wagtail/users/templates/wagtailusers/users/edit.html
Wyświetl plik

@ -30,20 +30,34 @@
<ul class="fields">
{% block fields %}
{% if form.separate_username_field %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.username_field %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.username_field %}
</li>
{% endif %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.email %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.first_name %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.last_name %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.email %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.first_name %}
</li>
<li>
{% include "wagtailadmin/shared/field.html" with field=form.last_name %}
</li>
{% block extra_fields %}{% endblock extra_fields %}
{% if form.password1 %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.password1 %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.password1 %}
</li>
{% endif %}
{% if form.password2 %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.password2 %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.password2 %}
</li>
{% endif %}
{% if form.is_active %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_active %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.is_active %}
</li>
{% endif %}
{% endblock fields %}
@ -64,10 +78,14 @@
>
<ul class="fields">
{% if form.is_superuser %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_superuser %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.is_superuser %}
</li>
{% endif %}
{% include "wagtailadmin/shared/field_as_li.html" with field=form.groups %}
<li>
{% include "wagtailadmin/shared/field.html" with field=form.groups %}
</li>
<li>
<input type="submit" value="{% trans 'Save' %}" class="button"/>
{% if can_delete %}