Fix contact form import to plugin path for staging runtime

This reverts commit 6cca48eaf9.

mandelstudio/static/mandelstudio/scss/layout_overrides.scss

@@ -80,7 +80,7 @@ header {
 #cookie_popup_body.cookie-consent-overlay {
   position: fixed;
   inset: 0;
-  z-index: 1080;
+  z-index: 9999;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -99,6 +99,8 @@ header {
     box-shadow: 0 24px 64px rgba(0, 0, 0, 0.25);
     backdrop-filter: blur(16px);
     -webkit-backdrop-filter: blur(16px);
+    position: relative;
+    z-index: 10000;
   }
 
   .cookie-consent-panel {
@@ -138,12 +140,14 @@ header {
   #cookie_popup_acceptButton_settings,
   #cookie_model_saveButton {
     flex: 1 1 0;
-    height: 46px;
+    min-height: 48px;
+    height: auto;
+    padding: 12px 16px;
     border-radius: 10px;
     border: 1px solid transparent;
     font-size: 17px;
     font-weight: 600;
-    line-height: 1;
+    line-height: 1.2;
     transition: background-color 140ms ease, border-color 140ms ease, color 140ms ease;
   }
 
@@ -204,25 +208,207 @@ header {
   }
 }
 
+body.cookie-consent-open {
+  overflow: hidden;
+
+  .header-right,
+  .theme-switcher-toggle,
+  .wagtail-userbar,
+  [class*="help"],
+  [class*="assistant"],
+  [class*="chat-widget"],
+  [class*="cart"],
+  [class*="basket"],
+  [class*="floating"] {
+    opacity: 0 !important;
+    pointer-events: none !important;
+  }
+}
+
+@media (max-width: 991.98px) {
+  header .header-inner > .container {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    column-gap: 0.375rem;
+    padding-top: 0.625rem;
+    padding-bottom: 0.625rem;
+  }
+
+  header .header-inner > .container > .navbar-brand {
+    order: 1;
+    margin: 0;
+    flex: 0 1 auto;
+  }
+
+  header .header-inner > .container > .navbar-brand img {
+    width: auto;
+    height: auto;
+    max-height: 74px;
+    max-width: 190px;
+  }
+
+  header .header-inner > .container > .header-right {
+    order: 2;
+    margin-left: auto;
+    flex: 0 0 auto;
+    gap: 0.375rem;
+  }
+
+  header .header-right .language-dropdown,
+  header .header-right .basket-dropdown,
+  header .header-right > a.user-button.menu-circle,
+  header .header-right .menu-circle {
+    width: 36px;
+    height: 36px;
+    min-width: 36px;
+    min-height: 36px;
+    flex-basis: 36px;
+  }
+
+  header .header-inner > .container > .navbar-toggler {
+    order: 3;
+    margin-left: 0.125rem;
+    flex: 0 0 auto;
+  }
+
+  header .header-inner > .container > .navbar-collapse {
+    order: 4;
+    display: none;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show,
+  header .header-inner > .container > .navbar-collapse.collapsing {
+    display: block;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+    height: 100dvh;
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+    background: #fff;
+    z-index: 9000;
+  }
+
+  header .header-inner .navbar-collapse .brand-wrapper {
+    display: block;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show .brand-wrapper,
+  header .header-inner > .container > .navbar-collapse.collapsing .brand-wrapper {
+    position: absolute;
+    top: 16px;
+    left: 50%;
+    transform: translateX(-50%);
+    width: auto;
+    margin: 0;
+    z-index: 2;
+    text-align: center;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show .brand-wrapper .navbar-brand,
+  header .header-inner > .container > .navbar-collapse.collapsing .brand-wrapper .navbar-brand {
+    margin: 0;
+    display: inline-flex;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show .brand-wrapper img,
+  header .header-inner > .container > .navbar-collapse.collapsing .brand-wrapper img {
+    max-height: 92px;
+    width: auto;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show .navbar-nav,
+  header .header-inner > .container > .navbar-collapse.collapsing .navbar-nav {
+    padding-top: 124px;
+  }
+
+  header .header-inner > .container > .navbar-collapse.show .brand-wrapper::after,
+  header .header-inner > .container > .navbar-collapse.collapsing .brand-wrapper::after {
+    content: "";
+    position: absolute;
+    left: -80px;
+    right: -80px;
+    bottom: -14px;
+    border-bottom: 1px solid rgba(15, 23, 42, 0.08);
+  }
+
+
+  header .header-right,
+  header .header-right .basket-dropdown,
+  header .header-right .menu-circle {
+    position: relative;
+    z-index: 100;
+  }
+}
+
+@media (max-width: 991.98px) {
+  body.mobile-menu-open {
+    header .header-inner > .container > .navbar-brand {
+      opacity: 0;
+      pointer-events: none;
+    }
+
+    .header-right,
+    .theme-switcher-toggle,
+    .wagtail-userbar,
+    [class*="help"],
+    [class*="assistant"],
+    [class*="chat-widget"],
+    [class*="cart"],
+    [class*="basket"],
+    [class*="floating"] {
+      opacity: 0 !important;
+      pointer-events: none !important;
+    }
+
+  }
+}
+
 @media (max-width: 640px) {
   #cookie_popup_body.cookie-consent-overlay {
-    padding: 12px;
+    padding: 12px 14px 14px;
+    padding-top: calc(12px + env(safe-area-inset-top));
+    padding-bottom: calc(14px + env(safe-area-inset-bottom));
 
     .cookie-consent-modal {
-      padding: 18px;
+      max-width: 420px;
+      max-height: 82vh;
+      overflow-y: auto;
+      padding: 18px 16px;
       border-radius: 14px;
     }
 
     .cookie-banner-title {
+      margin-bottom: 12px;
       font-size: 21px;
     }
 
     #cookie_popup_content p {
-      font-size: 15px;
+      font-size: 16px;
+      line-height: 1.45;
     }
 
     .cookie-consent-actions {
       flex-direction: column;
+      gap: 10px;
+      margin-top: 16px;
+    }
+
+    #cookie_popup_acceptButton,
+    #cookie_popup_settingsToggle,
+    #cookie_popup_acceptButton_settings,
+    #cookie_model_saveButton {
+      width: 100%;
+      font-size: 16px;
+    }
+
+    .cookie-consent-hint {
+      margin-top: 12px;
+      font-size: 13px;
     }
   }
 }

mandelstudio/templates/cookie_jar/cookie_banner.html

@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load wagtailcore_tags ocyanjson %}
+{% load mandelstudio_i18n %}
 
 {% with settings.cookie_jar.CookieSettings as cookie_settings %}
     {% with request.LANGUAGE_CODE|default:'nl' as language_code %}
@@ -14,22 +15,9 @@
                         <span>{% if lang == 'ru' %}Конфиденциальность и файлы cookie{% elif lang == 'de' %}Datenschutz & Cookies{% elif lang == 'fr' %}Confidentialité & Cookies{% elif lang == 'es' %}Privacidad y Cookies{% elif lang == 'it' %}Privacy e Cookie{% elif lang == 'pt' %}Privacidade & Cookies{% else %}Privacy & Cookies{% endif %}</span>
                     </div>
                     <div id="cookie_popup_content">
-                        {% if lang == 'en' and cookie_settings.cookie_message_en %}
-                            {{ cookie_settings.cookie_message_en|richtext }}
-                        {% elif lang == 'de' and cookie_settings.cookie_message_de %}
-                            {{ cookie_settings.cookie_message_de|richtext }}
-                        {% elif lang == 'fr' and cookie_settings.cookie_message_fr %}
-                            {{ cookie_settings.cookie_message_fr|richtext }}
-                        {% elif lang == 'es' and cookie_settings.cookie_message_es %}
-                            {{ cookie_settings.cookie_message_es|richtext }}
-                        {% elif lang == 'it' and cookie_settings.cookie_message_it %}
-                            {{ cookie_settings.cookie_message_it|richtext }}
-                        {% elif lang == 'pt' and cookie_settings.cookie_message_pt %}
-                            {{ cookie_settings.cookie_message_pt|richtext }}
-                        {% elif lang == 'ru' and cookie_settings.cookie_message_ru %}
-                            {{ cookie_settings.cookie_message_ru|richtext }}
-                        {% elif cookie_settings.cookie_message %}
-                            {{ cookie_settings.cookie_message|richtext }}
+                        {% localized_setting_text cookie_settings "cookie_message" as cookie_message_text %}
+                        {% if cookie_message_text %}
+                            {{ cookie_message_text|richtext }}
                         {% else %}
                             <p>
                                 {% blocktrans %}
@@ -57,22 +45,9 @@
                         <span>{% if lang == 'ru' %}Настройки cookie{% elif lang == 'de' %}Cookie-Einstellungen{% elif lang == 'fr' %}Paramètres des cookies{% elif lang == 'es' %}Configuración de cookies{% elif lang == 'it' %}Impostazioni cookie{% elif lang == 'pt' %}Definições de cookies{% elif lang == 'en' %}Cookie settings{% else %}Cookie instellingen{% endif %}</span>
                     </div>
                     <div id="cookie_popup_content_modal">
-                        {% if lang == 'en' and cookie_settings.popup_cookie_message_en %}
-                            {{ cookie_settings.popup_cookie_message_en|richtext }}
-                        {% elif lang == 'de' and cookie_settings.popup_cookie_message_de %}
-                            {{ cookie_settings.popup_cookie_message_de|richtext }}
-                        {% elif lang == 'fr' and cookie_settings.popup_cookie_message_fr %}
-                            {{ cookie_settings.popup_cookie_message_fr|richtext }}
-                        {% elif lang == 'es' and cookie_settings.popup_cookie_message_es %}
-                            {{ cookie_settings.popup_cookie_message_es|richtext }}
-                        {% elif lang == 'it' and cookie_settings.popup_cookie_message_it %}
-                            {{ cookie_settings.popup_cookie_message_it|richtext }}
-                        {% elif lang == 'pt' and cookie_settings.popup_cookie_message_pt %}
-                            {{ cookie_settings.popup_cookie_message_pt|richtext }}
-                        {% elif lang == 'ru' and cookie_settings.popup_cookie_message_ru %}
-                            {{ cookie_settings.popup_cookie_message_ru|richtext }}
-                        {% elif cookie_settings.popup_cookie_message %}
-                            {{ cookie_settings.popup_cookie_message|richtext }}
+                        {% localized_setting_text cookie_settings "popup_cookie_message" as popup_cookie_message_text %}
+                        {% if popup_cookie_message_text %}
+                            {{ popup_cookie_message_text|richtext }}
                         {% else %}
                             <p>
                                 {% blocktrans %}
@@ -101,6 +76,31 @@
       return document.getElementById(id);
     }
 
+    function setConsentOpenState(isOpen) {
+      if (!document.body) return;
+      document.body.classList.toggle("cookie-consent-open", !!isOpen);
+    }
+
+    function setMobileMenuOpenState(isOpen) {
+      if (!document.body) return;
+      document.body.classList.toggle("mobile-menu-open", !!isOpen);
+    }
+
+    function syncMobileMenuState(navbar) {
+      if (!navbar) return;
+      var isOpen = navbar.classList.contains("show") || navbar.classList.contains("collapsing");
+      setMobileMenuOpenState(isOpen);
+    }
+
+    function closeOpenMenus() {
+      document.querySelectorAll(".dropdown-menu.show").forEach(function (menu) {
+        menu.classList.remove("show");
+      });
+      document.querySelectorAll("[aria-expanded='true']").forEach(function (trigger) {
+        trigger.setAttribute("aria-expanded", "false");
+      });
+    }
+
     function showSettings(event) {
       if (event) {
         event.preventDefault();
@@ -127,10 +127,31 @@
     }
 
     document.addEventListener("DOMContentLoaded", function () {
+      var popupBody = byId("cookie_popup_body");
       var settingsBtn = byId("cookie_popup_settingsToggle");
       var backBtn = byId("cookie_popup_backButton");
       var acceptSettingsBtn = byId("cookie_popup_acceptButton_settings");
       var acceptBtn = byId("cookie_popup_acceptButton");
+      var navbar = byId("navbarSupportedContent");
+
+      if (popupBody) {
+        setConsentOpenState(true);
+        closeOpenMenus();
+      }
+
+      if (navbar) {
+        syncMobileMenuState(navbar);
+        ["show.bs.collapse", "shown.bs.collapse", "hide.bs.collapse", "hidden.bs.collapse"].forEach(function (eventName) {
+          navbar.addEventListener(eventName, function () {
+            syncMobileMenuState(navbar);
+          });
+        });
+
+        var observer = new MutationObserver(function () {
+          syncMobileMenuState(navbar);
+        });
+        observer.observe(navbar, { attributes: true, attributeFilter: ["class"] });
+      }
 
       if (settingsBtn) {
         settingsBtn.addEventListener("click", showSettings);
@@ -144,6 +165,17 @@
           acceptBtn.click();
         });
       }
+
+      if (acceptBtn) {
+        acceptBtn.addEventListener("click", function () {
+          setConsentOpenState(false);
+        });
+      }
+
+      window.addEventListener("beforeunload", function () {
+        setConsentOpenState(false);
+        setMobileMenuOpenState(false);
+      });
     });
   })();
 </script>

