diff --git a/code/components/jomjol_fileserver_ota/server_help.cpp b/code/components/jomjol_fileserver_ota/server_help.cpp index 4bb06ffa..b9ce1b0a 100644 --- a/code/components/jomjol_fileserver_ota/server_help.cpp +++ b/code/components/jomjol_fileserver_ota/server_help.cpp @@ -120,6 +120,8 @@ esp_err_t set_content_type_from_file(httpd_req_t *req, const char *filename) return httpd_resp_set_type(req, "image/x-icon"); } else if (IS_FILE_EXT(filename, ".js")) { return httpd_resp_set_type(req, "text/javascript"); + } else if (IS_FILE_EXT(filename, ".css")) { + return httpd_resp_set_type(req, "text/css"); } /* This is a limited set only */ /* For any other type always set as plain text */ diff --git a/code/platformio.ini b/code/platformio.ini index 987e58e5..f46a9345 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -45,3 +45,6 @@ monitor_rts = 0 monitor_dtr = 0 debug_tool = esp-prog + +; Enable and adapt for logging over USB +;upload_port = /dev/ttyUSB0 \ No newline at end of file diff --git a/sd-card/html/common.js b/sd-card/html/common.js new file mode 100644 index 00000000..0804cce6 --- /dev/null +++ b/sd-card/html/common.js @@ -0,0 +1,31 @@ + +var basepath = "http://192.168.178.22"; + +function LoadHostname() { + _basepath = getbasepath(); + + + var xhttp = new XMLHttpRequest(); + xhttp.addEventListener('load', function(event) { + if (xhttp.status >= 200 && xhttp.status < 300) { + hostname = xhttp.responseText; + document.title = hostname + " - jomjol - AI on the edge"; + document.getElementById("id_title").innerHTML = "Digitizer - AI on the edge - " + hostname; + } + else { + console.warn(request.statusText, request.responseText); + } + }); + +// var xhttp = new XMLHttpRequest(); + try { + url = _basepath + '/version?type=Hostname'; + xhttp.open("GET", url, true); + xhttp.send(); + + } + catch (error) + { +// alert("Loading Hostname failed"); + } +} diff --git a/sd-card/html/edit_alignment.html b/sd-card/html/edit_alignment.html index 166231b1..f0488261 100644 --- a/sd-card/html/edit_alignment.html +++ b/sd-card/html/edit_alignment.html @@ -86,7 +86,10 @@ select { - + + + +
@@ -107,7 +110,17 @@ select { basepath = "http://192.168.178.26"; basepath = "", param; - + +function doReboot() { + if (confirm("Are you sure you want to reboot? Did you save the config?")) { + var stringota = "/reboot"; + window.location = stringota; + window.location.href = stringota; + window.location.assign(stringota); + window.location.replace(stringota); + } +} + function ChangeSelection(){ aktindex = parseInt(document.getElementById("index").value); UpdateReference(); diff --git a/sd-card/html/edit_analog.html b/sd-card/html/edit_analog.html index 61d4237c..572cd094 100644 --- a/sd-card/html/edit_analog.html +++ b/sd-card/html/edit_analog.html @@ -129,6 +129,9 @@ th, td { + + + @@ -147,8 +150,17 @@ th, td { enhanceCon = false; lockAR = true; basepath = "http://192.168.178.26"; - - + +function doReboot() { + if (confirm("Are you sure you want to reboot? Did you save the config?")) { + var stringota = "/reboot"; + window.location = stringota; + window.location.href = stringota; + window.location.assign(stringota); + window.location.replace(stringota); + } +} + function EnDisableAnalog() { isEnabled = document.getElementById("Category_Analog_enabled").checked; diff --git a/sd-card/html/edit_digits.html b/sd-card/html/edit_digits.html index 711db2f1..6a62566a 100644 --- a/sd-card/html/edit_digits.html +++ b/sd-card/html/edit_digits.html @@ -119,6 +119,9 @@ th, td { + + +
@@ -140,6 +143,15 @@ th, td { lockAR = true; basepath = "http://192.168.178.26"; + function doReboot() { + if (confirm("Are you sure you want to reboot? Did you save the config?")) { + var stringota = "/reboot"; + window.location = stringota; + window.location.href = stringota; + window.location.assign(stringota); + window.location.replace(stringota); + } + } function EnDisableDigits() { isEnabled = document.getElementById("Category_Digits_enabled").checked; diff --git a/sd-card/html/edit_explain_0.html b/sd-card/html/edit_explain_0.html index 338797b9..c90bff3c 100644 --- a/sd-card/html/edit_explain_0.html +++ b/sd-card/html/edit_explain_0.html @@ -7,9 +7,6 @@ + + + + - + +
@@ -82,72 +24,35 @@ li.dropdown {
-

- -

- -
- - - - + +
+ diff --git a/sd-card/html/index_configure.html b/sd-card/html/index_configure.html index 19afc3b9..2755a792 100644 --- a/sd-card/html/index_configure.html +++ b/sd-card/html/index_configure.html @@ -5,73 +5,11 @@ jomjol - AI on the edge - - - - + +
@@ -81,62 +19,43 @@ li.dropdown {
-

-

- -
- + + + + + + +
+ diff --git a/sd-card/html/style.css b/sd-card/html/style.css new file mode 100644 index 00000000..4d8db3eb --- /dev/null +++ b/sd-card/html/style.css @@ -0,0 +1,100 @@ +body, html { + width: 100%; + height: 100%; + min-height: 800px; + margin: 0px 0px 0px 2px; + padding: 0; + font-family: arial; + width: fit-content; +} + +.main { + display: flex; + width: 100%; + height: 100%; + flex-direction: column; + overflow: hidden; +} + +.iframe { + flex-grow: 1; + margin: 5px 7px 4px 0px; + padding: 0; + border: 2px solid black; +} + +h1 { + font-size: 2em; + margin-block-end: 0.3em; +} + +h2 { + font-size: 1.5em; + margin-block-start: 0.3em; +} + +h3 { + font-size: 1.2em; +} + +p { + font-size: 1em; +} + +ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; + width:1000px; +} + +li { + float: left; + font-family: arial; + font-size: 18px; +} + +li a, .dropbtn { + display: inline-block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + +li a:hover, .dropdown:hover .dropbtn { + background-color: red; +} + +li.dropdown { + display: inline-block; +} + +.dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); + z-index: 1; + font-family: arial; +} + +.dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; + text-align: left; +} + +.dropdown-content a:hover { + color: white; + background-color: red; +} + +.dropdown:hover .dropdown-content { + display: block; +}