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 @@ {% 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 %} 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 %}
@@ -83,9 +84,7 @@ {% include "agenda_culturel/navigation.html" with page_obj=page_obj %} {% for event in object_list %} -
- {% include "agenda_culturel/single-event/event-in-flat-list-inc.html" with event=event no_location=1 %} -
+ {% 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 %}
{% endif %} -

- {{ event|picto_status }} - {{ event.title }} -

- {% if event.location or event.exact_location %} -
- {% picto_from_name "map-pin" %} - {% include "agenda_culturel/event-location-inc.html" with event=event %} -
-
- {% endif %} + {% if not no_location %} + {% if event.location or event.exact_location %}
{% endif %} +

+ {{ event|picto_status }} + {{ event.title }} +

+ {% if event.location or event.exact_location %} +
+ {% picto_from_name "map-pin" %} + {% include "agenda_culturel/event-location-inc.html" with event=event %} +
+
+ {% endif %} + {% endif %} + {% if event|need_complete_display:True %}

{% picto_from_name "calendar" %} @@ -67,7 +70,7 @@

-
+

{{ event.description |linebreaks2 | truncatewords:60 }}