From 3f2bb3beaed39f996a5ce175e10a0d795ebbe94a Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 17 May 2017 17:44:32 +0200 Subject: [PATCH] Add date to the metadata section --- .../templates/pretixpresale/event/index.html | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index e49afdee3c..dccf075d03 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -81,42 +81,34 @@

{% endif %} - {% if event.settings.show_times or event.date_admission %} -
- -

- {% if event.settings.show_times %} - {% blocktrans trimmed with time=event.date_from|date:"TIME_FORMAT" %} - Begin: {{ time }} +

+ +

+ {{ event.get_date_range_display }} + {% if event.settings.show_times %} +
+ {% blocktrans trimmed with time=event.date_from|date:"TIME_FORMAT" %} + Begin: {{ time }} + {% endblocktrans %} + {% endif %} + {% if event.date_admission %} +
+ {% if event.date_admission|date:"SHORT_DATE_FORMAT" == event.date_from|date:"SHORT_DATE_FORMAT" %} + {% blocktrans trimmed with time=event.date_admission|date:"TIME_FORMAT" %} + Admission: {{ time }} + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with datetime=event.date_admission|date:"SHORT_DATETIME_FORMAT" %} + Admission: {{ datetime }} {% endblocktrans %} {% endif %} - {% if event.date_admission and event.settings.show_times %} -
- {% endif %} - {% if event.date_admission %} - {% if event.date_admission|date:"SHORT_DATE_FORMAT" == event.date_from|date:"SHORT_DATE_FORMAT" %} - {% blocktrans trimmed with time=event.date_admission|date:"TIME_FORMAT" %} - Admission: {{ time }} - {% endblocktrans %} - {% else %} - {% blocktrans trimmed with datetime=event.date_admission|date:"SHORT_DATETIME_FORMAT" %} - Admission: {{ datetime }} - {% endblocktrans %} - {% endif %} - {% endif %} -
- - {% trans "Add to Calendar" %} - -

-
- {% else %} -

- - {% trans "Add to Calendar" %} + {% endif %} +
+
+ {% trans "Add to Calendar" %}

- {% endif %} +