From fd7db187cdadad5968a3fa88bb60c9766379ece0 Mon Sep 17 00:00:00 2001
From: Mandel Olaiya <mandeleolaiya15@icloud.com>
Date: Tue, 17 Mar 2026 17:26:16 +0100
Subject: [PATCH] Revert "template-engine: use carbasa-native footer flow via
 engine page template overrides"

This reverts commit c04cd4a35f3ce869ce423a50bcb849d153f849d0.
---
 mandelstudio/settings/base.py                 |  6 ++
 .../engine/pages/base_home_page.html          | 50 --------------
 .../engine/pages/base_standard_page.html      | 53 ---------------
 .../mandelstudio/carbasa_footer.html          | 66 +++++++++++++++++++
 4 files changed, 72 insertions(+), 103 deletions(-)
 delete mode 100644 mandelstudio/templates/engine/pages/base_home_page.html
 delete mode 100644 mandelstudio/templates/engine/pages/base_standard_page.html
 create mode 100644 mandelstudio/templates/mandelstudio/carbasa_footer.html

diff --git a/mandelstudio/settings/base.py b/mandelstudio/settings/base.py
index 8538568..cb93a21 100644
--- a/mandelstudio/settings/base.py
+++ b/mandelstudio/settings/base.py
@@ -65,3 +65,9 @@ ACTIVE_VERTICAL = "agency"
 WAGTAIL_I18N_ENABLED = True
 WAGTAIL_CONTENT_LANGUAGES = LANGUAGES
 
