From 8be1c86deb52e56cb02a1a5d632f75516e775850 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Thu, 20 Mar 2025 10:57:17 +0100
Subject: [PATCH] Move org account switcher to sidebar header

---
 .../frontend/templates/includes/sidebar.html  | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/servala/frontend/templates/includes/sidebar.html b/src/servala/frontend/templates/includes/sidebar.html
index 4b7bc77..45da541 100644
--- a/src/servala/frontend/templates/includes/sidebar.html
+++ b/src/servala/frontend/templates/includes/sidebar.html
@@ -53,6 +53,43 @@
                         <a href="#" class="sidebar-hide d-xl-none d-block"><i class="bi bi-x bi-middle"></i></a>
                     </div>
                 </div>
+                {% if request.user.is_authenticated %}
+                    {# request.user.is_authenticated #}
+                    {% if user_organizations.count %}
+                        <button class="btn btn-outline-primary dropdown-toggle w-100"
+                                type="button"
+                                id="organizationDropdown"
+                                data-bs-toggle="dropdown"
+                                aria-haspopup="true"
+                                aria-expanded="false">
+                            {% if request.organization %}
+                                {{ request.organization.name }}
+                            {% else %}
+                                {% translate "Organizations" %}
+                            {% endif %}
+                        </button>
+                        <div class="dropdown-menu shadow"
+                             aria-labelledby="organizationDropdown"
+                             id="organization-dropdown">
+                            {% for organization in user_organizations %}
+                                <a class="dropdown-item{% if organization == request.organization %} active{% endif %}"
+                                   href="{{ organization.get_absolute_url }}">
+                                    <i class="bi bi-building-fill me-1"></i>
+                                    {{ organization.name }}
+                                </a>
+                            {% endfor %}
+                            <a href="{% url 'frontend:organization.create' %}" class="dropdown-item">
+                                <i class="bi bi-building-add me-1"></i>
+                                <span>{% translate "Create organization" %}</span>
+                            </a>
+                        </div>
+                    {% else %}
+                        <a href="{% url 'frontend:organization.create' %}" class="sidebar-link">
+                            <i class="bi bi-plus-square"></i>
+                            <span>{% translate "Create organization" %}</span>
+                        </a>
+                    {% endif %}
+                {% endif %}
             </div>
             <div class="sidebar-menu">
                 <ul class="menu">
@@ -64,43 +101,6 @@
                             </a>
                         </li>
                     {% else %}
-                        {# request.user.is_authenticated #}
-                        <li class="sidebar-item">
-                            {% if user_organizations.count %}
-                                <button class="btn btn-outline-primary dropdown-toggle w-100"
-                                        type="button"
-                                        id="organizationDropdown"
-                                        data-bs-toggle="dropdown"
-                                        aria-haspopup="true"
-                                        aria-expanded="false">
-                                    {% if request.organization %}
-                                        {{ request.organization.name }}
-                                    {% else %}
-                                        {% translate "Organizations" %}
-                                    {% endif %}
-                                </button>
-                                <div class="dropdown-menu shadow"
-                                     aria-labelledby="organizationDropdown"
-                                     id="organization-dropdown">
-                                    {% for organization in user_organizations %}
-                                        <a class="dropdown-item{% if organization == request.organization %} active{% endif %}"
-                                           href="{{ organization.get_absolute_url }}">
-                                            <i class="bi bi-building-fill me-1"></i>
-                                            {{ organization.name }}
-                                        </a>
-                                    {% endfor %}
-                                    <a href="{% url 'frontend:organization.create' %}" class="dropdown-item">
-                                        <i class="bi bi-building-add me-1"></i>
-                                        <span>{% translate "Create organization" %}</span>
-                                    </a>
-                                </div>
-                            {% else %}
-                                <a href="{% url 'frontend:organization.create' %}" class="sidebar-link">
-                                    <i class="bi bi-plus-square"></i>
-                                    <span>{% translate "Create organization" %}</span>
-                                </a>
-                            {% endif %}
-                        </li>
                         {% if request.organization %}
                             <li class="sidebar-item">
                                 <a href="{{ request.organization.get_absolute_url }}"