From 7b95550f86d8142928fa6c5341ba569459ef4ec2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:12:28 -0700 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#255) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Nabil Freij --- .pre-commit-config.yaml | 4 ++-- src/ablog/templates/ablog/catalog.html | 2 +- src/ablog/templates/ablog/collection.html | 5 +++-- src/ablog/templates/ablog/redirect.html | 4 ++-- src/ablog/templates/catalog.html | 2 +- src/ablog/templates/collection.html | 5 +++-- src/ablog/templates/page.html | 4 ++-- src/ablog/templates/redirect.html | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 31e6b988..51f94124 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,7 +25,7 @@ repos: - id: check-yaml - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.0.290' + rev: 'v0.0.292' hooks: - id: ruff args: ['--fix'] @@ -40,7 +40,7 @@ repos: - id: prettier types_or: [css, scss, javascript] - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.33.0 + rev: v1.34.0 hooks: - id: djlint-jinja types_or: ["html"] diff --git a/src/ablog/templates/ablog/catalog.html b/src/ablog/templates/ablog/catalog.html index c55a56b5..e7e6d371 100644 --- a/src/ablog/templates/ablog/catalog.html +++ b/src/ablog/templates/ablog/catalog.html @@ -32,4 +32,4 @@

{% endif %} {% endfor %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/ablog/collection.html b/src/ablog/templates/ablog/collection.html index 666b92af..ec86f4b7 100644 --- a/src/ablog/templates/ablog/collection.html +++ b/src/ablog/templates/ablog/collection.html @@ -1,4 +1,5 @@ -{%- extends "page.html" %} {% block body %} +{%- extends "page.html" %} +{% block body %} {% macro postlink(post) -%} {% if post.external_link -%} {{- post.external_link -}} @@ -66,4 +67,4 @@

{% endfor %} {% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/ablog/redirect.html b/src/ablog/templates/ablog/redirect.html index baa3af6a..79f7468e 100644 --- a/src/ablog/templates/ablog/redirect.html +++ b/src/ablog/templates/ablog/redirect.html @@ -2,7 +2,7 @@ {%- block extrahead %} {{ super() }} -{% endblock %} +{% endblock extrahead %} {% block body %} You are being redirected to {{ post.title }} in {{ ablog.post_redirect_refresh }} seconds; -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/catalog.html b/src/ablog/templates/catalog.html index 0d2e488c..fd1a8304 100644 --- a/src/ablog/templates/catalog.html +++ b/src/ablog/templates/catalog.html @@ -33,4 +33,4 @@

{% endif %} {% endfor %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/collection.html b/src/ablog/templates/collection.html index 6cd2a207..8389caea 100644 --- a/src/ablog/templates/collection.html +++ b/src/ablog/templates/collection.html @@ -1,5 +1,6 @@ {{ warning("collection.html is an old template path, that is no longer used by ablog. Please use ablog/collection.html instead.") }} -{%- extends "page.html" %} {% block body %} +{%- extends "page.html" %} +{% block body %} {% macro postlink(post) -%} {% if post.external_link -%} {{- post.external_link -}} @@ -68,4 +69,4 @@

{% endfor %} {% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/page.html b/src/ablog/templates/page.html index 875f6a86..f360992c 100644 --- a/src/ablog/templates/page.html +++ b/src/ablog/templates/page.html @@ -19,7 +19,7 @@ type="text/css" /> {% endif %} -{% endblock %} +{% endblock extrahead %} {% block body %} {{ body }}
@@ -57,4 +57,4 @@

Comments

{% endif %} -{% endblock %} +{% endblock body %} diff --git a/src/ablog/templates/redirect.html b/src/ablog/templates/redirect.html index 21109bb1..83ab0032 100644 --- a/src/ablog/templates/redirect.html +++ b/src/ablog/templates/redirect.html @@ -3,7 +3,7 @@ {%- block extrahead %} {{ super() }} -{% endblock %} +{% endblock extrahead %} {% block body %} You are being redirected to {{ post.title }} in {{ ablog.post_redirect_refresh }} seconds; -{% endblock %} +{% endblock body %}