From 68488598af5e4caa4162cd49d45a17592a5078fb Mon Sep 17 00:00:00 2001
From: AIIrondev <iron.ai.dev@gmail.com>
Date: Wed, 22 Apr 2026 17:26:44 +0200
Subject: [PATCH] Enhance navigation links for borrowed items and tutorials:
 add conditional rendering for 'Meine Ausleihen' and 'Tutorial' links based on
 user permissions

---
 Web/templates/base.html | 53 ++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/Web/templates/base.html b/Web/templates/base.html
index 6ee851b..82a1c2c 100755
--- a/Web/templates/base.html
+++ b/Web/templates/base.html
@@ -911,6 +911,18 @@
                         <a class="nav-link {% if current_path == url_for('home') %}nav-active{% endif %}" href="{{ url_for('home') }}">Artikel</a>
                     </li>
                     {% endif %}
+                    {% if 'username' in session %}
+                    {% if current_permissions.pages.get('my_borrowed_items', True) %}
+                    <li class="nav-item">
+                        <a class="nav-link quick-link-pill {% if current_path == url_for('my_borrowed_items') %}nav-active{% endif %}" href="{{ url_for('my_borrowed_items') }}">Meine Ausleihen</a>
+                    </li>
+                    {% endif %}
+                    {% if current_permissions.pages.get('tutorial_page', True) %}
+                    <li class="nav-item">
+                        <a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}">Tutorial</a>
+                    </li>
+                    {% endif %}
+                    {% endif %}
                     {% if 'username' in session and current_permissions.pages.get('upload_admin', True) and current_permissions.actions.get('can_insert', True) %}
                     <li class="nav-item">
                         <a class="nav-link nav-priority-link {% if current_path == url_for('upload_admin') %}nav-active{% endif %}" href="{{ url_for('upload_admin') }}">➕ Hochladen</a>
@@ -928,15 +940,6 @@
                             Mehr Optionen
                         </a>
                         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="invMoreDropdown">
-                            {% if 'username' in session %}
-                            {% if current_permissions.pages.get('my_borrowed_items', True) %}
-                            <li><a class="dropdown-item" href="{{ url_for('my_borrowed_items') }}">Meine Ausleihen</a></li>
-                            {% endif %}
-                            {% if current_permissions.pages.get('tutorial_page', True) %}
-                            <li><a class="dropdown-item" href="{{ url_for('tutorial_page') }}">Tutorial</a></li>
-                            {% endif %}
-                            <li><hr class="dropdown-divider"></li>
-                            {% endif %}
                             {% if 'username' in session and (session.get('admin', False) or is_admin) and current_permissions.actions.get('can_manage_settings', True) %}
                             <li><h6 class="dropdown-header">Verwaltung</h6></li>
                             {% if current_permissions.pages.get('manage_filters', True) %}
@@ -1027,6 +1030,18 @@
                         <a class="nav-link {% if current_path == url_for('library_view') %}nav-active{% endif %}" href="{{ url_for('library_view') }}">Medien</a>
                     </li>
                     {% endif %}
+                    {% if 'username' in session %}
+                    {% if current_permissions.pages.get('my_borrowed_items', True) %}
+                    <li class="nav-item">
+                        <a class="nav-link quick-link-pill {% if current_path == url_for('my_borrowed_items') %}nav-active{% endif %}" href="{{ url_for('my_borrowed_items') }}">Meine Medien</a>
+                    </li>
+                    {% endif %}
+                    {% if current_permissions.pages.get('tutorial_page', True) %}
+                    <li class="nav-item">
+                        <a class="nav-link quick-link-pill {% if current_path == url_for('tutorial_page') %}nav-active{% endif %}" href="{{ url_for('tutorial_page') }}">Tutorial</a>
+                    </li>
+                    {% endif %}
+                    {% endif %}
                     {% if 'username' in session and current_permissions.actions.get('can_insert', True) and current_permissions.pages.get('library_admin', True) %}
                     <li class="nav-item">
                         <a class="nav-link nav-priority-link {% if current_path == url_for('library_admin') %}nav-active{% endif %}" href="{{ url_for('library_admin') }}">📖 Hochladen</a>
@@ -1044,15 +1059,6 @@
                             Mehr Optionen
                         </a>
                         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="libMoreDropdown">
-                            {% if 'username' in session %}
-                            {% if current_permissions.pages.get('my_borrowed_items', True) %}
-                            <li><a class="dropdown-item" href="{{ url_for('my_borrowed_items') }}">Meine Medien</a></li>
-                            {% endif %}
-                            {% if current_permissions.pages.get('tutorial_page', True) %}
-                            <li><a class="dropdown-item" href="{{ url_for('tutorial_page') }}">Tutorial</a></li>
-                            {% endif %}
-                            <li><hr class="dropdown-divider"></li>
-                            {% endif %}
                             {% if 'username' in session and (session.get('admin', False) or is_admin) and current_permissions.actions.get('can_manage_settings', True) %}
                             <li><h6 class="dropdown-header">Bibliotheks-Verwaltung</h6></li>
                             {% if current_permissions.pages.get('library_loans_admin', True) %}
@@ -1795,15 +1801,18 @@
                     if (overflowEntries.length > 0) {
                         const marker = document.createElement('li');
                         marker.innerHTML = '<h6 class="dropdown-header">Ausgeblendete Navigation</h6>';
-                        moreMenu.insertBefore(marker, moreMenu.firstChild);
+                        const firstExistingNode = moreMenu.firstChild;
+                        moreMenu.insertBefore(marker, firstExistingNode);
 
-                        overflowEntries.reverse().forEach(function(node){
-                            moreMenu.insertBefore(node, marker.nextSibling);
+                        let insertAfter = marker;
+                        overflowEntries.forEach(function(node){
+                            moreMenu.insertBefore(node, insertAfter.nextSibling);
+                            insertAfter = node;
                         });
 
                         const divider = document.createElement('li');
                         divider.innerHTML = '<hr class="dropdown-divider">';
-                        moreMenu.insertBefore(divider, marker.nextSibling);
+                        moreMenu.insertBefore(divider, insertAfter.nextSibling);
 
                         if (moreToggle) {
                             moreToggle.textContent = moreLabelDefault + ' (' + hiddenSources.length + ')';