From 63c692d46b12e2185c9524532ad580b2c14aae7d Mon Sep 17 00:00:00 2001 From: moanos Date: Sun, 29 Jun 2025 08:26:26 +0200 Subject: [PATCH] feat: start adding canonical urls --- src/fellchensammlung/templates/fellchensammlung/base.html | 1 + .../fellchensammlung/details/detail-adoption-notice.html | 1 + src/fellchensammlung/templates/fellchensammlung/index.html | 2 +- src/fellchensammlung/templatetags/custom_tags.py | 5 +++++ src/notfellchen/settings.py | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/fellchensammlung/templates/fellchensammlung/base.html b/src/fellchensammlung/templates/fellchensammlung/base.html index 9b1bb8a..4e8a313 100644 --- a/src/fellchensammlung/templates/fellchensammlung/base.html +++ b/src/fellchensammlung/templates/fellchensammlung/base.html @@ -12,6 +12,7 @@ {% block description %}{% endblock %} {% block og_description %}{% endblock %} {% block og_image %}{% endblock %} + diff --git a/src/fellchensammlung/templates/fellchensammlung/details/detail-adoption-notice.html b/src/fellchensammlung/templates/fellchensammlung/details/detail-adoption-notice.html index 8158f2f..e38eaac 100644 --- a/src/fellchensammlung/templates/fellchensammlung/details/detail-adoption-notice.html +++ b/src/fellchensammlung/templates/fellchensammlung/details/detail-adoption-notice.html @@ -13,6 +13,7 @@ {% block og_description %} {% endblock %} +{% block canonical_url %}{{ host }}{% url 'adoption-notice-detail' adoption_notice_id=adoption_notice.id %}{% endblock %} {% block og_image %} {% if adoption_notice.get_photos %} diff --git a/src/fellchensammlung/templates/fellchensammlung/index.html b/src/fellchensammlung/templates/fellchensammlung/index.html index 61e431c..7b0b7b1 100644 --- a/src/fellchensammlung/templates/fellchensammlung/index.html +++ b/src/fellchensammlung/templates/fellchensammlung/index.html @@ -8,7 +8,7 @@ {% block description %}{% endblock %} {% block og_description %}{% endblock %} {% block og_image %}{% endblock %} - +{% block canonical_url %}{{ host }}{% url 'index' %}{% endblock %} {% block content %} {% for announcement in announcements %} diff --git a/src/fellchensammlung/templatetags/custom_tags.py b/src/fellchensammlung/templatetags/custom_tags.py index 4485e2b..29df759 100644 --- a/src/fellchensammlung/templatetags/custom_tags.py +++ b/src/fellchensammlung/templatetags/custom_tags.py @@ -108,3 +108,8 @@ def trust_level(level_string): @register.filter def dictkey(d, key): return d.get(key) + + +@register.simple_tag +def host(): + return settings.host diff --git a/src/notfellchen/settings.py b/src/notfellchen/settings.py index 6e73114..88f54b0 100644 --- a/src/notfellchen/settings.py +++ b/src/notfellchen/settings.py @@ -141,6 +141,8 @@ STATIC_ROOT = config.get("locations", "static", fallback="/notfellchen/static") MEDIA_ROOT = config.get("locations", "media", fallback="/notfellchen/static") MEDIA_URL = config.get("urls", "media", fallback="/media/") +# Host will be used for allowed hosts but also for canonical URLs and CSRF settings! +# Take all three into account when modifying host = config.get("notfellchen", "host", fallback='*') # see https://docs.djangoproject.com/en/3.2/ref/settings/#std-setting-ALLOWED_HOSTS