From f26c7984dc8c7ba7cbbdbe4ce952a90032ecb927 Mon Sep 17 00:00:00 2001
From: Mira Weller <weller@rami.io>
Date: Fri, 16 May 2025 21:01:55 +0200
Subject: [PATCH] update dialog markup

---
 src/pretix/control/templates/pretixcontrol/base.html      | 4 ++--
 .../presale/templates/pretixpresale/fragment_modals.html  | 8 ++++----
 src/pretix/static/pretixbase/js/asynctask.js              | 8 ++++----
 src/pretix/static/pretixbase/scss/dialogs.scss            | 5 -----
 src/pretix/static/pretixpresale/js/ui/sso.js              | 8 ++++----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/base.html b/src/pretix/control/templates/pretixcontrol/base.html
index 79d9c5f528..1801a76faf 100644
--- a/src/pretix/control/templates/pretixcontrol/base.html
+++ b/src/pretix/control/templates/pretixcontrol/base.html
@@ -463,9 +463,9 @@
                 </div>
             </div>
         </div>
-        <div id="ajaxerr">
+        <div id="ajaxerr" class="modal-wrapper" hidden>
         </div>
-        <div id="loadingmodal">
+        <div id="loadingmodal" class="modal-wrapper" hidden>
             <div class="modal-card">
                 <div class="modal-card-icon">
                     <i class="fa fa-cog big-rotating-icon"></i>
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_modals.html b/src/pretix/presale/templates/pretixpresale/fragment_modals.html
index a060d08665..e9068cddd2 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_modals.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_modals.html
@@ -2,9 +2,9 @@
 {% load rich_text %}
 {% load safelink %}
 {% load escapejson %}
-<div id="ajaxerr">
+<div id="ajaxerr" class="modal-wrapper" hidden>
 </div>
-<div id="popupmodal" hidden aria-live="polite">
+<div id="popupmodal" class="modal-wrapper" hidden aria-live="polite">
     <div class="modal-card">
         <div class="modal-card-icon">
             <i class="fa fa-window-restore big-icon" aria-hidden="true"></i>
@@ -30,7 +30,7 @@
         </div>
     </div>
 </div>
-<div id="loadingmodal" hidden aria-live="polite">
+<div id="loadingmodal" class="modal-wrapper" hidden aria-live="polite">
     <div class="modal-card">
         <div class="modal-card-icon">
             <i class="fa fa-cog big-rotating-icon" aria-hidden="true"></i>
@@ -50,7 +50,7 @@
         {{ cookie_consent_from_widget|json_script:"cookie-consent-from-widget" }}
     {% endif %}
     {% if cookie_providers %}
-        <div id="cookie-consent-modal" aria-live="polite">
+        <div id="cookie-consent-modal" class="modal-wrapper" hidden aria-live="polite">
             <div class="modal-card">
                 <div class="modal-card-content">
                     <h3 id="cookie-consent-modal-label"></h3>
diff --git a/src/pretix/static/pretixbase/js/asynctask.js b/src/pretix/static/pretixbase/js/asynctask.js
index 65a19338c2..8b32e031cc 100644
--- a/src/pretix/static/pretixbase/js/asynctask.js
+++ b/src/pretix/static/pretixbase/js/asynctask.js
@@ -297,11 +297,11 @@ var waitingDialog = {
         $("#loadingmodal .progress").hide();
         $("#loadingmodal .steps").hide();
         $("body").addClass("loading");
-        $("#loadingmodal").removeAttr("hidden");
+        $("#loadingmodal").removeAttr("hidden has-modal-dialog");
     },
     hide: function () {
         "use strict";
-        $("body").removeClass("loading");
+        $("body").removeClass("loading has-modal-dialog");
         $("#loadingmodal").attr("hidden", true);
     }
 };
@@ -312,10 +312,10 @@ var ajaxErrDialog = {
         $("#ajaxerr").html(c);
         $("#ajaxerr .links").html("<a class='btn btn-default ajaxerr-close'>"
                                   + gettext("Close message") + "</a>");
-        $("body").addClass("ajaxerr");
+        $("body").addClass("ajaxerr has-modal-dialog");
     },
     hide: function () {
         "use strict";
-        $("body").removeClass("ajaxerr");
+        $("body").removeClass("ajaxerr has-modal-dialog");
     }
 };
diff --git a/src/pretix/static/pretixbase/scss/dialogs.scss b/src/pretix/static/pretixbase/scss/dialogs.scss
index c7b3efab7f..56ef0552c1 100644
--- a/src/pretix/static/pretixbase/scss/dialogs.scss
+++ b/src/pretix/static/pretixbase/scss/dialogs.scss
@@ -1,4 +1,3 @@
-
 body.has-modal-dialog .container, body.has-modal-dialog #wrapper {
     -webkit-filter: blur(2px);
     -moz-filter: blur(2px);
@@ -14,10 +13,6 @@ body.has-modal-dialog .container, body.has-modal-dialog #wrapper {
     color: $brand-primary;
 }
 
-dialog.modal-card::backdrop {
-    background: rgba(255, 255, 255, .7);
-}
-
 .modal-wrapper {
     position: fixed;
     top: 0;
diff --git a/src/pretix/static/pretixpresale/js/ui/sso.js b/src/pretix/static/pretixpresale/js/ui/sso.js
index f8fd40c9d4..0a096abb16 100644
--- a/src/pretix/static/pretixpresale/js/ui/sso.js
+++ b/src/pretix/static/pretixpresale/js/ui/sso.js
@@ -4,8 +4,6 @@ $(function () {
     var popup_window = null
     var popup_check_interval = null
 
-    $("#popupmodal").removeAttr("hidden");
-
     $("a[data-open-in-popup-window]").on("click", function (e) {
         e.preventDefault()
 
@@ -22,11 +20,13 @@ $(function () {
             "presale-popup",
             "scrollbars=yes,resizable=yes,status=yes,location=yes,toolbar=no,menubar=no,width=940,height=620,left=50,top=50"
         )
-        $("body").addClass("has-popup")
+        $("body").addClass("has-popup has-modal-dialog")
+        $("#popupmodal").removeAttr("hidden");
 
         popup_check_interval = window.setInterval(function () {
             if (popup_window.closed) {
-                $("body").removeClass("has-popup")
+                $("body").removeClass("has-popup has-modal-dialog")
+                $("#popupmodal").attr("hidden", true);
                 window.clearInterval(popup_check_interval)
             }
         }, 250)