From 2b8f102f2f8b7b95c8d977b9821746488b50262a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 5 Apr 2016 22:26:34 +0200 Subject: [PATCH] fix calendar --- .../includes/event_metainfo_slider.html | 10 +- app/templates/includes/calendar.html | 121 +++--------------- 2 files changed, 21 insertions(+), 110 deletions(-) diff --git a/app/templates/agenda/includes/event_metainfo_slider.html b/app/templates/agenda/includes/event_metainfo_slider.html index a9061c66..ce9ec5fb 100644 --- a/app/templates/agenda/includes/event_metainfo_slider.html +++ b/app/templates/agenda/includes/event_metainfo_slider.html @@ -1,4 +1,4 @@ -{% load i18n mezzanine_tags event_tags %} +{% load i18n mezzanine_tags event_tags festival_tags %} {% editable event.start event.end event.location %}
@@ -6,20 +6,18 @@
{{ event.start }} {% if event.end %} -
- {% if event.end|date == event.start|date %}{{ event.end|time:"TIME_FORMAT" }}{% else %}{{ event.end }}{% endif %} + {% if event.end|date == event.start|date and event.end.hour|subtract:event.start.hour > 3 %}{{ event.end|time:"TIME_FORMAT" }}{% endif %} {% endif %} {% if event.location %} {{ event.location }} {% endif %}
-
- Réserver + {% trans "Booking" %}
-{% endeditable %} \ No newline at end of file +{% endeditable %} diff --git a/app/templates/includes/calendar.html b/app/templates/includes/calendar.html index 89deac34..23491b1f 100644 --- a/app/templates/includes/calendar.html +++ b/app/templates/includes/calendar.html @@ -1,15 +1,9 @@ {% load i18n event_tags %} -{% event_months as events %} - - +{% all_events as events %}

{% trans "Festival calendar" %}