From 02d5202c68f352498e10deb4add00e52ecfc34c1 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 7 Nov 2023 10:49:59 +0000
Subject: [PATCH] Process ghostwheel's suggestion. By default hide the
 container div element and show the no-javascript div element. Via JavaScript
 hide the no-java div element and show the container div element.

---
 setup/static/render.js    |  6 +++++-
 setup/templates/base.html | 23 +++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/setup/static/render.js b/setup/static/render.js
index 34a34f22..2276b19d 100644
--- a/setup/static/render.js
+++ b/setup/static/render.js
@@ -1,7 +1,11 @@
-var render = 'RenderLoaded';
 //Store API token in variable.
 var token = $("#api_token").val();
 
+$(document).ready(function() {
+	$("#no_java_script").hide();
+	$("#container").show();
+});
+
 $(document).ready(function() {
 	if ($("#webmail").val() == 'none') {
 		$("#webmail_path").hide();
diff --git a/setup/templates/base.html b/setup/templates/base.html
index b4b4ad3e..41d85b54 100644
--- a/setup/templates/base.html
+++ b/setup/templates/base.html
@@ -5,16 +5,12 @@
 {% block title %}Mailu setup{% endblock %}
 
 {% block content %}
-<noscript>
-  <style type="text/css">
-      .container {display:none;}
-  </style>
-  <div class="noscriptmsg">
-  JavaScript is not enabled. The Mailu setup site does not function without JavaScript enabled.
-  </div>
-</noscript>
 
-<div id="container" class="container">
+<div id=no_java_script class="noscriptmsg">
+  JavaScript is not enabled or JavaScript files were blocked. The Mailu setup site does not function when JavaScript is disabled.
+</div>
+
+<div id="container" class="container" style="display:none;">
   <h1>Mailu configuration</h1>
   {{ flashed_messages() }}
   <p>
@@ -44,14 +40,5 @@ For production scenarios we recommend to use the stable version.
 {% block scripts %}
 <script type="text/javascript" src="{{ url_for('static', filename='jquery.min.js') }}"></script>
 <script type="text/javascript" src="{{ url_for('static', filename='render.js') }}"></script>
-<script>
-  if ( typeof jQueryMailu == "undefined" || typeof jQuery == "undefined" || typeof render == "undefined"){
-    console.log("jQuery or render.js or bootstrap js are not defined");
-    document.getElementById("container").style["display"] = "none";
-    const message = document.createElement("p");
-    message.innerText = "JQuery or render.js or bootstrap could not be downloaded and initialized. JavaScript must be enabled. Do not block any scripts and do not block any site downloads.";
-    document.body.appendChild(message);
-  }
-  </script>
 {{super()}}
 {% endblock %}
\ No newline at end of file