Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

busunit/DIUv2/html/css/diustyles.css

@@ -124,9 +124,6 @@ p:focus {
   .statuslogin { font-size:20px; }
   .statusmain { font-size:20px; }
 
-  #mainstatus { font-size: 16px; }
-
-
   .row { height: 80px; }
   .col { width: 80px; }
 
@@ -209,8 +206,6 @@ p:focus {
   .statuslogin { font-size:40px; }
   .statusmain { font-size:40px; }
 
-  #mainstatus { font-size: 32px; }
-
   .row { height: 160px; }
   .col { width: 160px; }
 
@@ -427,15 +422,15 @@ p:focus {
 #mainstatus {
   font-family: "Courier New";
   font-weight:bold;
+  font-size: 5vh;
   color: #d7d644;
-  /* font-size: 16px; */
 
   position:absolute;
   bottom:0;
   width:110%;
-  height: 5%;
+  height: 8vh;
   background:#555555;
-  margin-left:-35px;
+  margin-left: -5vw;
 }
 
 /*****/

busunit/DIUv2/html/index-ORG.html

@@ -429,7 +429,8 @@ Diagnostic window...
 
       </div>
 
-      <div id="mainstatus">Rt 9900   Trip 1   Stop 0   GPS No   Tun Yes   2019-08-13 04:58</div>
+      <!-- <div id="mainstatus">Rt 9900   Trip 1   Stop 0   GPS No   Tun Yes   2019-08-13 04:58</div> -->
+      <div id="mainstatus"></div>
 
     </div> <!-- ui_main -->
 
@@ -647,6 +648,7 @@ Diagnostic window...
 
   </body>
 
+  <script src='js/moment.js'></script>
   <script src='js/diu_ui.js'></script>
 
 </html>

busunit/DIUv2/html/js/diu_ui-ORG.js

@@ -589,9 +589,11 @@ function _cb_status(inp) {
     str += "Trip " + m["trip"] + " ";
     str += "Stop " + m["stop"] + " ";
     str += "GPS " + m["gps"] + " ";
-    str += "Tun " + m["tunnel"] + " ";
+    str += "Tun " + m["tunnel"] + ", ";
     str += m["date"];
 
+    str += " " + moment().format("HH:mm");
+
     ele.innerHTML = str;
   }