On améliore le rendu des heures
This commit is contained in:
parent
bd5df0cfe2
commit
a90b5ad701
@ -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 %}
|
||||
<article>
|
||||
|
@ -5,12 +5,19 @@
|
||||
{% load tag_extra %}
|
||||
|
||||
<article>
|
||||
{% if event|can_show_start_time %}
|
||||
{% if event|can_show_start_time:day %}
|
||||
{% if event.start_time %}
|
||||
<article class='ephemeris-hour'>
|
||||
{% if event.start_time %}
|
||||
<span class="large">{{ event.start_time }}</span>
|
||||
{% endif %}
|
||||
</article>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if event|can_show_end_time:day %}
|
||||
{% if event.end_time %}
|
||||
<article class='ephemeris-hour'>
|
||||
jusqu'à <span class="large">{{ event.end_time }}</span>
|
||||
</article>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{{ event.category | small_cat }}
|
||||
|
@ -36,7 +36,7 @@
|
||||
</p>
|
||||
|
||||
{% if event.reference_urls %}
|
||||
<p>Cet événement est proposé par :
|
||||
<p>Cet événement est proposé par
|
||||
{% for eurl in event.reference_urls %}
|
||||
<a href="{{ eurl }}">{{ eurl|hostname }}</a>{% if not forloop.last %}, {% endif %}
|
||||
{% endfor %}
|
||||
|
@ -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):
|
||||
|
Loading…
x
Reference in New Issue
Block a user