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

Give 404 pages a meaningful HTML title in project template () 

Improve the generation of `<title>` tags as follows:

* use `page` in preference to `self` (self has been semi-deprecated ever since we added jinja2 support)
* Retrieve current site with `{% wagtail_site %}` rather than page.get_site so that it works on non-pages such as 404s
* Fill in the 'title' block on 404.html
pull/7285/head
Matt Westcott 2021-06-18 18:07:26 +01:00
rodzic ac2e07e8c4
commit a28376a5c9
4 zmienionych plików z 8 dodań i 5 usunięć
docs/releases
wagtail/project_template/project_name/templates

1
CHANGELOG.txt
Wyświetl plik

@ -21,6 +21,7 @@ Changelog
* Fix: Prevent failure on root page when registering the Page model with ModelAdmin (Jake Howard)
* Fix: Prevent error when filtering page search results with a malformed content_type (Chris Pollard)
* Fix: Prevent multiple submissions of "update" form when uploading images / documents (Mike Brown)
* Fix: Ensure HTML title is populated on project template 404 page (Matt Westcott)
2.13.2 (17.06.2021)

1
docs/releases/2.14.rst
Wyświetl plik

@ -32,6 +32,7 @@ Bug fixes
* Prevent failure on root page when registering the Page model with ModelAdmin (Jake Howard)
* Prevent error when filtering page search results with a malformed content_type (Chris Pollard)
* Prevent multiple submissions of "update" form when uploading images / documents (Mike Brown)
* Ensure HTML title is populated on project template 404 page (Matt Westcott)
Upgrade considerations
======================

2
wagtail/project_template/project_name/templates/404.html
Wyświetl plik

@ -1,5 +1,7 @@
{% templatetag openblock %} extends "base.html" {% templatetag closeblock %}
{% templatetag openblock %} block title {% templatetag closeblock %}Page not found{% templatetag openblock %} endblock {% templatetag closeblock %}
{% templatetag openblock %} block body_class {% templatetag closeblock %}template-404{% templatetag openblock %} endblock {% templatetag closeblock %}
{% templatetag openblock %} block content {% templatetag closeblock %}

9
wagtail/project_template/project_name/templates/base.html
Wyświetl plik

@ -1,4 +1,4 @@
{% templatetag openblock %} load static wagtailuserbar {% templatetag closeblock %}
{% templatetag openblock %} load static wagtailcore_tags wagtailuserbar {% templatetag closeblock %}
<!DOCTYPE html>
<html class="no-js" lang="en">
@ -6,12 +6,11 @@
<meta charset="utf-8" />
<title>
{% templatetag openblock %} block title %}
{% templatetag openblock %} if self.seo_title %}{% templatetag openvariable %} self.seo_title {% templatetag closevariable %}{% templatetag openblock %} else %}{% templatetag openvariable %} self.title {% templatetag closevariable %}{% templatetag openblock %} endif %}
{% templatetag openblock %} if page.seo_title %}{% templatetag openvariable %} page.seo_title {% templatetag closevariable %}{% templatetag openblock %} else %}{% templatetag openvariable %} page.title {% templatetag closevariable %}{% templatetag openblock %} endif %}
{% templatetag openblock %} endblock %}
{% templatetag openblock %} block title_suffix %}
{% templatetag openblock %} with self.get_site.site_name as site_name %}
{% templatetag openblock %} if site_name %}- {% templatetag openvariable %} site_name {% templatetag closevariable %}{% templatetag openblock %} endif %}
{% templatetag openblock %} endwith %}
{% templatetag openblock %} wagtail_site as current_site %}
{% templatetag openblock %} if current_site and current_site.site_name %}- {% templatetag openvariable %} current_site.site_name {% templatetag closevariable %}{% templatetag openblock %} endif %}
{% templatetag openblock %} endblock %}
</title>
<meta name="description" content="" />