From 7090254658174563a43334f31d307e05eb7568fa Mon Sep 17 00:00:00 2001
From: Sli <antoine@bartuccio.fr>
Date: Mon, 2 Jun 2025 23:27:25 +0200
Subject: [PATCH] Refactor navbar css and use details instead of div for better
 semantics

---
 core/static/core/navbar.scss          | 101 +++++++++++++-------------
 core/templates/core/base.jinja        |  14 +++-
 core/templates/core/base/navbar.jinja |  32 ++++----
 3 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss
index 9c9bf4df..bdf67d04 100644
--- a/core/static/core/navbar.scss
+++ b/core/static/core/navbar.scss
@@ -13,9 +13,18 @@ nav.navbar {
     align-items: flex-start;
     gap: 0;
     margin: .2em;
+
+    >.content[mobile-display="hidden"] {
+      display: none;
+    }
+
+    >.content[mobile-display="revealed"] {
+      display: block;
+    }
   }
 
-  > .expand-button {
+
+  >.expand-button {
     background-color: transparent;
     display: none;
     position: relative;
@@ -27,7 +36,7 @@ nav.navbar {
     align-items: center;
     margin: 0;
 
-    > i {
+    >i {
       font-size: 1.5em;
       color: white;
     }
@@ -37,17 +46,17 @@ nav.navbar {
     }
   }
 
-  > .content {
-    @media (min-width: 500px) {display: flex;
+  >.content {
+    @media (min-width: 500px) {
       flex-direction: row;
       flex-wrap: wrap;
       align-items: center;
       justify-content: center;
-      display: flex !important;
+      display: flex;
     }
 
-    > .menu,
-    > .link {
+    >.menu,
+    >.link {
       box-sizing: border-box;
       width: 130px;
       height: 52px;
@@ -64,76 +73,64 @@ nav.navbar {
         &:last-child {
           border-radius: 0 0 .6em .6em;
 
-          > .content {
+          >.content {
             box-shadow: 3px 3px 3px 0 #dfdfdf;
           }
         }
       }
     }
 
-    > .menu > .head,
-    > .link {
+    >.menu>.head,
+    >.link {
       color: white;
-      padding: 10px 20px;
-      box-sizing: border-box;
+    }
 
+    >.menu>summary,
+    >.link {
       @media (max-width: 500px) {
         padding: 10px;
       }
     }
 
+    >.link {
+      padding: 10px 20px;
+      box-sizing: border-box;
+    }
+
+
     .link:hover,
     .menu:hover {
       background-color: rgba(0, 0, 0, .2);
     }
 
-    > .menu > .head,
-    > .link {
-      color: white;
-      padding: 10px 20px;
-      box-sizing: border-box;
+    details.menu {
+      cursor: pointer;
+      user-select: none;
+      z-index: 10;
+      align-items: center;
+      display: inline-block;
 
-      @media (max-width: 500px) {
-        padding: 10px;
+      summary {
+        list-style: none;
+
+        display: flex;
+        align-items: center;
+        height: 100%;
+        padding-left: 20px;
+        padding-right: 20px;
       }
-    }
 
-    .link:hover,
-    .menu:hover {
-      background-color: rgba(0, 0, 0, .2);
-    }
-
-    > .menu:hover > .content,
-    > .menu > .head:hover + .content,
-    > .menu > .content:hover {
-      display: flex;
-    }
-
-    > .menu {
-      display: flex;
-      position: relative;
-
-      > .content {
-        z-index: 10;
+      summary::-webkit-details-marker {
         display: none;
-        position: absolute;
-        top: 100%;
-        background-color: white;
-        margin: 0;
+      }
+
+      ul.content {
         list-style-type: none;
-        width: 130px;
         box-shadow: 3px 3px 3px 0 #dfdfdf;
-        flex-direction: column;
+        background: white;
+        margin: 0;
 
-        @media (max-width: 500px) {
-          position: absolute;
-          flex-direction: row;
-          flex-wrap: wrap;
-          width: 100%;
-          box-shadow: inset 3px 3px 3px 0 #dfdfdf;
-        }
-
-        > li > a {
+        >li>a {
           display: flex;
           padding: 15px 20px;
 
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 6479e833..8000b1fa 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -122,10 +122,20 @@
 
     {% block script %}
       <script>
+        const menuItems = document.querySelectorAll(".navbar details[name='navbar'].menu");
+        for (const item of menuItems){
+          item.addEventListener("mouseover", () => {
+            item.setAttribute("open", "");
+          })
+          item.addEventListener("mouseout", () => {
+            item.removeAttribute("open");
+          })
+        }
+
         function showMenu() {
           let navbar = document.getElementById("navbar-content");
-          const current = navbar.style.getPropertyValue("display");
-          navbar.style.setProperty("display", current === "none" ? "block" : "none");
+          const current = navbar.getAttribute("mobile-display");
+          navbar.setAttribute("mobile-display", current === "hidden" ? "revealed" : "hidden")
         }
 
         document.addEventListener("keydown", (e) => {
diff --git a/core/templates/core/base/navbar.jinja b/core/templates/core/base/navbar.jinja
index 09fac241..8d8ae447 100644
--- a/core/templates/core/base/navbar.jinja
+++ b/core/templates/core/base/navbar.jinja
@@ -1,47 +1,47 @@
 <nav class="navbar">
   <button class="expand-button" onclick="showMenu()"><i class="fa fa-bars"></i></button>
-  <div id="navbar-content" class="content" style="display: none;">
+  <div id="navbar-content" class="content" mobile-display="hidden">
     <a class="link" href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
-    <div class="menu">
-      <span class="head">{% trans %}Associations & Clubs{% endtrans %}</span>
+    <details name="navbar" class="menu">
+      <summary class="head">{% trans %}Associations & Clubs{% endtrans %}</summary>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
       </ul>
-    </div>
-    <div class="menu">
-      <span class="head">{% trans %}Events{% endtrans %}</span>
+    </details>
+    <details name="navbar" class="menu">
+      <summary class="head">{% trans %}Events{% endtrans %}</summary>
       <ul class="content">
         <li><a href="{{ url('election:list') }}">{% trans %}Elections{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a></li>
       </ul>
-    </div>
+    </details>
     <a class="link" href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     <a class="link" href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
     <a class="link" href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
-    <div class="menu">
-      <span class="head">{% trans %}Services{% endtrans %}</span>
+    <details name="navbar" class="menu">
+      <summary class="head">{% trans %}Services{% endtrans %}</summary>
       <ul class="content">
         <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
         <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
       </ul>
-    </div>
-    <div class="menu">
-      <span class="head">{% trans %}My Benefits{% endtrans %}</span>
+    </details>
+    <details name="navbar" class="menu">
+      <summary class="head">{% trans %}My Benefits{% endtrans %}</summary>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='partenaires')}}">{% trans %}Sponsors{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='avantages') }}">{% trans %}Subscriber benefits{% endtrans %}</a></li>
       </ul>
-    </div>
-    <div class="menu">
-      <span class="head">{% trans %}Help{% endtrans %}</span>
+    </details>
+    <details name="navbar" class="menu">
+      <summary class="head">{% trans %}Help{% endtrans %}</summary>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='FAQ') }}">{% trans %}FAQ{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='Index') }}">{% trans %}Wiki{% endtrans %}</a></li>
       </ul>
-    </div>
+    </details>
   </div>
 </nav>