diff --git a/ESP32_AP-Flasher/data/www/content_cards.json.gz b/ESP32_AP-Flasher/data/www/content_cards.json.gz index df6852ac..5a16696f 100644 Binary files a/ESP32_AP-Flasher/data/www/content_cards.json.gz and b/ESP32_AP-Flasher/data/www/content_cards.json.gz differ diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz index b2c3b440..2b23d438 100644 Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.css.gz b/ESP32_AP-Flasher/data/www/main.css.gz index 9fc127a7..7f23b3d0 100644 Binary files a/ESP32_AP-Flasher/data/www/main.css.gz and b/ESP32_AP-Flasher/data/www/main.css.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index 47a53f8c..7046a4a1 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/wwwroot/content_cards.json b/ESP32_AP-Flasher/wwwroot/content_cards.json index 04a286a0..d20db84b 100644 --- a/ESP32_AP-Flasher/wwwroot/content_cards.json +++ b/ESP32_AP-Flasher/wwwroot/content_cards.json @@ -182,7 +182,7 @@ { "id": 4, "name": "Current weather", - "desc": "Current weather. Weather data by Open-Meteo.com", + "desc": "Current weather. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, you can alter those manually.", "hwtype": [ 0, 1, @@ -202,18 +202,6 @@ "desc": "Name of the city. This is used to lookup the lat/long data, and to display as the title", "type": "text" }, - { - "key": "#lat", - "name": "Lat", - "desc": "Latitude (set automatic when generating image)", - "type": "ro" - }, - { - "key": "#lon", - "name": "Lon", - "desc": "Longitude (set automatic when generating image)", - "type": "ro" - }, { "key": "units", "name": "Units", @@ -223,13 +211,31 @@ "0": "-Celcius / Beaufort / millimeters", "1": "Fahrenheit / mph / millimeters" } + }, + { + "key": "#lat", + "name": "Lat", + "desc": "Latitude (set automatic when generating image)", + "type": "text" + }, + { + "key": "#lon", + "name": "Lon", + "desc": "Longitude (set automatic when generating image)", + "type": "text" + }, + { + "key": "#tz", + "name": "Time zone", + "desc": "Time zone (set automatic when generating image)", + "type": "text" } ] }, { "id": 8, "name": "Weather forecast", - "desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com", + "desc": "Weather forecast for the next five days. Weather data by Open-Meteo.com. Parameters Lat, Lon and Time Zone are filled automatically from the entered location. In case of an ambiguous location, you can alter those manually.", "hwtype": [ 1, 2, @@ -247,18 +253,6 @@ "desc": "Name of the city. This is used to lookup the lat/long data, and to display as the title", "type": "text" }, - { - "key": "#lat", - "name": "Lat", - "desc": "Latitude (set automatic when generating image)", - "type": "ro" - }, - { - "key": "#lon", - "name": "Lon", - "desc": "Longitude (set automatic when generating image)", - "type": "ro" - }, { "key": "units", "name": "Units", @@ -268,6 +262,24 @@ "0": "-Celcius / Beaufort / millimeters", "1": "Fahrenheit / mph / millimeters" } + }, + { + "key": "#lat", + "name": "Lat", + "desc": "Latitude (set automatic when generating image)", + "type": "text" + }, + { + "key": "#lon", + "name": "Lon", + "desc": "Longitude (set automatic when generating image)", + "type": "text" + }, + { + "key": "#tz", + "name": "Time zone", + "desc": "Time zone (set automatic when generating image)", + "type": "text" } ] }, diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html index c83b115e..c5306387 100644 --- a/ESP32_AP-Flasher/wwwroot/index.html +++ b/ESP32_AP-Flasher/wwwroot/index.html @@ -168,9 +168,10 @@
-
+
+
diff --git a/ESP32_AP-Flasher/wwwroot/main.css b/ESP32_AP-Flasher/wwwroot/main.css index 12088327..740b5b4d 100644 --- a/ESP32_AP-Flasher/wwwroot/main.css +++ b/ESP32_AP-Flasher/wwwroot/main.css @@ -510,8 +510,8 @@ select { width: 225px; position: relative; min-height: 170px; - margin: 5px; - padding: 5px; + margin: 3px; + padding: 4px 5px 5px 8px; background-color: #ffffff; border: 1px solid #cccccc; transition: box-shadow 0.3s ease; @@ -537,7 +537,7 @@ select { background-color: #6d6e6e; color: white; padding: 5px; - margin: 0px 5px; + margin: 0px 3px; } .currimg { @@ -552,7 +552,12 @@ select { .mac { font-size: 0.9em; - cursor: pointer; + line-height: 1.25; +} + +.model { + font-size: 0.9em; + line-height: 1.25; } .alias { @@ -561,12 +566,19 @@ select { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + padding-bottom: 4px; +} + +.resolution { + font-size: 0.9em; + line-height: 1.25; } .received { display: flex; - font-size: .85em; + font-size: .9em; padding-bottom: 5px; + line-height: 1.25; } .received div { diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index 03dcdd35..c64ad104 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -232,6 +232,7 @@ function processTags(tagArray) { const localTagmac = tagmac; const data = await getTagtype(element.hwType); $('#tag' + localTagmac + ' .model').innerHTML = data.name; + $('#tag' + localTagmac + ' .resolution').innerHTML = data.width + "x" + data.height; })(); let statusline = ""; if (element.RSSI != 100) { @@ -253,6 +254,7 @@ function processTags(tagArray) { } else { $('#tag' + tagmac + ' .model').innerHTML = "waiting for hardware type"; $('#tag' + tagmac + ' .received').style.opacity = "0"; + $('#tag' + tagmac + ' .resolution').innerHTML = ""; } if (!apConfig.preview || element.contentMode == 20) {