+# Force Template Engine shell to use Carbasa footer in this project
+TEMPLATE_ENGINE_SHELL_CANDIDATES = {
+    "carbasa": {
+        "footer": ["mandelstudio/carbasa_footer.html"],
+    },
+}
diff --git a/mandelstudio/templates/engine/pages/base_home_page.html b/mandelstudio/templates/engine/pages/base_home_page.html
deleted file mode 100644
index 2bf63bb..0000000
--- a/mandelstudio/templates/engine/pages/base_home_page.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% extends "layout.html" %}
-{% load wagtailcore_tags oxyan static string_filters %}
-
-{% block extrahead %}
-  {{ block.super }}
-  <link rel="stylesheet" href="{% static 'theme/modern_saas/css/main.css' %}">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-  <script src="{% static 'theme/modern_saas/js/nav-toggle.js' %}" defer></script>
-  {% include "engine/partials/gym_theme_overrides.html" %}
-  {% include "engine/partials/hotel_theme_overrides.html" %}
-  {% include "engine/partials/auto_theme_overrides.html" %}
-  {% include "engine/partials/bank_theme_overrides.html" %}
-  {% include "engine/partials/pharmacy_theme_overrides.html" %}
-  {% include "engine/partials/realty_theme_overrides.html" %}
-  {% include "engine/partials/tech_theme_overrides.html" %}
-  {% include "engine/partials/travel_theme_overrides.html" %}
-  {% include "engine/partials/saas_theme_overrides.html" %}
-{% endblock %}
-
-{% block layout %}
-  <a class="btn btn-secondary hidelink" id="main_content_link" href="#skip_header" tabindex="2">
-    Ga naar inhoud
-  </a>
-  {% include_header header_template|default:"engine/partials/header.html" %}
-  <div id="main_content" tabindex="-1">
-    <div class="te-modern-saas">
-      <main>
-        {% for block in self.body %}
-          {% with scope_class=block.block_type|split:"_"|join:"-" %}
-          <section
-            class="te-block te-block--{{ scope_class }}"
-            data-block-type="{{ block.block_type }}"
-          >
-            {% include_block block %}
-          </section>
-          {% endwith %}
-        {% endfor %}
-      </main>
-    </div>
-  </div>
-
-  {# Use Carbasa-native footer rendering so visual shell matches carbasa sites #}
-  {% if not self.footer %}
-    <div class="footer-corners">
-      {% include "svg/corner.svg" with class="left" %}
-      {% include "svg/corner.svg" with class="right" %}
-    </div>
-  {% endif %}
-  {% include "oxyan/partials/footer.html" %}
-{% endblock %}
diff --git a/mandelstudio/templates/engine/pages/base_standard_page.html b/mandelstudio/templates/engine/pages/base_standard_page.html
deleted file mode 100644
index ed0410d..0000000
--- a/mandelstudio/templates/engine/pages/base_standard_page.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% extends "layout.html" %}
-{% load wagtailcore_tags oxyan static string_filters %}
-
-{% block extrahead %}
-  {{ block.super }}
-  <link rel="stylesheet" href="{% static 'theme/modern_saas/css/main.css' %}">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
-  <script src="{% static 'theme/modern_saas/js/nav-toggle.js' %}" defer></script>
-  {% include "engine/partials/gym_theme_overrides.html" %}
-  {% include "engine/partials/hotel_theme_overrides.html" %}
-  {% include "engine/partials/auto_theme_overrides.html" %}
-  {% include "engine/partials/bank_theme_overrides.html" %}
-  {% include "engine/partials/pharmacy_theme_overrides.html" %}
-  {% include "engine/partials/realty_theme_overrides.html" %}
-  {% include "engine/partials/tech_theme_overrides.html" %}
-  {% include "engine/partials/travel_theme_overrides.html" %}
-  {% include "engine/partials/saas_theme_overrides.html" %}
-{% endblock %}
-
-{% block layout %}
-  <a class="btn btn-secondary hidelink" id="main_content_link" href="#skip_header" tabindex="2">
-    Ga naar inhoud
-  </a>
-  {% include_header header_template|default:"engine/partials/header.html" %}
-  <div id="main_content" tabindex="-1">
-    <div class="te-modern-saas">
-      <main class="te-section">
-        <div class="container">
-          <h1 class="te-section__heading">{{ self.title }}</h1>
-          {% for block in self.body %}
-            {% with scope_class=block.block_type|split:"_"|join:"-" %}
-            <section
-              class="te-block te-block--{{ scope_class }}"
-              data-block-type="{{ block.block_type }}"
-            >
-              {% include_block block %}
-            </section>
-            {% endwith %}
-          {% endfor %}
-        </div>
-      </main>
-    </div>
-  </div>
-
-  {# Use Carbasa-native footer rendering so visual shell matches carbasa sites #}
-  {% if not self.footer %}
-    <div class="footer-corners">
-      {% include "svg/corner.svg" with class="left" %}
-      {% include "svg/corner.svg" with class="right" %}
-    </div>
-  {% endif %}
-  {% include "oxyan/partials/footer.html" %}
-{% endblock %}
diff --git a/mandelstudio/templates/mandelstudio/carbasa_footer.html b/mandelstudio/templates/mandelstudio/carbasa_footer.html
new file mode 100644
index 0000000..7d1b64c
--- /dev/null
+++ b/mandelstudio/templates/mandelstudio/carbasa_footer.html
@@ -0,0 +1,66 @@
+{% load wagtailcore_tags wagtailsettings_tags %}
+{% get_settings %}
+
+<style>
+  .mandelstudio-carbasa-footer-wrap {
+    margin-top: 4rem;
+    padding-top: 2.5rem;
+  }
+
+  .mandelstudio-carbasa-footer {
+    background: #040404;
+    color: #f5f5f5;
+    border-radius: 28px 28px 0 0;
+    padding: 4rem 0 2.5rem;
+  }
+
+  .mandelstudio-carbasa-footer .footer_column,
+  .mandelstudio-carbasa-footer .footer_column p,
+  .mandelstudio-carbasa-footer .footer_column a,
+  .mandelstudio-carbasa-footer .copyright_block {
+    color: #f5f5f5;
+  }
+
+  .mandelstudio-carbasa-footer .footer_column a {
+    text-decoration: none;
+    opacity: 0.92;
+  }
+
+  .mandelstudio-carbasa-footer .footer_column a:hover {
+    opacity: 1;
+    text-decoration: underline;
+  }
+
+  .mandelstudio-carbasa-footer hr {
+    border-color: rgba(255, 255, 255, 0.2);
+  }
+
+  .mandelstudio-carbasa-footer .copyright_block {
+    font-size: 0.95rem;
+    opacity: 0.92;
+  }
+</style>
+
+<div class="mandelstudio-carbasa-footer-wrap">
+<footer class="footer mandelstudio-carbasa-footer">
+    <div class="container">
+        <div class="row">
+            {% with footer=settings.ocyan_plugin_wagtail.OcyanSettings.footer %}
+            {% for block in footer %}
+            <div class="{% if block.block_type == 'SubscriptionBlock' %}col-lg-6{% else %}col-lg-3{% endif %} col-md-6 col-sm-12 footer_column">
+                {% include_block block %}
+            </div>
+            {% endfor %}
+            {% endwith %}
+        </div>
+        <div class="container pt-4">
+            <hr class="mb-5">
+            <div class="row">
+                <div class="col-lg-12 copyright_block">
+                    {% include_block settings.ocyan_plugin_wagtail.OcyanSettings.mini_footer %}
+                </div>
+            </div>
+        </div>
+    </div>
+</footer>
+</div>