minor typos and css fixes

rvdbreemen · Jan 11, 2021 · 74d4978 · 74d4978
1 parent 9b000b6
commit 74d4978
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ The features of this OTGW firmware are:
 - sending commands thru REST API (/api/v1/otgw/command/{any command})
 - settings for Hostname and MQTT in the webUI (just compile and edit in webUI)
 - OTmonitor Web UI (standalone interface)
+- reliable OTA upgrades (v0.6.0+)
 
 To do:
 - InfluxDB client to do direct logging 
@@ -28,7 +29,7 @@ Looking for the documentation, go here (work in progress):  <br> https://github.
 
 | Version | Release notes |
 |-|-|
-| 0.6.0 | Standalone UI for simple OT monitor purposes and deviceinformation, moved index.html to SPIFF <br>OTA is possible after flashing 0.6.0 (Hardware watchdog is fed during flashuploads now) |
+| 0.6.0 | Standalone UI for simple OT monitor purposes and deviceinformation, moved index.html to SPIFF <br>OTA is possible after flashing 0.6.0 (Hardware watchdog is fed, during flash uploads now) |
 | 0.5.1 | REST APIs, v1, for OTmonitor values, GetByLabel, GetByID, POST otgw/command/{command} |
 | 0.5.0 | Implemented the UI for settings (restapi, read/write file in json) |
 | 0.4.2 | Bi-directional serial communication on port 1023 (aka ser2net) for use with OTmonitor application|   

diff --git a/data/index.css b/data/index.css
@@ -240,6 +240,40 @@ input {
   margin-top: -52px;
 }
 
+/* header */
+.headerrow {
+  vertical-align:bottom;
+}
+
+.headercolumnbig{
+  font-size: xx-large;
+  font-weight: bold;
+  float: left;
+  width: 350px;
+}
+
+.headercolumn{
+  font-size: smaller;
+  float: left;
+  width: 175px;
+
+}
+
+/* Clear floats after the columns */
+.headerrow:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+/* Responsive layout - makes the three columns stack on top of each other instead of next to each other */
+@media screen and (max-width: 600px) {
+  .column {
+    width: 100%;
+  }
+}
+
+
 /* OTmonitor */
 .otmonrow {
   background: lightblue;

diff --git a/data/index.html b/data/index.html
@@ -10,13 +10,11 @@
   <body>
     <font face="Arial">
     <!-- <div class="dev-header"> -->
-    <div class="header">
-      <h1>
-        <span id="sysName">OTGW firmware</span> &nbsp; &nbsp; &nbsp;
-        <span id="devName"    style='font-size: small;'>[hostname]</span> &nbsp;
-        <span id="devVersion" style='font-size: small;'>[version]</span>
-        <span id='theTime'    class='nav-item nav-clock'>[00:00:00]]</span>
-      </h1>
+    <div class="headerrow">
+        <div class="headercolumnbig" id="sysName">OTGW firmware</div>
+        <div class="headercolumn" id="devName">[hostname]</div>
+        <div class="headercolumn" id="devVersion">[version]</div>
+        <div class="headercolumn" id='theTime'>[00:00:00]</div>
     </div>
     </font>
     <div id="displayMainPage"      style="display:none">

diff --git a/updateServerHtml.h b/updateServerHtml.h
@@ -18,14 +18,14 @@ static const char UpdateServerIndex[] PROGMEM =
       </form>
       <hr>
       <br/><font color='red'>Warning!!!</font>
-      <br/>You will lose all your files when flassing SPIFF. 
-      <br/>Basckup your files first to your local filesystem (using FSexplorer) 
-      and upload them after the flassing of your SPIFF.
+      <br/>You will lose all your files when flashing SPIFF. 
+      <br/>Backup your files first to your local filesystem (using FSexplorer) 
+      and upload them after the flashing of your SPIFF.
       <hr>
       <br/>
       <br/>Wait <span style='font-size: 1.3em;' id="waitSeconds">60</span> seconds ..
-      <br>If nothing happend, then wait for count down to zero and then refresh with this linkspan style='font-size:1.3em;'><b><a href="/">hier</a></b></span>!
-     </body>
+      <br>If nothing happend, then wait for count down to zero and then refresh with <span style='font-size:1.3em;'><b><a href="/">this link here</a></b></span>!
+      </body>
      <script>
          var seconds = document.getElementById("waitSeconds").textContent;
          var countdown = setInterval(function() {
@@ -53,7 +53,7 @@ static const char UpdateServerSuccess[] PROGMEM =
       <br/>
       <br>
       <br/>Wait <span style='font-size: 1.3em;' id="waitSeconds">60</span> seconds ..
-      <br>If nothing happend, then wait for count down to zero and then refresh with this linkspan style='font-size:1.3em;'><b><a href="/">hier</a></b></span>!
+      <br>If nothing happend, then wait for count down to zero and then refresh with <span style='font-size:1.3em;'><b><a href="/">this link here</a></b></span>!
       </body>
       <script>
          var seconds = document.getElementById("waitSeconds").textContent;

diff --git a/version.h b/version.h
@@ -2,13 +2,13 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 6  
 #define _VERSION_PATCH 0
-#define _VERSION_BUILD 404
+#define _VERSION_BUILD 408
 //#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
 #define _VERSION_DATE "11-01-2021"
-#define _VERSION_TIME "09:14:56"
+#define _VERSION_TIME "21:20:33"
 #define _SEMVER_CORE "0.6.0"
-#define _SEMVER_BUILD "0.6.0+404"
-#define _SEMVER_FULL "0.6.0+404"
+#define _SEMVER_BUILD "0.6.0+408"
+#define _SEMVER_FULL "0.6.0+408"
 #define _SEMVER_NOBUILD "0.6.0 (11-01-2021)"
-#define _VERSION "0.6.0+404 (11-01-2021)"
+#define _VERSION "0.6.0+408 (11-01-2021)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver