diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 37c2bae4cd..6f3282e4c4 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -205,6 +205,10 @@ DEFAULTS = { 'default': 'False', 'type': bool }, + 'addon_variation_description_collapsed': { + 'default': 'True', + 'type': bool + }, 'waiting_list_enabled': { 'default': 'False', 'type': bool diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index ff367b5b8c..ffcde5be4e 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -1194,6 +1194,10 @@ class DisplaySettingsForm(SettingsForm): label=_("Show variations of a product expanded by default"), required=False ) + addon_variation_description_collapsed = forms.BooleanField( + label=_("Collapse descriptions of variations of add-on products"), + required=False + ) frontpage_subevent_ordering = forms.ChoiceField( label=pgettext('subevent', 'Date ordering'), choices=[ diff --git a/src/pretix/control/templates/pretixcontrol/event/display.html b/src/pretix/control/templates/pretixcontrol/event/display.html index d377962306..c191fc92d9 100644 --- a/src/pretix/control/templates/pretixcontrol/event/display.html +++ b/src/pretix/control/templates/pretixcontrol/event/display.html @@ -18,6 +18,7 @@ {% bootstrap_field form.presale_has_ended_text layout="control" %} {% bootstrap_field form.voucher_explanation_text layout="control" %} {% bootstrap_field form.show_variations_expanded layout="control" %} + {% bootstrap_field form.addon_variation_description_collapsed layout="control" %} {% bootstrap_field form.meta_noindex layout="control" %} {% if form.frontpage_subevent_ordering %} {% bootstrap_field form.frontpage_subevent_ordering layout="control" %} diff --git a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html index f84ec566f4..46f1f3772f 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html @@ -6,7 +6,8 @@

{% trans "For some of the products in your cart, you can choose additional options before you continue." %}

-
{% csrf_token %}
diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js index c850173f1f..f518936a11 100644 --- a/src/pretix/static/pretixpresale/js/ui/main.js +++ b/src/pretix/static/pretixpresale/js/ui/main.js @@ -140,8 +140,8 @@ $(function () { $("#ajaxerr").on("click", ".ajaxerr-close", ajaxErrDialog.hide); // AddOns - $('.addon-variation-description').hide(); - $('.toggle-variation-description').click(function () { + $('.collapse-vardesc .addon-variation-description').hide(); + $('.collapse-vardesc .toggle-variation-description').click(function () { $(this).parent().find('.addon-variation-description').slideToggle(); }); diff --git a/src/pretix/static/pretixpresale/scss/_event.scss b/src/pretix/static/pretixpresale/scss/_event.scss index ae006ae9b8..55715f06fd 100644 --- a/src/pretix/static/pretixpresale/scss/_event.scss +++ b/src/pretix/static/pretixpresale/scss/_event.scss @@ -88,7 +88,11 @@ margin-top: 10px; } .toggle-variation-description { + display: none; +} +.collapse-vardesc .toggle-variation-description { cursor: pointer; + display: block; } #voucher-toggle { display: none;