diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index c7471b76fc..30579b5c34 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -205,10 +205,6 @@ 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 6fd3a11fca..9c752ae4d6 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -1207,10 +1207,6 @@ 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 c191fc92d9..d377962306 100644 --- a/src/pretix/control/templates/pretixcontrol/event/display.html +++ b/src/pretix/control/templates/pretixcontrol/event/display.html @@ -18,7 +18,6 @@ {% 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 46f1f3772f..f84ec566f4 100644 --- a/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html +++ b/src/pretix/presale/templates/pretixpresale/event/checkout_addons.html @@ -6,8 +6,7 @@

{% 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 f518936a11..c850173f1f 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 - $('.collapse-vardesc .addon-variation-description').hide(); - $('.collapse-vardesc .toggle-variation-description').click(function () { + $('.addon-variation-description').hide(); + $('.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 55715f06fd..ae006ae9b8 100644 --- a/src/pretix/static/pretixpresale/scss/_event.scss +++ b/src/pretix/static/pretixpresale/scss/_event.scss @@ -88,11 +88,7 @@ margin-top: 10px; } .toggle-variation-description { - display: none; -} -.collapse-vardesc .toggle-variation-description { cursor: pointer; - display: block; } #voucher-toggle { display: none;