From dd42c2b07439634b18d87c165add4f591058353a Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sun, 15 Jun 2025 12:10:44 +0200
Subject: [PATCH 1/2] [CHANGE] Only show theme selection if more than 1 theme
 is available

---
 .../menu/templates/menu/menu-user.html        |  1 +
 .../theme/templates/theme/theme_select.html   | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index b98d5174..6932fd87 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -50,6 +50,7 @@
                         {% theme_select %}
                     </a>
                 </li>
+                {% theme_select %}
 
                 {% if user.is_superuser %}
                     <li><hr class="dropdown-divider"></li>
diff --git a/allianceauth/theme/templates/theme/theme_select.html b/allianceauth/theme/templates/theme/theme_select.html
index c83b7726..7e94d1c5 100644
--- a/allianceauth/theme/templates/theme/theme_select.html
+++ b/allianceauth/theme/templates/theme/theme_select.html
@@ -1,13 +1,21 @@
 {% load i18n %}
 
-<form action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
-    {% csrf_token %}
+{% if themes|length > 1 %}
+    <li><h6 class="dropdown-header">{% translate "Theme" %}</h6></li>
 
-    <select name="theme" class="form-select" aria-label="" onchange="this.form.submit()">
-        <option selected>{% translate "Select Theme" %}</option>
+    <li>
+        <form class="dropdown-item" action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
+            {% csrf_token %}
 
-        {% for theme in themes %}
-            <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>{{ theme.name }}</option>
-        {% endfor %}
-    </select>
-</form>
+            <select name="theme" class="form-select" onchange="this.form.submit()">
+                <option selected>{% translate "Select Theme" %}</option>
+
+                {% for theme in themes %}
+                    <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>
+                        {{ theme.name }}
+                    </option>
+                {% endfor %}
+            </select>
+        </form>
+    </li>
+{% endif %}

From 449991d8460855693d7c754a3afc1de13a47761b Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sun, 15 Jun 2025 12:15:14 +0200
Subject: [PATCH 2/2] [FIX] Several HTML fixes

- Remove unnecessary HTML tags
- Remove unnecessary Bootstrap classes
- Add title attributes
- Make strings translatable
---
 .../templates/public/lang_select.html         |  24 ++-
 .../menu/templates/menu/menu-user.html        | 142 +++++++++++++-----
 2 files changed, 118 insertions(+), 48 deletions(-)

diff --git a/allianceauth/authentication/templates/public/lang_select.html b/allianceauth/authentication/templates/public/lang_select.html
index 7f641524..eb71d6b0 100644
--- a/allianceauth/authentication/templates/public/lang_select.html
+++ b/allianceauth/authentication/templates/public/lang_select.html
@@ -1,17 +1,15 @@
 {% load i18n %}
 
-<div class="dropdown">
-    <form action="{% url 'set_language' %}" method="post">
-        {% csrf_token %}
+<form class="dropdown-item" action="{% url 'set_language' %}" method="post">
+    {% csrf_token %}
 
-        <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
-            {% get_available_languages as LANGUAGES %}
+    <select class="form-select" onchange="this.form.submit()" class="form-control" id="lang-select" name="language">
+        {% get_available_languages as LANGUAGES %}
 
-            {% for lang_code, lang_name in LANGUAGES %}
-                <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
-                    {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
-                </option>
-            {% endfor %}
-        </select>
-    </form>
-</div>
+        {% for lang_code, lang_name in LANGUAGES %}
+            <option lang="{{ lang_code }}" value="{{ lang_code }}"{% if lang_code == LANGUAGE_CODE %} selected{% endif %}>
+                {{ lang_code|language_name_local|capfirst }} ({{ lang_code }})
+            </option>
+        {% endfor %}
+    </select>
+</form>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index 6932fd87..fd2bc31f 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -2,28 +2,51 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div id="aa-user-info" class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
+<div
+    id="aa-user-info"
+    class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}"
+>
     <div class="d-flex mb-0 w-100">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
                 {% with request.user.profile.main_character as main %}
-                    <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
-                    <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
+                    <img
+                        class="rounded-circle"
+                        src="{{ main.character_id|character_portrait_url:64 }}"
+                        alt="{{ main.character_name }}"
+                    >
+
+                    <img
+                        class="rounded-circle position-absolute bottom-0 start-0"
+                        src="{{ main.corporation_logo_url_32 }}"
+                        alt="{{ main.corporation_name }}"
+                    >
+
                     {% if main.alliance_id %}
-                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
+                        <img
+                            class="rounded-circle position-absolute bottom-0 end-0"
+                            src="{{ main.alliance_logo_url_32 }}"
+                            alt="{{ main.alliance_name }}"
+                        >
                     {% elif main.faction_id %}
-                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
+                        <img
+                            class="rounded-circle position-absolute bottom-0 end-0"
+                            src="{{ main.faction_logo_url_32 }}"
+                            alt="{{ main.faction_name }}"
+                        >
                     {% endif %}
                 {% endwith %}
             {% else %}
                 {% include "bundles/image-auth-logo.html" with logo_width="64px" %}
             {% endif %}
         </div>
+
         <div class="align-self-center text-start">
             {% if user.is_authenticated %}
                 {% with request.user.profile.main_character as main %}
                     <h5 class="m-0">{{ main.character_name }}</h5>
                     <p class="m-0 small">{{ main.corporation_name }}</p>
