Always load cookie assets and mount cookie banner modal

This commit is contained in:
2026-05-14 04:42:21 +02:00
parent 76be2e7f41
commit f3b43b1208
2 changed files with 0 additions and 9 deletions

View File

@@ -2,7 +2,6 @@
{% load wagtailcore_tags ocyanjson %} {% load wagtailcore_tags ocyanjson %}
{% with settings.cookie_jar.CookieSettings as cookie_settings %} {% with settings.cookie_jar.CookieSettings as cookie_settings %}
{% if cookie_jar.needs_display or cookie_jar.site_settings.strict_cookies or not cookie_jar.cookie %}
<div id="cookie_popup_body" class="cookie-consent-overlay" role="region" aria-label="{% trans 'Cookie settings' %}"> <div id="cookie_popup_body" class="cookie-consent-overlay" role="region" aria-label="{% trans 'Cookie settings' %}">
<div class="cookie-consent-modal" role="dialog" aria-modal="true" aria-labelledby="cookie-consent-title"> <div class="cookie-consent-modal" role="dialog" aria-modal="true" aria-labelledby="cookie-consent-title">
<div class="cookie-consent-panel is-active" id="cookie-consent-main-panel"> <div class="cookie-consent-panel is-active" id="cookie-consent-main-panel">
@@ -54,7 +53,6 @@
</div> </div>
</div> </div>
</div> </div>
{% endif %}
{% endwith %} {% endwith %}
<script> <script>

View File

@@ -26,9 +26,7 @@
<link rel="preconnect" href="https://www.google-analytics.com/"> <link rel="preconnect" href="https://www.google-analytics.com/">
{% endif %} {% endif %}
{{ block.super }} {{ block.super }}
{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
<link rel="stylesheet" type="text/css" href="{% static 'cookie_jar/css/cookie_jar.css' %}"> <link rel="stylesheet" type="text/css" href="{% static 'cookie_jar/css/cookie_jar.css' %}">
{% endif %}
{% for header_snippet in cookie_jar.activated_snippet_header_templates %} {% for header_snippet in cookie_jar.activated_snippet_header_templates %}
{% include header_snippet %} {% include header_snippet %}
{% endfor %} {% endfor %}
@@ -62,9 +60,7 @@
{% block extrascripts %} {% block extrascripts %}
{% include "oscar/partials/extrascripts.html" %} {% include "oscar/partials/extrascripts.html" %}
{{ block.super }} {{ block.super }}
{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
<script src="{% static 'cookie_jar/js/cookie_jar.js' %}"></script> <script src="{% static 'cookie_jar/js/cookie_jar.js' %}"></script>
{% endif %}
{% endblock %} {% endblock %}
{% block onbodyload %} {% block onbodyload %}
@@ -94,9 +90,6 @@ oxyan.initImageZoom()
{% for footer_snippet in cookie_jar.activated_snippet_footer_templates %} {% for footer_snippet in cookie_jar.activated_snippet_footer_templates %}
{% include footer_snippet %} {% include footer_snippet %}
{% endfor %} {% endfor %}
{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
<script src="{% static 'cookie_jar/js/cookie_jar.js' %}"></script>
{% endif %}
{% include "cookie_jar/cookie_banner.html" %} {% include "cookie_jar/cookie_banner.html" %}
{% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %} {% if cookie_jar.needs_approval or cookie_jar.site_settings.strict_cookies %}
{% include "cookie_jar/partials/preferences_saved_toast.html" %} {% include "cookie_jar/partials/preferences_saved_toast.html" %}