From 61a1368ed285612595ae5924eabebb0c68508efd Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 25 Mar 2020 17:48:24 +0100 Subject: [PATCH] Widget: Show date and time of subevent after calendar selection --- src/pretix/presale/views/widget.py | 5 +++++ src/pretix/static/pretixpresale/js/widget/widget.js | 5 +++++ src/pretix/static/pretixpresale/scss/widget.scss | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/pretix/presale/views/widget.py b/src/pretix/presale/views/widget.py index 115d56185a..9dee7c4845 100644 --- a/src/pretix/presale/views/widget.py +++ b/src/pretix/presale/views/widget.py @@ -491,6 +491,11 @@ class WidgetAPIProductList(EventListMixin, View): ev = self.subevent or request.event data['name'] = str(ev.name) + data['date_range'] = ev.get_date_range_display() + ( + " " + date_format( + ev.date_from.astimezone(request.event.timezone), "TIME_FORMAT" + ) if request.event.settings.show_times else "" + ) fail = False if not ev.presale_is_running: diff --git a/src/pretix/static/pretixpresale/js/widget/widget.js b/src/pretix/static/pretixpresale/js/widget/widget.js index a1202cdb38..8e49250c98 100644 --- a/src/pretix/static/pretixpresale/js/widget/widget.js +++ b/src/pretix/static/pretixpresale/js/widget/widget.js @@ -690,6 +690,9 @@ Vue.component('pretix-widget-event-form', { + '
' + '{{ $root.name }}' + '
' + + '
' + + '{{ $root.date_range }}' + + '
' + '
' + '' + '' @@ -1137,6 +1140,7 @@ var shared_root_methods = { } else { root.view = "event"; root.name = data.name; + root.date_range = data.date_range; root.categories = data.items_by_category; root.currency = data.currency; root.display_net_prices = data.display_net_prices; @@ -1339,6 +1343,7 @@ var create_widget = function (element) { categories: null, currency: null, name: null, + date_range: null, filter: filter, item_filter: items, category_filter: categories, diff --git a/src/pretix/static/pretixpresale/scss/widget.scss b/src/pretix/static/pretixpresale/scss/widget.scss index 4ef6f7f2ea..7bf581c5c5 100644 --- a/src/pretix/static/pretixpresale/scss/widget.scss +++ b/src/pretix/static/pretixpresale/scss/widget.scss @@ -355,6 +355,10 @@ padding-top: 10px; text-align: center; } + .pretix-widget-event-details { + padding-top: 10px; + text-align: center; + } .pretix-widget-event-list-back { padding-top: 10px; text-align: center;