From e130e54e026243cd96d4792fd0a79f02a0b6e9bf Mon Sep 17 00:00:00 2001
From: Jan Rosier <jan.rosier@gmail.com>
Date: Sun, 31 Aug 2025 19:07:52 +0200
Subject: [PATCH] [Bootstrap v5] Fix the active links in the navigation

---
 templates/admin/layout.html.twig |  4 ++--
 templates/base.html.twig         | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/templates/admin/layout.html.twig b/templates/admin/layout.html.twig
index dbc305e26..e17d5a09c 100644
--- a/templates/admin/layout.html.twig
+++ b/templates/admin/layout.html.twig
@@ -13,8 +13,8 @@
 {% endblock %}
 
 {% block header_navigation_links %}
-    <li class="nav-item{{ _route in ['admin_index', 'admin_post_index'] ? ' active' : '' }}">
-        <a class="nav-link" href="{{ path('admin_post_index') }}">
+    <li class="nav-item">
+        <a class="nav-link {{- _route in ['admin_index', 'admin_post_index'] ? ' active' -}}" href="{{ path('admin_post_index') }}">
             <twig:ux:icon name="tabler:list"/> {{ 'menu.post_list'|trans }}
         </a>
     </li>
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 8e5b7d62e..8902428fd 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -40,8 +40,8 @@
                         <div class="navbar-collapse collapse" id="appNavbar">
                             <ul class="navbar-nav ml-auto">
                                 {% block header_navigation_links %}
-                                    <li class="nav-item{{ _route == 'blog_index' ? ' active' : '' }}">
-                                        <a class="nav-link" href="{{ path('blog_index') }}">
+                                    <li class="nav-item">
+                                        <a class="nav-link {{- _route == 'blog_index' ? ' active' -}}" href="{{ path('blog_index') }}">
                                             <twig:ux:icon name="tabler:home"/> {{ 'menu.homepage'|trans }}
                                         </a>
                                     </li>
@@ -54,8 +54,10 @@
                                     {% endif %}
                                 {% endblock %}
 
-                                <li class="nav-item{{ _route == 'blog_search' ? ' active' : '' }}">
-                                    <a class="nav-link" href="{{ path('blog_search') }}"> <twig:ux:icon name="tabler:search"/> {{ 'menu.search'|trans }}</a>
+                                <li class="nav-item">
+                                    <a class="nav-link {{- _route == 'blog_search' ? ' active' -}}" href="{{ path('blog_search') }}">
+                                        <twig:ux:icon name="tabler:search"/> {{ 'menu.search'|trans }}
+                                    </a>
                                 </li>
 
                                 {% if app.user %}