Преглед на файлове

make jsalert.tx present in both components and toplevel.

This implies a bug in the templating/components logic somewhere
I presume it's in the templates themselves.
George Baugh преди 5 месеца
родител
ревизия
16a5b97aa5
променени са 3 файла, в които са добавени 54 реда и са изтрити 53 реда
  1. 53 0
      www/templates/html/components/jsalert.tx
  2. 0 53
      www/templates/html/jsalert.tx
  3. 1 0
      www/templates/html/jsalert.tx

+ 53 - 0
www/templates/html/components/jsalert.tx

@@ -0,0 +1,53 @@
+<script>
+    document.addEventListener("DOMContentLoaded", function(event) {
+        var loginFailure = <: $failure :>;
+        if( loginFailure === -1 ) {
+            document.querySelector('#jsalert').style.cssText = 'display:none;';
+        } else if ( loginFailure === 1 ) {
+            document.querySelector('#jsalert').classList.remove("alert-success");
+            document.querySelector('#jsalert').classList.add("alert-danger");
+            document.querySelector('#msgIcon').innerHTML = "❌";
+            document.querySelector('#message').innerHTML = "<: $message :>";
+        } else {
+            document.querySelector('#jsalert').classList.remove("alert-danger");
+            document.querySelector('#jsalert').classList.add("alert-success");
+            document.querySelector('#msgIcon').innerHTML = "✓";
+            document.querySelector('#message').innerHTML = "<: $message :>";
+            //JS redir better ux than 302
+            window.setTimeout(function() {
+                window.location="<: $to :>";
+            }, 500);
+        }
+    });
+</script>
+
+<style>
+    #jsalert {
+        margin: 1rem;
+        border-radius: .75rem;
+        border-color: rgba(255,0,0,.75);
+        padding: 1rem;
+        margin-top: 3rem;
+        position: fixed;
+        width:95%;
+    }
+    .alert-danger {
+        background-color: rgba(100,0,0,.95);
+    }
+    .alert-success {
+        background-color: rgba(0,255,0,.95);
+    }
+</style>
+
+<div id="jsalert" class="alert-danger">
+  <table>
+    <tr>
+      <td id="msgIcon">
+        ⚠
+      </td>
+      <td id="message" style="padding-left: 1rem;">
+        Please enable JavaScript on this domain.
+      </td>
+    </tr>
+  </table>
+</div>

+ 0 - 53
www/templates/html/jsalert.tx

@@ -1,53 +0,0 @@
-<script>
-    document.addEventListener("DOMContentLoaded", function(event) {
-        var loginFailure = <: $failure :>;
-        if( loginFailure === -1 ) {
-            document.querySelector('#jsalert').style.cssText = 'display:none;';
-        } else if ( loginFailure === 1 ) {
-            document.querySelector('#jsalert').classList.remove("alert-success");
-            document.querySelector('#jsalert').classList.add("alert-danger");
-            document.querySelector('#msgIcon').innerHTML = "❌";
-            document.querySelector('#message').innerHTML = "<: $message :>";
-        } else {
-            document.querySelector('#jsalert').classList.remove("alert-danger");
-            document.querySelector('#jsalert').classList.add("alert-success");
-            document.querySelector('#msgIcon').innerHTML = "✓";
-            document.querySelector('#message').innerHTML = "<: $message :>";
-            //JS redir better ux than 302
-            window.setTimeout(function() {
-                window.location="<: $to :>";
-            }, 500);
-        }
-    });
-</script>
-
-<style>
-    #jsalert {
-        margin: 1rem;
-        border-radius: .75rem;
-        border-color: rgba(255,0,0,.75);
-        padding: 1rem;
-        margin-top: 3rem;
-        position: fixed;
-        width:95%;
-    }
-    .alert-danger {
-        background-color: rgba(100,0,0,.95);
-    }
-    .alert-success {
-        background-color: rgba(0,255,0,.95);
-    }
-</style>
-
-<div id="jsalert" class="alert-danger">
-  <table>
-    <tr>
-      <td id="msgIcon">
-        ⚠
-      </td>
-      <td id="message" style="padding-left: 1rem;">
-        Please enable JavaScript on this domain.
-      </td>
-    </tr>
-  </table>
-</div>

+ 1 - 0
www/templates/html/jsalert.tx

@@ -0,0 +1 @@
+components/jsalert.tx