Browse Source

[WebUI] Fix login modal

tags/2.6
moisseev 3 years ago
parent
commit
33d5e19ab1
2 changed files with 11 additions and 13 deletions
  1. 3
    4
      interface/index.html
  2. 8
    9
      interface/js/app/rspamd.js

+ 3
- 4
interface/index.html View File

@@ -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>

+ 8
- 9
interface/js/app/rspamd.js View File

@@ -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();
}
},

Loading…
Cancel
Save