CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Widget: Include frontpage_text, but only after navigation

Browse Source
This commit is contained in:
Raphael Michel
2021-01-12 11:56:47 +01:00
parent cf3c4d26cb
commit 593fc69d0c
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/presale/views/widget.py
View File

@@ -577,6 +577,7 @@ class WidgetAPIProductList(EventListMixin, View):
ev = self.subevent or request.event ev = self.subevent or request.event
data['name'] = str(ev.name) data['name'] = str(ev.name)
data['frontpage_text'] = str(rich_text(ev.frontpage_text, safelinks=False))
data['date_range'] = self._get_date_range(ev, request.event) data['date_range'] = self._get_date_range(ev, request.event)
fail = False fail = False

3
src/pretix/static/pretixpresale/js/widget/widget.js
View File

@@ -739,6 +739,7 @@ Vue.component('pretix-widget-event-form', {
+ '<div class="pretix-widget-event-details" v-if="($root.events || $root.weeks || $root.days) && $root.date_range">' + '<div class="pretix-widget-event-details" v-if="($root.events || $root.weeks || $root.days) && $root.date_range">'
+ '{{ $root.date_range }}' + '{{ $root.date_range }}'
+ '</div>' + '</div>'
+ '<div class="pretix-widget-event-description" v-if="($root.events || $root.weeks || $root.days) && $root.frontpage_text" v-html="$root.frontpage_text"></div>'
+ '<form method="post" :action="$root.formAction" ref="form" :target="$root.formTarget">' + '<form method="post" :action="$root.formAction" ref="form" :target="$root.formTarget">'
+ '<input type="hidden" name="_voucher_code" :value="$root.voucher_code" v-if="$root.voucher_code">' + '<input type="hidden" name="_voucher_code" :value="$root.voucher_code" v-if="$root.voucher_code">'
+ '<input type="hidden" name="subevent" :value="$root.subevent" />' + '<input type="hidden" name="subevent" :value="$root.subevent" />'
@@ -1360,6 +1361,7 @@ var shared_root_methods = {
root.view = "event"; root.view = "event";
root.name = data.name; root.name = data.name;
root.date_range = data.date_range; root.date_range = data.date_range;
root.frontpage_text = data.frontpage_text;
root.categories = data.items_by_category; root.categories = data.items_by_category;
root.currency = data.currency; root.currency = data.currency;
root.display_net_prices = data.display_net_prices; root.display_net_prices = data.display_net_prices;
@@ -1576,6 +1578,7 @@ var create_widget = function (element) {
currency: null, currency: null,
name: null, name: null,
date_range: null, date_range: null,
frontpage_text: null,
filter: filter, filter: filter,
item_filter: items, item_filter: items,
category_filter: categories, category_filter: categories,

3
src/pretix/static/pretixpresale/scss/widget.scss
View File

@@ -366,6 +366,9 @@
padding-top: 10px; padding-top: 10px;
text-align: center; text-align: center;
} }
.pretix-widget-event-description {
padding: 0 15px;
}
.pretix-widget-event-list-back { .pretix-widget-event-list-back {
padding-top: 10px; padding-top: 10px;
text-align: center; text-align: center;