From 34c9c40ddc649a1bd7a8c93285294b8b767c07e0 Mon Sep 17 00:00:00 2001 From: Martin Gross Date: Thu, 12 Mar 2020 10:28:47 +0100 Subject: [PATCH] Option to hide date-block on frontpage (#1603) * Option to hide date-block on frontpage * Also hide date in headline --- src/pretix/api/serializers/event.py | 1 + src/pretix/base/settings.py | 11 +++ src/pretix/control/forms/event.py | 1 + .../pretixcontrol/event/settings.html | 1 + .../templates/pretixpresale/event/index.html | 68 ++++++++++--------- .../pretixpresale/organizers/index.html | 30 ++++---- 6 files changed, 66 insertions(+), 46 deletions(-) diff --git a/src/pretix/api/serializers/event.py b/src/pretix/api/serializers/event.py index 21be19d819..4402230953 100644 --- a/src/pretix/api/serializers/event.py +++ b/src/pretix/api/serializers/event.py @@ -532,6 +532,7 @@ class EventSettingsSerializer(serializers.Serializer): 'checkout_email_helptext', 'presale_has_ended_text', 'voucher_explanation_text', + 'show_dates_on_frontpage', 'show_date_to', 'show_times', 'show_items_outside_presale_period', diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index e9d86a5e0b..f7e12a2528 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -668,6 +668,17 @@ DEFAULTS = { label=_("Default language"), ) }, + 'show_dates_on_frontpage': { + 'default': 'True', + 'type': bool, + 'serializer_class': serializers.BooleanField, + 'form_class': forms.BooleanField, + 'form_kwargs': dict( + label=_("Show event times and dates on the ticket shop"), + help_text=_("If disabled, no date or time will be shown on the ticket shop's front page. This settings " + "does however not affect the display in other locations."), + ) + }, 'show_date_to': { 'default': 'True', 'type': bool, diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index 523ff33da3..dd84f6e776 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -439,6 +439,7 @@ class EventSettingsForm(SettingsForm): 'checkout_email_helptext', 'presale_has_ended_text', 'voucher_explanation_text', + 'show_dates_on_frontpage', 'show_date_to', 'show_times', 'show_items_outside_presale_period', diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html index c398b4cacc..f6521f2a98 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings.html @@ -121,6 +121,7 @@
{% trans "Display" %} + {% bootstrap_field sform.show_dates_on_frontpage layout="control" %} {% bootstrap_field sform.show_date_to layout="control" %} {% bootstrap_field sform.show_times layout="control" %} {% bootstrap_field sform.show_quota_left layout="control" %} diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html index af1e18c75a..7119de9a07 100644 --- a/src/pretix/presale/templates/pretixpresale/event/index.html +++ b/src/pretix/presale/templates/pretixpresale/event/index.html @@ -130,7 +130,7 @@ {% if event_logo and request.event.settings.logo_show_title and not subevent %}

{{ event.name }} - {% if not event.has_subevents %} + {% if event.settings.show_dates_on_frontpage and not event.has_subevents %} {{ event.get_date_range_display }} {% endif %}

@@ -174,44 +174,46 @@

{% endif %} -
- -

- {{ ev.get_date_range_display }} - {% if event.settings.show_times %} -
- {% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %} - Begin: {{ time }} - {% endblocktrans %} - {% if event.settings.show_date_to and ev.date_to %} + {% if ev.settings.show_dates_on_frontpage %} +

+ +

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

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

+
+ {% endif %} diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html index 45a889bf60..c34dff1f76 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/index.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html @@ -66,19 +66,23 @@ {{ e.name }} - - {{ e.daterange|default:e.get_date_range_display }} - {% if e.settings.show_times and not e.has_subevents %} - {% timezone e.tzname %} -
- {{ e.date_from|date:"TIME_FORMAT" }} - {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %} - – {{ e.date_to|date:"TIME_FORMAT" }} - {% endif %} - - {% endtimezone %} - {% endif %} - + {% if e.settings.show_dates_on_frontpage %} + + {{ e.daterange|default:e.get_date_range_display }} + {% if e.settings.show_times and not e.has_subevents %} + {% timezone e.tzname %} +
+ {{ e.date_from|date:"TIME_FORMAT" }} + {% if e.settings.show_date_to and e.date_to and e.date_to.date == e.date_from.date %} + – {{ e.date_to|date:"TIME_FORMAT" }} + {% endif %} + + {% endtimezone %} + {% endif %} + + {% else %} +   + {% endif %} {% if e.has_subevents %} {% trans "Event series" %}