repos/website
1
Fork 0
Code Issues 1 Pull requests 27 Activity

Upgrade to Wagtail 5.2 #100

Merged
jake merged 10 commits from feature/wagtail-5.2 into master 2024-01-05 17:12:49 +00:00
Conversation 0 Commits 10 Files changed 23 +93 -103
6 changed files with 93 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 518461a88f - Show all commits

6
website/blog/templates/blog/blog_post_page.html
View file

@ -1,12 +1,12 @@
{% extends "common/content_page.html" %} {% extends "common/content_page.html" %}
{% load cache util_tags %} {% load wagtail_cache %}
{% block post_content %} {% block post_content %}
{{ block.super }} {{ block.super }}
{% if not request.is_preview %} {% if not request.is_preview %}
{% cache FRAGMENT_CACHE_TTL|jitter:FRAGMENT_CACHE_TTL_JITTER "similar-content" page.id request.is_preview %} {% wagtailpagecache FRAGMENT_CACHE_TTL "similar-content" %}
<section class="container similar-content" id="similar-content"> <section class="container similar-content" id="similar-content">
<h2 class="subtitle is-size-2">Similar content</h2> <h2 class="subtitle is-size-2">Similar content</h2>
@ -21,6 +21,6 @@
{% endfor %} {% endfor %}
</section> </section>
{% endcache %} {% endwagtailpagecache %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

10
website/common/templates/base.html
View file

@ -1,4 +1,4 @@
{% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags plausible_wagtail favicon_tags sri cache %} {% load static wagtailcore_tags wagtailuserbar navbar_tags footer_tags plausible_wagtail favicon_tags sri wagtail_cache %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-GB"> <html lang="en-GB">
@ -32,9 +32,9 @@
<body class="{% block body_class %}{% endblock %}"> <body class="{% block body_class %}{% endblock %}">
{% wagtailuserbar %} {% wagtailuserbar %}
{% cache 1800 "navbar" request.is_preview %} {% wagtailcache 1800 "navbar" %}
{% navbar %} {% navbar %}
{% endcache %} {% endwagtailcache %}
{% block main %} {% block main %}
<main> <main>
@ -42,9 +42,9 @@
</main> </main>
{% endblock %} {% endblock %}
{% cache 1800 "footer" request.is_preview %} {% wagtailcache 1800 "footer" %}
{% footer %} {% footer %}
{% endcache %} {% endwagtailcache %}
{# Not async to avoid bright flashes #} {# Not async to avoid bright flashes #}
{% sri_static "js/dark-mode.js" %} {% sri_static "js/dark-mode.js" %}

6
website/common/templates/common/content-details.html
View file

@ -1,6 +1,6 @@
{% load wagtailcore_tags cache util_tags %} {% load wagtailcore_tags wagtail_cache %}
{% cache FRAGMENT_CACHE_TTL|jitter:FRAGMENT_CACHE_TTL_JITTER "content-details" page.id request.is_preview %} {% wagtailpagecache FRAGMENT_CACHE_TTL "content-details" %}
<div class="content-details field is-grouped"> <div class="content-details field is-grouped">
{% if page.date %} {% if page.date %}
<span class="icon-text"> <span class="icon-text">
@ -33,4 +33,4 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% endcache %} {% endwagtailpagecache %}

6
website/common/templates/common/listing-item.html
View file

@ -1,6 +1,6 @@
{% load wagtailcore_tags cache util_tags %} {% load wagtailcore_tags wagtail_cache util_tags %}
{% cache FRAGMENT_CACHE_TTL|jitter:FRAGMENT_CACHE_TTL_JITTER "listing-item" page.id request.is_preview breadcrumbs %} {% wagtailpagecache FRAGMENT_CACHE_TTL "listing-item" breadcrumbs %}
<article class="media listing-item"> <article class="media listing-item">
<div class="columns"> <div class="columns">
<figure class="media-left column is-3 image-column"> <figure class="media-left column is-3 image-column">
@ -24,4 +24,4 @@
</div> </div>
</div> </div>
</article> </article>
{% endcache %} {% endwagtailpagecache %}

7
website/common/templatetags/util_tags.py
View file

@ -1,5 +1,3 @@
import random
from django.template import Library from django.template import Library
from django.utils.encoding import force_str from django.utils.encoding import force_str
from wagtail.models import Page from wagtail.models import Page
@ -20,11 +18,6 @@ def pagefullurl(context: dict, page: Page) -> str:
return page.get_full_url(context["request"]) return page.get_full_url(context["request"])
@register.filter()
def jitter(original: float, jitter: float) -> float:
return random.uniform(original + jitter, original - jitter)
@register.filter() @register.filter()
def extract_text(html: str | RichText) -> str: def extract_text(html: str | RichText) -> str:
return utils.extract_text(force_str(html)) return utils.extract_text(force_str(html))

5
website/utils/context_processors.py
View file

@ -3,12 +3,9 @@ from django.http.request import HttpRequest
def global_vars(request: HttpRequest) -> dict: def global_vars(request: HttpRequest) -> dict:
# noop caching in preview
fragment_cache_ttl = 0 if getattr(request, "is_preview", False) else 3600
return { return {
"SEO_INDEX": settings.SEO_INDEX, "SEO_INDEX": settings.SEO_INDEX,
"DEBUG": settings.DEBUG, "DEBUG": settings.DEBUG,
"FRAGMENT_CACHE_TTL": fragment_cache_ttl, "FRAGMENT_CACHE_TTL": 3600,
"FRAGMENT_CACHE_TTL_JITTER": fragment_cache_ttl * 0.1,
"ACTIVITYPUB_HOST": settings.ACTIVITYPUB_HOST, "ACTIVITYPUB_HOST": settings.ACTIVITYPUB_HOST,
} }