From 3fa8ac2b14a7b1f98bba8ba719f0741924ea5a19 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 21 Aug 2024 11:38:18 +0200
Subject: [PATCH] petits ajustements de mise en page

---
 src/agenda_culturel/static/style.scss         | 35 ++++++++++++++++++-
 .../templates/agenda_culturel/filter-inc.html |  4 +--
 .../templates/agenda_culturel/page-week.html  |  4 ---
 .../templates/agenda_culturel/page.html       |  2 +-
 src/agenda_culturel/templatetags/cat_extra.py |  8 ++---
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index eec2433..db6fb57 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -100,6 +100,10 @@ nav a:hover>.action {
     color: var(--primary-inverse);
 }
 
+details {
+    border-bottom: 0;
+}
+
 details[role="list"] summary + ul li.selected>a{
     background: $primary-600;
     color: var(--secondary-inverse);
@@ -325,11 +329,22 @@ header .title {
     }
 }
 
+body > main {
+    padding-top: 0;
+}
+
+article {
+    margin: 1em 0;
+}
+
 article form label {
     display: inline-block;
 }
 
 article#filters {
+    margin-bottom: 0;
+    padding-bottom: 0.2em;
+    
     .buttons-filter {
         float: right;
         text-align: right;
@@ -498,6 +513,13 @@ nav>div {
         width: auto;
         padding-right: 4em;
         max-width: 80%;
+
+        li {
+            padding: 0.7em;
+            img {
+                height: 2em;
+            }
+        }
     }
 
     ul, div {
@@ -548,6 +570,12 @@ nav>div {
         transition: max-height .2s ease-out;
         display: block;
         float: right;
+        margin: 0;
+        padding-right: 0.5em;
+
+        li {
+            margin: 0;
+        }
       }
       
       /* menu icon */
@@ -556,9 +584,10 @@ nav>div {
         cursor: pointer;
         display: block;
         float: right;
-        padding: 28px 20px;
+        padding: 10px 20px;
         position: relative;
         user-select: none;
+        font-size: 24px;
       }
       
       .header .menu-icon .navicon {
@@ -952,3 +981,7 @@ table .buttons {
     }
 }
 
+.soustitre {
+    margin-top: -1.5em;
+    margin-left: 0.5em;
+}
\ No newline at end of file
diff --git a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
index dac6805..2f8adb7 100644
--- a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
@@ -26,12 +26,10 @@
         Filtrer
     {% endif %}
 </summary>
-<section>
 <form method="get" class="form django-form main-filter">
                 {{ filter.form.as_p }}<br />
-                <button type="submit">Appliquer le filtre</button><br />
+                <button type="submit">Appliquer le filtre</button>
 </form>
-</section>
 </details>
 {% if filter.is_active %}
 <a href="{{ filter.get_url_without_filters }}" role="button">Supprimer le filtre</a>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 888a7b8..b8b4c32 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -22,10 +22,6 @@ Semaine du {{ calendar.calendar_days_list.0.date|date|frdate  }}
 
  {% block content %}
 
- {% if home %}
- <article>{% include "agenda_culturel/static_content.html" with name="home" url_path="/" %}</article>
- {% endif %}
-
 
 {% include "agenda_culturel/filter-inc.html" with filter=filter %}
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/page.html b/src/agenda_culturel/templates/agenda_culturel/page.html
index 8a5a858..d9864ef 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page.html
@@ -40,7 +40,7 @@
             </ul>
         </div>
         <nav class="container-fluid">
-            <ul>
+            <ul class="menu-droite">
                 <li>
                     <a href="{% url 'home' %}" aria-label="Retour accueil">
                         <img src="{% static 'images/favicon.svg' %}" />
diff --git a/src/agenda_culturel/templatetags/cat_extra.py b/src/agenda_culturel/templatetags/cat_extra.py
index 484afea..766ed1e 100644
--- a/src/agenda_culturel/templatetags/cat_extra.py
+++ b/src/agenda_culturel/templatetags/cat_extra.py
@@ -216,7 +216,7 @@ def show_legend(filter):
     current_url = filter.get_url_without_filters()
     cats = Category.objects.all()
     if filter.is_active(only_categories=True):
-        return mark_safe(
+        return mark_safe("<div>" +
             " ".join(
                 [
                     small_cat(
@@ -228,11 +228,11 @@ def show_legend(filter):
                     )
                     for c in cats
                 ]
-            )
+            ) + "</div>"
         )
     else:
-        return mark_safe(
+        return mark_safe("<div>" +
             " ".join(
                 [small_cat(c, current_url + "?category=" + str(c.pk)) for c in cats]
-            )
+            ) + "</div>"
         )