From: moisseev <moiseev@mezonplus.ru>
Date: Sun, 26 Jul 2020 17:28:36 +0000 (+0300)
Subject: [WebUI] Add `Enable JS` warning
X-Git-Tag: 2.6~214^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3453%2Fhead;p=thirdparty%2Frspamd.git

[WebUI] Add `Enable JS` warning
---

diff --git a/interface/index.html b/interface/index.html
index efb6138fb4..742db46df7 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -72,13 +72,18 @@
 	</form>
 </nav>
 
-<div class="notification-area"></div>
+<div class="notification-area">
+	<noscript>
+    	<div class="alert alert-error"><strong>Please enable JavaScript</strong></div>
+    </noscript>
+</div>
 
 <div id="preloader" class="container-fluid">
-	<div id="loading" class="position-absolute align-items-center my-3 text-primary blinking">
+	<div id="loading" class="position-absolute align-items-center my-3 text-primary blinking d-none">
 		<div class="spinner-border align-middle" role="status" aria-hidden="true"></div>
 		<strong class="ml-3">Loading...</strong>
 	</div>
+	<script>document.getElementById("loading").classList.remove("d-none");</script>
 	<div class="row position-absolute w-100 h-100 align-items-center text-center">
 		<img class="img-fluid mh-100 mx-auto" src="./img/rspamd_logo_navbar.png" alt="Rspamd" />
 	</div>
diff --git a/interface/js/main.js b/interface/js/main.js
index 7c6bb68513..87d4f384c7 100644
--- a/interface/js/main.js
+++ b/interface/js/main.js
@@ -46,6 +46,7 @@ define("d3.global", ["d3"], function (d3global) { // eslint-disable-line strict
 // Notify user on module loading failure
 requirejs.onError = function (e) {
     "use strict";
+    document.getElementById("loading").classList.add("d-none");
     document.getElementsByClassName("notification-area")[0].innerHTML =
         "<div class=\"alert alert-error\">" +
             "<strong>Module loading error: " + e.requireType + ", module: " + e.requireModules + "</strong>" +