Skip to content

Commit 74d4978

Browse files
rvdbreemenrvdbreemen
committed
minor typos and css fixes
1 parent 9b000b6 commit 74d4978

File tree

5 files changed

+52
-19
lines changed

5 files changed

+52
-19
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The features of this OTGW firmware are:
2020
- sending commands thru REST API (/api/v1/otgw/command/{any command})
2121
- settings for Hostname and MQTT in the webUI (just compile and edit in webUI)
2222
- OTmonitor Web UI (standalone interface)
23+
- reliable OTA upgrades (v0.6.0+)
2324

2425
To do:
2526
- InfluxDB client to do direct logging
@@ -28,7 +29,7 @@ Looking for the documentation, go here (work in progress): <br> https://github.
2829

2930
| Version | Release notes |
3031
|-|-|
31-
| 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) |
32+
| 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) |
3233
| 0.5.1 | REST APIs, v1, for OTmonitor values, GetByLabel, GetByID, POST otgw/command/{command} |
3334
| 0.5.0 | Implemented the UI for settings (restapi, read/write file in json) |
3435
| 0.4.2 | Bi-directional serial communication on port 1023 (aka ser2net) for use with OTmonitor application|

‎data/index.css‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,40 @@ input {
240240
margin-top: -52px;
241241
}
242242

243+
/* header */
244+
.headerrow {
245+
vertical-align:bottom;
246+
}
247+
248+
.headercolumnbig{
249+
font-size: xx-large;
250+
font-weight: bold;
251+
float: left;
252+
width: 350px;
253+
}
254+
255+
.headercolumn{
256+
font-size: smaller;
257+
float: left;
258+
width: 175px;
259+
260+
}
261+
262+
/* Clear floats after the columns */
263+
.headerrow:after {
264+
content: "";
265+
display: table;
266+
clear: both;
267+
}
268+
269+
/* Responsive layout - makes the three columns stack on top of each other instead of next to each other */
270+
@media screen and (max-width: 600px) {
271+
.column {
272+
width: 100%;
273+
}
274+
}
275+
276+
243277
/* OTmonitor */
244278
.otmonrow {
245279
background: lightblue;

‎data/index.html‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
<body>
1111
<font face="Arial">
1212
<!-- <div class="dev-header"> -->
13-
<div class="header">
14-
<h1>
15-
<span id="sysName">OTGW firmware</span> &nbsp; &nbsp; &nbsp;
16-
<span id="devName" style='font-size: small;'>[hostname]</span> &nbsp;
17-
<span id="devVersion" style='font-size: small;'>[version]</span>
18-
<span id='theTime' class='nav-item nav-clock'>[00:00:00]]</span>
19-
</h1>
13+
<div class="headerrow">
14+
<div class="headercolumnbig" id="sysName">OTGW firmware</div>
15+
<div class="headercolumn" id="devName">[hostname]</div>
16+
<div class="headercolumn" id="devVersion">[version]</div>
17+
<div class="headercolumn" id='theTime'>[00:00:00]</div>
2018
</div>
2119
</font>
2220
<div id="displayMainPage" style="display:none">

‎updateServerHtml.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ static const char UpdateServerIndex[] PROGMEM =
1818
</form>
1919
<hr>
2020
<br/><font color='red'>Warning!!!</font>
21-
<br/>You will lose all your files when flassing SPIFF.
22-
<br/>Basckup your files first to your local filesystem (using FSexplorer)
23-
and upload them after the flassing of your SPIFF.
21+
<br/>You will lose all your files when flashing SPIFF.
22+
<br/>Backup your files first to your local filesystem (using FSexplorer)
23+
and upload them after the flashing of your SPIFF.
2424
<hr>
2525
<br/>
2626
<br/>Wait <span style='font-size: 1.3em;' id="waitSeconds">60</span> seconds ..
27-
<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>!
28-
</body>
27+
<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>!
28+
</body>
2929
<script>
3030
var seconds = document.getElementById("waitSeconds").textContent;
3131
var countdown = setInterval(function() {
@@ -53,7 +53,7 @@ static const char UpdateServerSuccess[] PROGMEM =
5353
<br/>
5454
<br>
5555
<br/>Wait <span style='font-size: 1.3em;' id="waitSeconds">60</span> seconds ..
56-
<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>!
56+
<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>!
5757
</body>
5858
<script>
5959
var seconds = document.getElementById("waitSeconds").textContent;

‎version.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
#define _VERSION_MAJOR 0
33
#define _VERSION_MINOR 6
44
#define _VERSION_PATCH 0
5-
#define _VERSION_BUILD 404
5+
#define _VERSION_BUILD 408
66
//#define _VERSION_PRERELEASE beta //uncomment to define prerelease labels: alpha - beta - rc
77
#define _VERSION_DATE "11-01-2021"
8-
#define _VERSION_TIME "09:14:56"
8+
#define _VERSION_TIME "21:20:33"
99
#define _SEMVER_CORE "0.6.0"
10-
#define _SEMVER_BUILD "0.6.0+404"
11-
#define _SEMVER_FULL "0.6.0+404"
10+
#define _SEMVER_BUILD "0.6.0+408"
11+
#define _SEMVER_FULL "0.6.0+408"
1212
#define _SEMVER_NOBUILD "0.6.0 (11-01-2021)"
13-
#define _VERSION "0.6.0+404 (11-01-2021)"
13+
#define _VERSION "0.6.0+408 (11-01-2021)"
1414
//The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver

0 commit comments

Comments
 (0)