Fix matching issue with sticky menu tags

MTES-MCT · Jul 11, 2023 · 55e767f · 55e767f
1 parent d34e149
commit 55e767f
Showing 1 changed file with 34 additions and 35 deletions.
diff --git a/envergo/templates/_slim_header.html b/envergo/templates/_slim_header.html
@@ -2,13 +2,11 @@
 
 <div class="fr-header__body">
   <div class="fr-container">
-    {% spaceless %}
-      <div class="fr-header__body-row">
-        <div class="fr-header__brand fr-enlarge-link">
-          <div class="fr-header__brand-top">
-            <div class="fr-header__logo">
-              <img src="{% static 'images/marianne.svg' %}" alt="République française">
-            </div>
+    <div class="fr-header__body-row">
+      <div class="fr-header__brand fr-enlarge-link">
+        <div class="fr-header__brand-top">
+          <div class="fr-header__logo">
+            <img src="{% static 'images/marianne.svg' %}" alt="République française">
           </div>
           <div class="fr-header__navbar">
             <button class="fr-btn--menu fr-btn"
@@ -19,49 +17,50 @@
               Menu
             </button>
           </div>
-          <div class="fr-header__service">
-            <a href="/">
-              <p class="fr-header__service-title">EnvErgo</p>
-            </a>
-          </div>
         </div>
+        <div class="fr-header__service">
+          <a href="/">
+            <p class="fr-header__service-title">EnvErgo</p>
+          </a>
+        </div>
+      </div>
 
-        <div id="slim-menu" class="fr-header__tools">
-          <div class="fr-header__tools-links">
-            <ul class="fr-links-group">
-              <li>
-                <a class="fr-link" href="{% url 'moulinette_home' %}">Simulateur</a>
-              </li>
+      <div id="slim-menu" class="fr-header__tools">
+        <div class="fr-header__tools-links">
+          <ul class="fr-links-group">
+            <li>
+              <a class="fr-link" href="{% url 'moulinette_home' %}">Simulateur</a>
+            </li>
+            <li>
+              <a class="fr-link" href="{% url 'request_evaluation' %}">Évaluation manuelle</a>
+            </li>
+            <li>
+              <a class="fr-link" href="{% url 'faq' %}">Questions fréquentes</a>
+            </li>
+
+            {% if user.is_authenticated %}
               <li>
-                <a class="fr-link" href="{% url 'request_evaluation' %}">Évaluation manuelle</a>
+                <a class="fr-link fr-fi-lock-line" href="{% url 'logout' %}">Se déconnecter</a>
               </li>
+            {% else %}
               <li>
-                <a class="fr-link" href="{% url 'faq' %}">Questions fréquentes</a>
+                <a class="fr-link fr-fi-lock-line" href="{% url 'login' %}">Se connecter</a>
               </li>
-
-              {% if user.is_authenticated %}
-                <li>
-                  <a class="fr-link fr-fi-lock-line" href="{% url 'logout' %}">Se déconnecter</a>
-                </li>
-              {% else %}
-                <li>
-                  <a class="fr-link fr-fi-lock-line" href="{% url 'login' %}">Se connecter</a>
-                </li>
-              {% endif %}
-            </ul>
-          </div>
+            {% endif %}
+          </ul>
         </div>
-
       </div>
-    {% endspaceless %}
+    </div>
   </div>
 </div>
 
 <div class="fr-header__menu fr-modal" id="modal-menu-slim">
   <div class="fr-container">
     <button class="fr-btn--close fr-btn"
             aria-controls="modal-menu-slim"
-            title="Fermer">
+            title="Fermer"
+            aria-haspopup="slim-menu"
+            title="Menu">
       Fermer
     </button>
     <div class="fr-header__menu-links"></div>