From 78fc58cc933fc9eb8e8fb8feb11a0d0f672edaad Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Sun, 22 Jan 2017 20:31:59 +0100 Subject: [PATCH] Add setting to turn off automatic collapsing of variations --- src/pretix/base/settings.py | 4 ++++ src/pretix/control/forms/event.py | 4 ++++ .../control/templates/pretixcontrol/event/display.html | 1 + .../presale/templates/pretixpresale/event/index.html | 10 ++++++---- src/pretix/static/pretixpresale/js/ui/main.js | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 5871721317..cd416eeabf 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -128,6 +128,10 @@ DEFAULTS = { 'default': 'False', 'type': bool }, + 'show_variations_expanded': { + 'default': 'False', + 'type': bool + }, 'ticket_download': { 'default': 'False', 'type': bool diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index 0a19d81b48..22756a48ea 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -499,6 +499,10 @@ class DisplaySettingsForm(SettingsForm): required=False, widget=I18nTextarea ) + show_variations_expanded = forms.BooleanField( + label=_("Show variations of a product expanded by default"), + required=False + ) class TicketSettingsForm(SettingsForm): diff --git a/src/pretix/control/templates/pretixcontrol/event/display.html b/src/pretix/control/templates/pretixcontrol/event/display.html index 0869e289c9..a62b48622f 100644 --- a/src/pretix/control/templates/pretixcontrol/event/display.html +++ b/src/pretix/control/templates/pretixcontrol/event/display.html @@ -10,6 +10,7 @@ {% bootstrap_field form.primary_color layout="horizontal" %} {% bootstrap_field form.logo_image layout="horizontal" %} {% bootstrap_field form.frontpage_text layout="horizontal" %} + {% bootstrap_field form.show_variations_expanded layout="horizontal" %}
- - {% trans "Show variants" %} - + {% if not event.settings.show_variations_expanded %} + + {% trans "Show variants" %} + + {% endif %}
-
+
{% for var in item.available_variations %}
diff --git a/src/pretix/static/pretixpresale/js/ui/main.js b/src/pretix/static/pretixpresale/js/ui/main.js index 388e6079f7..7ea07aadd8 100644 --- a/src/pretix/static/pretixpresale/js/ui/main.js +++ b/src/pretix/static/pretixpresale/js/ui/main.js @@ -20,7 +20,7 @@ $(function () { $($(this).attr("data-target")).collapse('show'); }); $(".js-only").removeClass("js-only"); - $(".variations").hide(); + $(".variations-collapsed").hide(); $("a[data-toggle=variations]").click(function (e) { $(this).parent().parent().parent().find(".variations").slideToggle(); e.preventDefault();