From 4e465d2c3c52e558b6b8843a0bb676da620a97be Mon Sep 17 00:00:00 2001
From: Mandel Olaiya <mandeleolaiya15@icloud.com>
Date: Fri, 3 Apr 2026 19:00:41 +0200
Subject: [PATCH] Restore Carbasa header as active source and remove injected
 header styling

---
 .../templates/carbasa/headers/mega.html       | 28 ----------
 .../templates/oxyan/headers/header.html       |  1 +
 .../templates/oxyan/headers/mega.html         |  1 +
 .../headers/partials/carbasa-user-bar.html    | 55 ++++---------------
 4 files changed, 12 insertions(+), 73 deletions(-)
 create mode 100644 mandelstudio/templates/oxyan/headers/header.html
 create mode 100644 mandelstudio/templates/oxyan/headers/mega.html

diff --git a/mandelstudio/templates/carbasa/headers/mega.html b/mandelstudio/templates/carbasa/headers/mega.html
index 5567cb0..a71778a 100644
--- a/mandelstudio/templates/carbasa/headers/mega.html
+++ b/mandelstudio/templates/carbasa/headers/mega.html
@@ -2,34 +2,6 @@
 {% load agency_navigation %}
 
 {% block nav %}
-<style>
-  .agency-nav-dropdown .dropdown-menu {
-    min-width: 16rem;
-    border-radius: 1rem;
-    border: 1px solid rgba(15, 23, 42, 0.08);
-    box-shadow: 0 18px 48px rgba(15, 23, 42, 0.12);
-    padding: 0.55rem;
-  }
-
-  .agency-nav-dropdown .dropdown-item {
-    border-radius: 0.75rem;
-    font-weight: 600;
-    padding: 0.65rem 0.8rem;
-  }
-
-  .agency-nav-dropdown .dropdown-toggle::after {
-    margin-left: 0.45rem;
-    vertical-align: 0.15em;
-  }
-
-  @media (min-width: 992px) {
-    .agency-nav-dropdown:hover > .dropdown-menu,
-    .agency-nav-dropdown:focus-within > .dropdown-menu {
-      display: block;
-      margin-top: 0;
-    }
-  }
-</style>
 <div class="collapse navbar-collapse menu-bar page-menu-bar" id="navbarSupportedContent">
     <div class="brand-wrapper">
         {% include 'partials/brand.html' with big=True %}
diff --git a/mandelstudio/templates/oxyan/headers/header.html b/mandelstudio/templates/oxyan/headers/header.html
new file mode 100644
index 0000000..3d1a146
--- /dev/null
+++ b/mandelstudio/templates/oxyan/headers/header.html
@@ -0,0 +1 @@
+{% extends "carbasa/headers/header.html" %}
diff --git a/mandelstudio/templates/oxyan/headers/mega.html b/mandelstudio/templates/oxyan/headers/mega.html
new file mode 100644
index 0000000..ceca86a
--- /dev/null
+++ b/mandelstudio/templates/oxyan/headers/mega.html
@@ -0,0 +1 @@
+{% extends "carbasa/headers/mega.html" %}
diff --git a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
index 03ac792..2092591 100644
--- a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
+++ b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
@@ -1,58 +1,23 @@
-{% load i18n i18n_helpers agency_navigation %}
-<style>
-  .ms-lang-switcher { display: inline-flex; align-items: center; }
-  .ms-lang-switcher .form-select {
-    border-radius: 999px;
-    border: 1px solid #c7d4e9;
-    background: #ffffff;
-    color: #0f172a;
-    font-size: 0.82rem;
-    font-weight: 600;
-    line-height: 1.1;
-    padding: 0.36rem 1.85rem 0.36rem 0.8rem;
-    box-shadow: 0 1px 2px rgba(15, 23, 42, 0.06);
-  }
-  .ms-lang-switcher .form-select:focus {
-    border-color: #3b82f6;
-    box-shadow: 0 0 0 0.18rem rgba(59, 130, 246, 0.18);
-  }
-  .ms-header-cta {
-    display: inline-flex;
-    align-items: center;
-    border-radius: 999px;
-    padding: 0.55rem 1rem;
-    font-size: 0.84rem;
-    font-weight: 700;
-    text-decoration: none;
-    margin-left: 0.5rem;
-  }
-</style>
+{% load i18n %}
 <div class="header-right">
-    <form action="{% url 'set_language' %}" method="post" class="ms-lang-switcher me-2" aria-label="Language switcher">
+    <form action="{% url 'set_language' %}" method="post" class="language-switcher-form d-inline-flex align-items-center me-2" aria-label="Language switcher">
         {% csrf_token %}
-        <input name="next" type="hidden" value="{{ request.path|untranslated_url }}">
+        <input name="next" type="hidden" value="{{ request.get_full_path }}">
         <label for="header-language-switcher" class="visually-hidden">{% trans "Language" %}</label>
-        <select id="header-language-switcher" name="language" class="form-select form-select-sm" onchange="this.form.submit()">
+        <select id="header-language-switcher" name="language" class="form-select form-select-sm" style="width:auto; min-width:84px;" onchange="this.form.submit()">
             {% get_current_language as LANGUAGE_CODE %}
-            <option value="nl" {% if LANGUAGE_CODE == 'nl' %}selected{% endif %}>NL</option>
-            <option value="en" {% if LANGUAGE_CODE == 'en' %}selected{% endif %}>EN</option>
-            <option value="de" {% if LANGUAGE_CODE == 'de' %}selected{% endif %}>DE</option>
-            <option value="fr" {% if LANGUAGE_CODE == 'fr' %}selected{% endif %}>FR</option>
-            <option value="es" {% if LANGUAGE_CODE == 'es' %}selected{% endif %}>ES</option>
-            <option value="it" {% if LANGUAGE_CODE == 'it' %}selected{% endif %}>IT</option>
-            <option value="pt" {% if LANGUAGE_CODE == 'pt' %}selected{% endif %}>PT</option>
-            <option value="ru" {% if LANGUAGE_CODE == 'ru' %}selected{% endif %}>RU</option>
+            {% get_available_languages as LANGUAGES %}
+            {% for code, name in LANGUAGES %}
+                <option value="{{ code }}" {% if code == LANGUAGE_CODE %}selected{% endif %}>{{ code|upper }}</option>
+            {% endfor %}
         </select>
     </form>
 
     <a tabindex="0" aria-label="Open Search" role="search" class="search-toggler user-button menu-circle">
         <i class="fa fa-search"></i>
     </a>
-
-    {% agency_page 'contact' as contact_page %}
-    {% if contact_page %}
-    <a href="{{ contact_page.url }}" class="btn btn-primary ms-header-cta">{% agency_primary_cta %}</a>
-    {% endif %}
+    <a href="{% url 'customer:summary' %}" aria-label="{% trans 'Customer summary' %}" class="user-button menu-circle"><i class="fa fa-user-solid"></i></a>
+    {% include "oxyan/headers/partials/mini_basket.html" %}
 </div>
 
 <div class="alert-messages-header" aria-live="polite">