From db20f4a4de6ee8dff84eb64e58fcbc0b2ef51766 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Tue, 29 Oct 2024 23:27:19 +0100
Subject: [PATCH] =?UTF-8?q?On=20am=C3=A9liore=20le=20rendu=20des=20=C3=A9v?=
 =?UTF-8?q?=C3=A9nements=20d'un=20lieu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #178
---
 src/agenda_culturel/static/style.scss         |  5 +++-
 .../agenda_culturel/page-upcoming.html        |  2 +-
 .../agenda_culturel/place_detail.html         |  5 ++--
 ...coming-inc.html => event-elegant-inc.html} | 29 ++++++++++---------
 4 files changed, 23 insertions(+), 18 deletions(-)
 rename src/agenda_culturel/templates/agenda_culturel/single-event/{event-in-upcoming-inc.html => event-elegant-inc.html} (83%)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 2bdd1f0..90817d1 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -393,6 +393,9 @@ article.day>ul {
 .description {
     padding: 0;
     position: relative;
+    .texte {
+        padding-bottom: 3.5em;
+    }
 }
 .right.bottom {
     position: absolute;
@@ -1232,7 +1235,7 @@ article {
 
 }
 
-.a-venir {
+.a-venir, .place {
     article#filters {
         margin: 2em 0;
     }
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
index 74c25f3..e3c60a0 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
@@ -121,7 +121,7 @@
             </header>
             {% with indexti=cd.id %}
                 {% for event in ti.events %}
-                {% include "agenda_culturel/single-event/event-in-upcoming-inc.html" with event=event filter=filter day=day indexti=indexti %}
+                {% include "agenda_culturel/single-event/event-elegant-inc.html" with event=event filter=filter day=day indexti=indexti %}
                 {% endfor %}
             {% endwith %}
         </article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/place_detail.html b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
index e4040a8..e53095f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/place_detail.html
+++ b/src/agenda_culturel/templates/agenda_culturel/place_detail.html
@@ -20,6 +20,7 @@
 
 {% block fluid %}{% endblock %}
 
+{% block body-class %}place{% endblock %}
 {% block content %}
 
 <article>
@@ -83,9 +84,7 @@
         {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
 
         {% for event in object_list %}
-            <article>
-            {% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=event no_location=1 %}
-            </article>
+            {% include "agenda_culturel/single-event/event-elegant-inc.html" with event=event no_location=1 %}
         {% endfor %}
 
         {% include "agenda_culturel/navigation.html" with page_obj=page_obj %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-upcoming-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
similarity index 83%
rename from src/agenda_culturel/templates/agenda_culturel/single-event/event-in-upcoming-inc.html
rename to src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
index a099f8b..826bdfd 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-upcoming-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
@@ -22,19 +22,22 @@
     {% endif %}
 
     {{ event.category | small_cat_recurrent:event.has_recurrences }}
-    {% if event.location or event.exact_location %}<hgroup>{% endif %}
-            <h4>
-            {{ event|picto_status }}    
-            <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
-        </h4>
-    {% if event.location or event.exact_location %}
-    <h5>
-        {% picto_from_name "map-pin" %}
-        {% include "agenda_culturel/event-location-inc.html" with event=event %}
-        </h5>
-    </hgroup>
-    {% endif %}
     
+    {% if not no_location %}
+        {% if event.location or event.exact_location %}<hgroup>{% endif %}
+                <h4>
+                {{ event|picto_status }}    
+                <a href="{{ event.get_absolute_url }}">{{ event.title }}</a>
+            </h4>
+        {% if event.location or event.exact_location %}
+        <h5>
+            {% picto_from_name "map-pin" %}
+            {% include "agenda_culturel/event-location-inc.html" with event=event %}
+            </h5>
+        </hgroup>
+        {% endif %}
+    {% endif %}
+        
     {% if event|need_complete_display:True %}<p>
             {% picto_from_name "calendar" %}
     
@@ -67,7 +70,7 @@
     </header>
 
     <div class="description">
-        <div>
+        <div class="texte">
             <p>{{ event.description |linebreaks2 | truncatewords:60 }}</p>
         </div>
         <div class="right bottom">