diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html index 407667d..bc9794e 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-day.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html @@ -52,7 +52,7 @@ {% if events %} {% for event in events %} - {% include "agenda_culturel/single-event/event-in-list-by-day-inc.html" with event=event filter=filter %} + {% include "agenda_culturel/single-event/event-in-list-by-day-inc.html" with event=event filter=filter day=day %} {% endfor %} {% else %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html index a0c6492..f348e19 100644 --- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html @@ -5,12 +5,19 @@ {% load tag_extra %}
- {% if event|can_show_start_time %} + {% if event|can_show_start_time:day %} + {% if event.start_time %}
- {% if event.start_time %} {{ event.start_time }} - {% endif %}
+ {% endif %} + {% endif %} + {% if event|can_show_end_time:day %} + {% if event.end_time %} +
+ jusqu'à {{ event.end_time }} +
+ {% endif %} {% endif %} {{ event.category | small_cat }} diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html index b2d7db5..11b7fd2 100644 --- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html @@ -36,7 +36,7 @@

{% if event.reference_urls %} -

Cet événement est proposé par : +

Cet événement est proposé par {% for eurl in event.reference_urls %} {{ eurl|hostname }}{% if not forloop.last %}, {% endif %} {% endfor %} diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py index 84df545..9e119d6 100644 --- a/src/agenda_culturel/templatetags/event_extra.py +++ b/src/agenda_culturel/templatetags/event_extra.py @@ -16,9 +16,17 @@ def in_date(event, date): return event.filter((Q(start_day__lte=date) & Q(end_day__gte=date)) | (Q(end_day=None) & Q(start_day=date))) @register.filter -def can_show_start_time(event): +def can_show_start_time(event, day=None): + if not day is None and day == event.start_day: + return True return event.start_time and (not event.end_day or event.end_day == event.start_day) +@register.filter +def can_show_end_time(event, day=None): + if not day is None and day == event.end_day and event.start_day != event.end_day: + return True + return False + @register.filter def need_complete_display(event, display_full=True):