mandelstudio/templatetags/mandelstudio_i18n.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from django import template
+from django.utils.translation import get_language
 
 from mandelstudio.i18n_utils import normalize_set_language_next
 
@@ -29,3 +30,22 @@ def skip_to_content_text(context) -> str:
 def language_neutral_path(value: str | None) -> str:
     """Normalize a path for set_language by removing any leading language prefix."""
     return normalize_set_language_next(value)
+
+
+@register.simple_tag
+def localized_setting_text(settings_obj, field_name: str, fallback_text: str = "") -> str:
+    """
+    Resolve a translated settings field by active language and fallback to base field.
+    """
+    if not settings_obj or not field_name:
+        return fallback_text
+
+    language = (get_language() or "").lower().split("-")[0]
+    if language and language != "nl":
+        translated_name = f"{field_name}_{language}"
+        translated_value = getattr(settings_obj, translated_name, None)
+        if translated_value:
+            return translated_value
+
+    base_value = getattr(settings_obj, field_name, None)
+    return base_value or fallback_text

mandelstudio/urls.py

@@ -8,7 +8,7 @@ from ocyan.plugin.contact_form.entrypoint import SHOP_BASE_URL
 from ocyan.plugin.wagtail_oscar_integration.constants import CACHE_DURATION
 from ocyan.plugin.wordspinner.views.ai_search import ai_search_view
 
-from contact_form.views import post_contact_form
+from ocyan.plugin.contact_form.views import post_contact_form
 
 from .i18n_views import set_language_normalized
 from .sitemaps import robots_txt, sitemap_index, sitemap_section