From: moisseev <moiseev@mezonplus.ru>
Date: Thu, 9 Jul 2020 14:50:51 +0000 (+0300)
Subject: [WebUI] Fix login modal
X-Git-Tag: 2.6~249^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3427%2Fhead;p=thirdparty%2Frspamd.git

[WebUI] Fix login modal
---

diff --git a/interface/index.html b/interface/index.html
index 3b2f1f2ca4..f235671918 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -471,11 +471,11 @@
 </div>
 
 <!-- login modal -->
-<div id="connectDialog" class="modal" tabindex="-1" role="dialog" style="display: none;">
+<div id="connectDialog" class="modal fade" data-backdrop="static" data-keyboard="false" role="dialog">
 	<div class="modal-dialog modal-sm modal-dialog-centered">
 		<div class="modal-content shadow">
-			<div class="modal-header py-2">
-				<h6 class="modal-title">Login to Rspamd</h6>
+			<div class="modal-header text-secondary py-2">
+				<i class="fas fa-key my-auto"></i><h6 class="modal-title font-weight-bolder">Login to Rspamd</h6>
 			</div>
 			<div class="modal-body" id="connectBody">
 				<form id="connectForm">
@@ -497,7 +497,6 @@
 	</div>
 </div>
 
-<div id="backDrop" class="modal-backdrop fade in" style="display: none;"></div>
 <script data-main="./js/main.js" src="./js/lib/require.min.js"></script>
 </body>
 </html>
diff --git a/interface/js/app/rspamd.js b/interface/js/app/rspamd.js
index e48a753182..be7594e300 100644
--- a/interface/js/app/rspamd.js
+++ b/interface/js/app/rspamd.js
@@ -452,13 +452,12 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
                 displayUI();
             },
             error: function () {
-                var dialog = $("#connectDialog");
-                var backdrop = $("#backDrop");
-                $("#mainUI").hide();
-                $(dialog).show();
-                $(backdrop).show();
-                $("#connectPassword").focus();
-                $("#connectForm").off("submit");
+                $("#connectDialog")
+                    .on("shown.bs.modal", function () {
+                        $("#connectDialog").off("shown.bs.modal");
+                        $("#connectPassword").focus();
+                    })
+                    .modal("show");
 
                 $("#connectForm").on("submit", function (e) {
                     e.preventDefault();
@@ -479,8 +478,8 @@ function ($, D3pie, visibility, NProgress, stickyTabs, tab_stat, tab_graph, tab_
                             if (data.auth === "ok") {
                                 sessionStorage.setItem("read_only", data.read_only);
                                 saveCredentials(password);
-                                $(dialog).hide();
-                                $(backdrop).hide();
+                                $("#connectForm").off("submit");
+                                $("#connectDialog").modal("hide");
                                 displayUI();
                             }
                         },