From 8a8762bd6d403836d20dc8b8a9412321b1d059d6 Mon Sep 17 00:00:00 2001
From: Mandel Olaiya <mandeleolaiya15@icloud.com>
Date: Sun, 26 Apr 2026 09:59:04 +0200
Subject: [PATCH] Use Carbasa webshop user bar and basket dropdown

---
 .../headers/partials/carbasa-user-bar.html    | 29 -------------------
 .../oxyan/headers/partials/mini_basket.html   | 16 ++++++++++
 2 files changed, 16 insertions(+), 29 deletions(-)
 delete mode 100644 mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
 create mode 100644 mandelstudio/templates/oxyan/headers/partials/mini_basket.html

diff --git a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
deleted file mode 100644
index d1dce51..0000000
--- a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load i18n mandelstudio_i18n %}
-{% get_current_language as LANGUAGE_CODE %}
-<div class="header-right">
-    <form action="{% url 'set_language' %}" method="post" class="ms-lang-switcher me-2" aria-label="Language switcher">
-        {% csrf_token %}
-        <input name="next" type="hidden" value="{{ language_neutral_url_path|default:request.path|language_neutral_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()">
-            <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>
-        </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>
-    <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">
-    {% include "oscar/partials/alert_messages.html" with messages=messages %}
-</div>
diff --git a/mandelstudio/templates/oxyan/headers/partials/mini_basket.html b/mandelstudio/templates/oxyan/headers/partials/mini_basket.html
new file mode 100644
index 0000000..f1ac373
--- /dev/null
+++ b/mandelstudio/templates/oxyan/headers/partials/mini_basket.html
@@ -0,0 +1,16 @@
+{% load i18n ocyanjson %}
+
+{# Project-level override: ensure Carbasa basket dropdown UI is used even when other themes provide a fallback. #}
+<div class="dropdown basket-dropdown">
+    <button class="dropdown-toggle nav-link menu-circle" data-bs-toggle="dropdown" aria-label="{% trans 'Basket button' %}">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M253.3 35.1c6.1-11.8 1.5-26.3-10.2-32.4s-26.3-1.5-32.4 10.2L117.6 192 32 192c-17.7 0-32 14.3-32 32s14.3 32 32 32L83.9 463.5C91 492 116.6 512 146 512L430 512c29.4 0 55-20 62.1-48.5L544 256c17.7 0 32-14.3 32-32s-14.3-32-32-32l-85.6 0L365.3 12.9C359.2 1.2 344.7-3.4 332.9 2.7s-16.3 20.6-10.2 32.4L404.3 192l-232.6 0L253.3 35.1zM192 304l0 96c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-96c0-8.8 7.2-16 16-16s16 7.2 16 16zm96-16c8.8 0 16 7.2 16 16l0 96c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-96c0-8.8 7.2-16 16-16zm128 16l0 96c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-96c0-8.8 7.2-16 16-16s16 7.2 16 16z"/></svg>
+
+        {% if request.basket.num_items %}<span class="icon-label">{{ request.basket.num_items }}</span>{% endif %}
+    </button>
+
+    <div class="dropdown-menu dropdown-menu-end">
+        <span class="overlay"></span>
+        {% include "oxyan/headers/partials/mini_in_basket.html" %}
+    </div>
+</div>
+