+
                     {% if main.alliance_id %}
                         <p class="m-0 small">{{ main.alliance_name }}</p>
                     {% elif main.faction_id %}
@@ -34,57 +57,106 @@
                 <h5 class="m-0">{{ SITE_NAME }}</h5>
             {% endif %}
         </div>
+
         <div class="ms-auto dropup">
             <button type="button" class="h-100 btn" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="fa-solid fa-gear fa-fw text-light"></i>
             </button>
+
             <ul class="dropdown-menu" style="min-width: 200px;">
                 <li><h6 class="dropdown-header">{% translate "Language" %}</h6></li>
-                <li>
-                    <a class="dropdown-item">{% include "public/lang_select.html" %}</a>
-                </li>
-                <li><h6 class="dropdown-header">{% translate "Theme" %}</h6></li>
 
                 <li>
-                    <a class="dropdown-item">
-                        {% theme_select %}
-                    </a>
+                    {% include "public/lang_select.html" %}
                 </li>
+
                 {% theme_select %}
 
                 {% if user.is_superuser %}
                     <li><hr class="dropdown-divider"></li>
                     <li><h6 class="dropdown-header">{% translate "Super User" %}</h6></li>
+
                     <li>
-                        <a class="dropdown-item"  href="https://allianceauth.readthedocs.io/" title="Alliance Auth Documentation"><i class="fa-solid fa-book fa-fw"></i> Alliance Auth Documentation</a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item"  href="https://discord.gg/fjnHAmk" title="Alliance Auth Discord"><i class="fa-brands fa-discord fa-fw"></i> Alliance Auth Discord</a>
-                    </li>
-                    <li>
-                        <a class="dropdown-item" href="https://gitlab.com/allianceauth/allianceauth" title="Alliance Auth Git"><i class="fa-brands fa-gitlab fa-fw"></i> Alliance Auth Git</a>
-                    </li>
-                {% endif %}
-                {% if user.is_staff %}
-                <li>
-                    <a class="dropdown-item" href="{% url 'admin:index' %}">
-                        <i class="fa-solid fa-gear fa-fw"></i> {% translate "Admin" %}
-                    </a>
-                </li>
-                {% endif %}
-                <li><hr class="dropdown-divider"></li>
-                {% if user.is_authenticated %}
-                    <li>
-                        <a class="dropdown-item" href="{% url 'authentication:token_management' %}">
-                            <i class="fa-solid fa-user-lock fa-fw"></i> Token Management
+                        <a
+                            class="dropdown-item"
+                            href="https://allianceauth.readthedocs.io/"
+                            title="{% translate 'Alliance Auth Documentation' %}"
+                        >
+                            <i class="fa-solid fa-book fa-fw"></i>
+                            {% translate "Alliance Auth Documentation" %}
                         </a>
                     </li>
+
                     <li>
-                        <a class="dropdown-item text-danger" href="{% url 'logout' %}" title="{% translate 'Sign Out' %}"><i class="fa-solid fa-right-from-bracket fa-fw "></i> {% translate 'Sign Out' %}</a>
+                        <a
+                            class="dropdown-item"
+                            href="https://discord.gg/fjnHAmk"
+                            title="{% translate 'Alliance Auth Discord' %}"
+                        >
+                            <i class="fa-brands fa-discord fa-fw"></i>
+                            {% translate "Alliance Auth Discord" %}
+                        </a>
+                    </li>
+
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="https://gitlab.com/allianceauth/allianceauth"
+                            title="{% translate 'Alliance Auth Git' %}"
+                        >
+                            <i class="fa-brands fa-gitlab fa-fw"></i>
+                            {% translate "Alliance Auth Git" %}
+                        </a>
+                    </li>
+                {% endif %}
+
+                {% if user.is_staff %}
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="{% url 'admin:index' %}"
+                            title="{% translate 'Admin' %}"
+                        >
+                            <i class="fa-solid fa-gear fa-fw"></i>
+                            {% translate "Admin" %}
+                        </a>
+                    </li>
+                {% endif %}
+
+                <li><hr class="dropdown-divider"></li>
+
+                {% if user.is_authenticated %}
+                    <li>
+                        <a
+                            class="dropdown-item"
+                            href="{% url 'authentication:token_management' %}"
+                            title="{% translate 'Token Management' %}"
+                        >
+                            <i class="fa-solid fa-user-lock fa-fw"></i>
+                            {% translate "Token Management" %}
+                        </a>
+                    </li>
+
+                    <li>
+                        <a
+                            class="dropdown-item text-danger"
+                            href="{% url 'logout' %}"
+                            title="{% translate 'Sign Out' %}"
+                        >
+                            <i class="fa-solid fa-right-from-bracket fa-fw"></i>
+                            {% translate 'Sign Out' %}
+                        </a>
                     </li>
                 {% else %}
                     <li>
-                        <a class="dropdown-item text-success" href="{% url 'authentication:login' %}" title="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw "></i> {% translate 'Sign In' %}</a>
+                        <a
+                            class="dropdown-item text-success"
+                            href="{% url 'authentication:login' %}"
+                            title="{% translate 'Sign In' %}"
+                        >
+                            <i class="fa-solid fa-right-to-bracket fa-fw"></i>
+                            {% translate 'Sign In' %}
+                        </a>
                     </li>
                 {% endif %}
             </ul>