From f3d4f1fef21b6b59795bdda2d706e77a52e6215b Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sun, 7 Jan 2024 14:00:01 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20mise=20en=20forme?=
 =?UTF-8?q?=20des=20=C3=A9v=C3=A9nements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss         |  6 ++++++
 .../templates/agenda_culturel/moderation.html |  6 +++---
 .../templates/agenda_culturel/search.html     |  8 ++++----
 .../single-event/event-in-flat-list-inc.html  | 20 +++++++++++--------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 44d15df..9b6464c 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -717,4 +717,10 @@ aside nav a.badge {
 
 .container-fluid article form .hidden {
     display: none;
+}
+
+article article {
+    margin-top: 3em;
+    margin-bottom: 3em;
+    padding: 0.6em 0.2em;
 }
\ No newline at end of file
diff --git a/src/agenda_culturel/templates/agenda_culturel/moderation.html b/src/agenda_culturel/templates/agenda_culturel/moderation.html
index 3ff00b4..16e4310 100644
--- a/src/agenda_culturel/templates/agenda_culturel/moderation.html
+++ b/src/agenda_culturel/templates/agenda_culturel/moderation.html
@@ -19,11 +19,11 @@
         </form>
     </header>
 
-    <ul>
+    <div>
 {% for obj in paginator_filter %}
-    <li>{% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=obj %}</li>
+    <article>{% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=obj %}</article>
 {% endfor %}
-</ul>
+    </div>
 <footer>
     <span>
         {% if paginator_filter.has_previous %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/search.html b/src/agenda_culturel/templates/agenda_culturel/search.html
index 790f706..47af397 100644
--- a/src/agenda_culturel/templates/agenda_culturel/search.html
+++ b/src/agenda_culturel/templates/agenda_culturel/search.html
@@ -30,13 +30,13 @@
     {% if has_results %}
     <div id="results">
         <p>{{ paginator_filter.paginator.count }} événement{{paginator_filter.object_list.count | pluralize }} correspond{{paginator_filter.object_list.count | pluralize:"ent" }} à la recherche.</p>
-        <ul>
+        <div>
         {% for obj in paginator_filter %}
-            <li>
+            <article>
                 {% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=obj %}
-            </li>
+            </article>
         {% endfor %}
-        </ul>
+        </div>
         {% if paginator_filter.paginator.num_pages != 1 %}
             <footer>
                 <span>
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
index f3e2d7f..1dbe12b 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
@@ -2,14 +2,17 @@
 {% load cat_extra %}
 {% load event_extra %}
 
-<p>{{ event.category | small_cat }} 
+<header>{{ event.category | small_cat }} 
     {{ event|picto_status }}
      <a href="{{ event.get_absolute_url }}">
         {% if event.title_hl %}{{ event.title_hl | safe }}{% else %}{{ event.title }}{% endif %}</a></p>
     <p class="subentry-search">{% picto_from_name "calendar" %}
         {% if event.end_day %}du{% else %}le{% endif %}
         {% include "agenda_culturel/date-times-inc.html" with event=event %}
+    </header>
+    <p class="subentry-search"></p>
         {% picto_from_name "map-pin" %}
+    {% if event.location_hl %}{{ event.location_hl | safe }}{% else %}{{ event.location }}{% endif %}</p>
     {% if event.has_recurrences %}
         <p class="subentry-search">
         {% picto_from_name "repeat" %}
@@ -19,7 +22,6 @@
         {% endfor %}
         </p>
     {% endif %}
-    {% if event.location_hl %}{{ event.location_hl | safe }}{% else %}{{ event.location }}{% endif %}</p>
     <p class="subentry-search">
         {% picto_from_name "tag" %}
         {% for tag in event.tags %}
@@ -28,11 +30,13 @@
         {% endfor %}
     </p>
     <div class="description">
-        {% if event.description_hl %}{{ event.description_hl | safe }}{% else %}{% if event.description %}{{ event.description |truncatewords:60 }}{% else %}<em>pas de description</em>{% endif %}{% endif %}
+        {% if event.description_hl %}{{ event.description_hl | safe }} [...]{% else %}{% if event.description %}{{ event.description |truncatewords:60 }}{% else %}<em>pas de description</em>{% endif %}{% endif %}
 
-        {% if user.is_authenticated %}
-        <div class="buttons">
-            {% include "agenda_culturel/edit-buttons-inc.html" with event=event %}
-        </div>
-        {% endif %}
     </div>
+    {% if user.is_authenticated %}
+    <footer>
+    <div class="buttons">
+        {% include "agenda_culturel/edit-buttons-inc.html" with event=event %}
+    </div>
+    </footer>
+    {% endif %}