Customer accounts & Memberships (#2024)

src/pretix/static/pretixcontrol/js/ui/main.js

@@ -289,6 +289,9 @@ var form_handlers = function (el) {
             dependency = $($(this).attr("data-display-dependency")),
             update = function (ev) {
                 var enabled = (dependency.attr("type") === 'checkbox' || dependency.attr("type") === 'radio') ? dependency.prop('checked') : !!dependency.val();
+                if (dependent.is("[data-inverse]")) {
+                    enabled = !enabled;
+                }
                 var $toggling = dependent;
                 if (dependent.get(0).tagName.toLowerCase() !== "div") {
                     $toggling = dependent.closest('.form-group');
@@ -304,8 +307,8 @@ var form_handlers = function (el) {
                 }
             };
         update();
-        dependency.closest('.form-group').find('input[name=' + dependency.attr("name") + ']').on("change", update);
-        dependency.closest('.form-group').find('input[name=' + dependency.attr("name") + ']').on("dp.change", update);
+        dependency.closest('.form-group').find('[name=' + dependency.attr("name") + ']').on("change", update);
+        dependency.closest('.form-group').find('[name=' + dependency.attr("name") + ']').on("dp.change", update);
     });
 
     el.find("input[data-required-if], select[data-required-if], textarea[data-required-if]").each(function () {
@@ -702,11 +705,13 @@ $(function () {
         );
     });
 
+    $(".propagated-settings-box").find("input, textarea, select").not("[disabled]")
+        .attr("data-propagated-locked", "true").prop("disabled", true);
+
     $(".propagated-settings-box button[data-action=unlink]").click(function (ev) {
         var $box = $(this).closest(".propagated-settings-box");
-        $box.find(".propagated-settings-overlay").fadeOut();
-        $box.find("input[name=_settings_ignore]").attr("name", "decouple");
-        $box.find(".propagated-settings-form").removeClass("blurred");
+        $box.find("[data-propagated-locked]").prop("disabled", false);
+        $box.removeClass("locked").addClass("unlocked");
         ev.preventDefault();
         return true;
     });

src/pretix/static/pretixcontrol/scss/_flags.scss

@@ -1,10 +1,16 @@
 input[lang] {
   background: no-repeat 10px center;
   padding-left: 34px;
+  &[disabled] {
+    background-color: $input-bg-disabled;
+  }
 }
 textarea[lang] {
   background: no-repeat 10px 10px;
   padding-left: 34px;
+  &[disabled] {
+    background-color: $input-bg-disabled;
+  }
 }
 pre[lang] {
   background: no-repeat 10px 10px;
@@ -23,6 +29,10 @@ div[lang] {
   input[lang], textarea[lang], div[lang], pre[lang] {
     background: none;
     padding-left: 12px;
+
+    &[disabled] {
+      background-color: $input-bg-disabled;
+    }
   }
 }
 

src/pretix/static/pretixcontrol/scss/_forms.scss

@@ -333,25 +333,27 @@ input[type=number].short {
   }
 }
 
-.propagated-settings-box {
-  position: relative;
-
-  .propagated-settings-overlay {
-    background: rgba(255, 255, 255, 0.7);
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    text-align: center;
+.propagated-settings-box.locked {
+  .propagated-settings-form {
+    opacity: 0.7;
   }
-
-  .propagated-settings-form.blurred {
-    -webkit-filter: blur(2px);
-    -moz-filter: blur(2px);
-    -ms-filter: blur(2px);
-    -o-filter: blur(2px);
-    filter: blur(2px);
+  .panel-body.help-text {
+    border-bottom: 1px solid $panel-default-heading-bg;
+  }
+}
+.propagated-settings-box.unlocked {
+  border: 0;
+  transition: border-width 0.5s linear;
+  .panel-heading, .panel-body.help-text {
+    height: 0;
+    padding: 0;
+    border: 0;
+    overflow: hidden;
+    transition: height 0.5s linear, padding 0.5s linear, border-width 0.5s linear;
+  }
+  .panel-body {
+    padding: 0;
+    transition: padding 0.5s linear;
   }
 }
 @media (max-width: $screen-sm-max) {

src/pretix/static/pretixpresale/scss/main.scss

@@ -30,7 +30,7 @@ footer nav {
 .js-only {
     display: none;
 }
-.locales {
+.locales, .loginstatus {
     display: inline;
     a {
         text-decoration: none;
@@ -45,6 +45,9 @@ footer nav {
         vertical-align: baseline;
     }
 }
+.loginstatus a {
+    margin-left: 10px;
+}
 .huge {
     font-size: 40px;
 }
@@ -300,6 +303,29 @@ h2 .label {
     }
 }
 
+.quotabox {
+    display: inline-block;
+    vertical-align: top;
+    width: 50px;
+    .progress {
+        height: 7px;
+        margin-bottom: 2px;
+    }
+    .numbers {
+        font-size: 10px;
+        color: $text-muted;
+        display: block;
+        text-align: center;
+    }
+    &.availability .progress-bar-success {
+        background: lighten($brand-success, 20%);
+    }
+}
+
+@for $i from 0 through 100 {
+    .progress-bar-#{$i} { width: 1% * $i; }
+}
+
 @import "_iframe.scss";
 @import "_a11y.scss";
 @import "_print.scss";