From ce83d64b1a02d11852409b3b2b8c2225793681b8 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sat, 11 Nov 2023 14:02:37 +0100
Subject: [PATCH] =?UTF-8?q?On=20am=C3=A9liore=20le=20rendu=20des=20recherc?=
 =?UTF-8?q?hes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss         |  2 +-
 .../templates/agenda_culturel/search.html     | 15 +++++++------
 .../single-event/event-in-flat-list-inc.html  | 21 +++++++++++++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 1bc2858..a9e637d 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -298,7 +298,7 @@ article#filters {
     }
 }
 
-.helptext, .location-search {
+.helptext, .subentry-search {
     font-size: 80%;
     margin-top: -0.7em;
 }
diff --git a/src/agenda_culturel/templates/agenda_culturel/search.html b/src/agenda_culturel/templates/agenda_culturel/search.html
index 4038bc8..790f706 100644
--- a/src/agenda_culturel/templates/agenda_culturel/search.html
+++ b/src/agenda_culturel/templates/agenda_culturel/search.html
@@ -4,6 +4,11 @@
 
 {% load utils_extra %}
 
+{% load cat_extra %}
+{% block entete_header %}
+    {% css_categories %}
+{% endblock %}
+
 {% block content %}
 
 <article class="search">
@@ -27,14 +32,8 @@
         <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>
         {% for obj in paginator_filter %}
-            <li><p>{% include "agenda_culturel/date-times-inc.html" with event=obj %}
-                &nbsp;: <a href="{{ obj.get_absolute_url }}">
-                    {% if obj.title_hl %}{{ obj.title_hl | safe }}{% else %}{{ obj.title }}{% endif %}</a></p>
-                <p class="location-search">{% picto_from_name "map-pin" %}
-                {% if obj.location_hl %}{{ obj.location_hl | safe }}{% else %}{{ obj.location }}{% endif %}</p>
-                <div class="description">
-                    {% if obj.description_hl %}{{ obj.description_hl | safe }}{% else %}{{ obj.description }}{% endif %}
-                </div>
+            <li>
+                {% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=obj %}
             </li>
         {% endfor %}
         </ul>
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
new file mode 100644
index 0000000..e9bb736
--- /dev/null
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
@@ -0,0 +1,21 @@
+{% load utils_extra %}
+{% load cat_extra %}
+
+<p>{{ event.category | small_cat }} 
+     <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 %}
+        {% picto_from_name "map-pin" %}
+    {% 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 %}
+        <a href="{% url 'view_tag' tag %}">{{ tag }}</a>
+        {% if not forloop.last %}, {% endif %}
+        {% endfor %}
+    </p>
+    <div class="description">
+        {% if event.description_hl %}{{ event.description_hl | safe }}{% else %}{{ event.description }}{% endif %}
+    </div>