Merge commit '0d719b328fd95504bdc6dabea96d65e5a485677b' into web-calendar

This commit is contained in:
David Taylor
2015-04-20 15:20:29 +01:00
3 changed files with 4 additions and 4 deletions

View File

@@ -69,13 +69,13 @@
{{ event.start_date|date:"(Y-m-d)" }}<br/>
</dd>
{% endif %}
{% if event.end_time and event.start_time != event.end_time %}
{% if event.end_time%}{% if event.start_date != event.end_date or event.start_time != event.end_time %}
<dt>Event ends</dt>
<dd>
{{ event.end_time|date:"H:i" }}<br/>
{{ event.end_date|date:"(Y-m-d)" }}
</dd>
{% endif %}
{% endif %}{% endif %}
</dl>
{% endif %}
</td>