More fuckery with indented sublists in gkeep and with the countdown line.

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index fd509101804bf41312d77eccc01ea99b91500bc6..6003165a674e1f2ed76f18f8ffe8812f7c67b6e5 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -191,11 +191,11 @@ def emit_wrapped(f, filename):
         if (remainingMs > 0) {
           var hr = document.getElementById("countdown");
           var width = (remainingMs / (totalMs - 5000)) * 100.0;
-          if (width > 100) {
-            width = 100;
+          if (width <= 100) {
+            hr.style.visibility = "visible";
+            hr.style.width = " ".concat(width, "%%");
+            hr.style.backgroundColor = "maroon";
           }
-          hr.style.width = " ".concat(width, "%%");
-          hr.style.backgroundColor = "maroon";
         } else {
           // Reload unconditionally after 22 sec.
           window.location.reload();
@@ -256,11 +256,11 @@ def emit_wrapped(f, filename):
             </P>
             <HR id="countdown" STYLE="width:0px;
                                       text-align:left;
+                                      margin:0;
                                       border:none;
-                                      margin-top:0;
-                                      margin-left:0;
-                                      margin-bottom:2px;
+                                      border-width:0;
                                       height:5px;
+                                      visibility:hidden;
                                       background-color:#ffffff;">
         </TD>
     </TR>