From 40ae092306b3bf7420ccd7f7b0dc7e5096ae217d Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Thu, 21 Dec 2023 02:31:51 +0100
Subject: [PATCH] [ADD] New template block for the character control icons top
 right

This commit adds a new template block called "header_nav_user_character_control" to the base-bs5.html file. This block is intended to display character control icons in the top right section of the navigation bar. The existing code has been modified to include this new block and rearrange the layout accordingly.

With this change it is possible to add app specific menu items to the right side as well without having to re-add the character control menu items all the time.

Thanks to @aaronkable for discussing this idea with me.
---
 .../templates/allianceauth/base-bs5.html      | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/allianceauth/templates/allianceauth/base-bs5.html b/allianceauth/templates/allianceauth/base-bs5.html
index e391b581..a4918416 100644
--- a/allianceauth/templates/allianceauth/base-bs5.html
+++ b/allianceauth/templates/allianceauth/base-bs5.html
@@ -55,27 +55,35 @@
                         </a>
                     {% endif %}
 
-                    <div class="navbar-brand">{% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}</div>
+                    <div class="navbar-brand">
+                        {% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}
+                    </div>
 
-                        <div class="collapse navbar-collapse" id="navbarexpand">
-                            <div class="m-2"></div>
+                    <div class="collapse navbar-collapse" id="navbarexpand">
+                        <div class="m-2"></div>
 
-                            <ul id="nav-left" class="navbar-nav nav me-auto">
-                                {% block header_nav_collapse_left %}
-                                {% endblock %}
-                            </ul>
+                        <ul id="nav-left" class="navbar-nav nav me-auto">
+                            {% block header_nav_collapse_left %}
+                            {% endblock %}
+                        </ul>
 
-                            <ul id="nav-right" class="navbar-nav">
-                                {% block header_nav_collapse_right %} <!-- Default to add char and swap main -->
-                                    {% include 'allianceauth/top-menu-rh-default.html' %}
-                                {% endblock %}
-                                {% include 'menu/menu-notification-block.html' %}
-                            </ul>
-                        </div>
+                        <ul id="nav-right" class="navbar-nav">
+                            {% block header_nav_collapse_right %}
+                            {% endblock %}
+                        </ul>
 
-                        <a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
-                            <i class="fa-solid fa-chevron-up"></i>
-                        </a>
+                        <ul id="nav-right-character-control" class="navbar-nav">
+                            {% block header_nav_user_character_control %} <!-- Default to add char and swap main -->
+                                {% include 'allianceauth/top-menu-rh-default.html' %}
+                            {% endblock %}
+
+                            {% include 'menu/menu-notification-block.html' %}
+                        </ul>
+                    </div>
+
+                    <a class="navbar-toggler navbar-brand border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#navbarexpand" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" style="margin-left: auto;">
+                        <i class="fa-solid fa-chevron-up"></i>
+                    </a>
                 </div>
             </nav>
         {% endif %}