From c2a76ac8e18007eddc170422537ff51e7e326258 Mon Sep 17 00:00:00 2001
From: Phuoc Cao <phuoc@caotek.fr>
Date: Thu, 26 Dec 2024 16:32:26 +0100
Subject: [PATCH] debug dropdown menu

---
 cao_sunyata/templates/layout.jinja2 | 70 ++++++++++++-----------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/cao_sunyata/templates/layout.jinja2 b/cao_sunyata/templates/layout.jinja2
index 88f0323..bfdea60 100644
--- a/cao_sunyata/templates/layout.jinja2
+++ b/cao_sunyata/templates/layout.jinja2
@@ -161,49 +161,37 @@
           </ul>
           <div class="navbar-collapse justify-content-end px-0" id="navbarNav">
             <ul class="navbar-nav flex-row ms-auto align-items-center justify-content-end">
-              <a class="nav-link" href="{{ request.route_url('blog_search') }}" title="Recherche">
-                <i class="ti ti-search fs-7"></i>
-              </a>
+              <li>
+                <a class="nav-link" href="{{ request.route_url('blog_search') }}" title="Recherche">
+                  <i class="ti ti-search fs-7"></i></a>
+              </li>
+              {% if request.authenticated_userid %}
                 <li class="nav-item dropdown">
-                <a class="nav-link" href="{{ request.route_url('login') }}" id="drop2" data-bs-toggle="dropdown" aria-expanded="false">
-                  {% if request.authenticated_userid %}
-                    [{{ request.authenticated_userid }}]
-                  {% else %}
-                    <i class="ti ti-user fs-7"></i>
-                  {% endif %}
-                </a>
-                  <div class="dropdown-menu dropdown-menu-end dropdown-menu-animate-up" aria-labelledby="drop2">
-                    <div class="message-body">
-                      {% if request.authenticated_userid %}
-                        {% if request.authenticated_userid == 'admin' %}
-                          <a href="{{request.route_url('users')}}" class="d-flex align-items-center gap-2 dropdown-item">
-                            <i class="ti ti-users fs-6"></i>
-                            <p class="mb-0 fs-3">Utilisateurs</p>
-                          </a>
-                        {% else %}
-                          <a href="{{request.route_url('user_edit', name=request.authenticated_userid)}}" class="d-flex align-items-center gap-2 dropdown-item">
-                            <i class="ti ti-key fs-6"></i>
-                            <p class="mb-0 fs-3">Modifier le mot de passe</p>
-                          </a>
-                        {% endif %}
-                        <a href="{{request.route_url('settings')}}" class="d-flex align-items-center gap-2 dropdown-item">
-                          <i class="ti ti-settings fs-6"></i>
-                          <p class="mb-0 fs-3">Paramètres</p>
-                        </a>
-                        <a href="{{request.route_url('logout')}}" class="d-flex align-items-center gap-2 dropdown-item">
-                          <i class="ti ti-logout fs-6"></i>
-                          <p class="mb-0 fs-3">Se déconnecter</p>
-                        </a>
-                      {% else %}
-                        <a href="{{request.route_url('login')}}" class="d-flex align-items-center gap-2 dropdown-item">
-                          <i class="ti ti-login fs-6"></i>
-                          <p class="mb-0 fs-3">Connexion</p>
-                        </a>
-                      {% endif %}
-                    </div>
-                  </div>
+                  <a class="btn btn-light dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    {{ request.authenticated_userid }}
+                  </a>
+
+                  <ul class="dropdown-menu dropdown-menu-end">
+                    {% if request.authenticated_userid == 'admin' %}
+                      <li><a class="dropdown-item" href="{{request.route_url('users')}}">
+                          <i class="ti ti-users fs-6"></i> Utilisateurs</a></li>
+                    {% else %}
+                      <li><a class="dropdown-item" href="{{request.route_url('user_edit', name=request.authenticated_userid)}}">
+                          <i class="ti ti-key fs-6"></i> Modifier le mot de passe</a></li>
+                    {% endif %}
+                    <li><a class="dropdown-item" href="{{request.route_url('settings')}}">
+                        <i class="ti ti-settings fs-6"></i> Paramètres</a></li>
+                    <li><a class="dropdown-item" href="{{request.route_url('logout')}}">
+                        <i class="ti ti-logout fs-6"></i> Se déconnecter</a></li>
+                  </ul>
+                </li>              
+              {% else %}
+                <li>
+                  <a class="nav-link" href="{{request.route_url('login')}}">
+                    <i class="ti ti-login fs-7"></i></a>
                 </li>
-            </ul>   
+              {% endif %}
+            </ul>  
           </div>
         </nav>
       </header>