diff --git a/HTML/control.html b/HTML/control.html deleted file mode 100644 index a9ed41e..0000000 --- a/HTML/control.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - ~name~ - - - - -
-
- - - - - - - - - - - - - -
Ethernet:?
WiFi:?
GPRS:?
LoRaWAN:?
Основной адаптер:?
MQTT соединение 1:?
MQTT соединение 2:?
Свободной памяти:?
Минимум памяти:?
-
-
-
- -

- -

- -

- -

- -

- -

-
-
-
-
- - - \ No newline at end of file diff --git a/HTML/espfs.paths b/HTML/espfs.paths index ba384c9..9a08e7d 100644 --- a/HTML/espfs.paths +++ b/HTML/espfs.paths @@ -9,7 +9,6 @@ api/set3.json api/stat.json api/status.json api/tmr.json -control.html favicon.ico iconsfont.css iconsfont.woff2 @@ -19,11 +18,7 @@ reboot.html res res.js res/ca_cert.pem -set_eth.html -set_gprs.html -set_mqtt.html -set_network.html -set_sys.html -set_time.html -set_wifi.html +set_adapters.html +set_services.html +set_system.html styles.css \ No newline at end of file diff --git a/HTML/res.js b/HTML/res.js index eeb4e14..7072f1a 100644 --- a/HTML/res.js +++ b/HTML/res.js @@ -21,34 +21,17 @@ var hedmen = `
- APPLICATION1 + APPLICATION
- App1 - App2 - App3 + Menu1 + Menu2 + Menu3
-
- -
- - - APPLICATION2 - - - -
-
- App1 - App2 - App3 -
-
-
@@ -58,17 +41,14 @@ var hedmen = `
- NETWORK + CONNECTION
- Network - Ethernet - WiFi - GPRS - MQTT + Adapters + Services
@@ -82,9 +62,7 @@ var hedmen = `
- System - Time - Control + System
diff --git a/HTML/set_network.html b/HTML/set_adapters.html similarity index 100% rename from HTML/set_network.html rename to HTML/set_adapters.html diff --git a/HTML/set_eth.html b/HTML/set_eth.html deleted file mode 100644 index 1148a1f..0000000 --- a/HTML/set_eth.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - ~name~ - - - - -
-
-
- - -

- - -
-
-
- - - \ No newline at end of file diff --git a/HTML/set_gprs.html b/HTML/set_gprs.html deleted file mode 100644 index 315209d..0000000 --- a/HTML/set_gprs.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - ~name~ - - - - -
-
-
- - -

- - -
-
-
- - - \ No newline at end of file diff --git a/HTML/set_mqtt.html b/HTML/set_services.html similarity index 54% rename from HTML/set_mqtt.html rename to HTML/set_services.html index 4f474a7..01dfd50 100644 --- a/HTML/set_mqtt.html +++ b/HTML/set_services.html @@ -14,7 +14,38 @@
-
+
+ +
+
+ +

SNTP

+ + + + +
Включить SNTP клиент
Адрес SNTP сервера:
+ + +
+ Установить текущее время вручную:
+ +


+
+
+ +

Ошибка формата данных!


+
+ +
+ +
+
+ +
+
+
+

MQTT

-
+ PrintSaveBtn(); +
+
+ +
- - ~name~ - - - - -
-
-
-
- - -
URL файла обновления:
-
- -
- - Data format error!
-
- -

- -
-
-
-
- - - \ No newline at end of file diff --git a/HTML/set_system.html b/HTML/set_system.html new file mode 100644 index 0000000..e844115 --- /dev/null +++ b/HTML/set_system.html @@ -0,0 +1,99 @@ + + + + + + + + + + ~name~ + + + + +
+
+
+ +
+
+
+

SYSTEM

+
+ + +
URL файла обновления:
+
+ + + + +
+
+
+ +
+
+
+

STAT

+ + + + + + + + + + + + + +
Ethernet:?
WiFi:?
GPRS:?
LoRaWAN:?
Основной адаптер:?
MQTT соединение 1:?
MQTT соединение 2:?
Свободной памяти:?
Минимум памяти:?
+
+
+
+ +
+
+
+

CONTROL

+
+
+ +

+ +

+ +

+ +

+ +

+ +

+
+
+
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/HTML/set_time.html b/HTML/set_time.html deleted file mode 100644 index 249b898..0000000 --- a/HTML/set_time.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - ~name~ - - - - -
-
-
-
- - - - -
Включить SNTP клиент
Адрес SNTP сервера:
- - - - -
- Установить текущее время вручную:
- -


-
- -
- -

Ошибка формата данных!


-
- -
-
-
-
-
- - - \ No newline at end of file diff --git a/HTML/set_wifi.html b/HTML/set_wifi.html deleted file mode 100644 index c15e199..0000000 --- a/HTML/set_wifi.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - ~name~ - - - - -
-
-
- - - - - -
Включить WiFi
Режим WiFiКлиент(CLN)
Точка доступа(AP)

- - -
-
-
- - - \ No newline at end of file diff --git a/HTML/styles.css b/HTML/styles.css index 3911fd3..1604af9 100644 --- a/HTML/styles.css +++ b/HTML/styles.css @@ -8,12 +8,12 @@ /*========== Colors ==========*/ --first-color: #FFFFFF; - --first-color-light: #D6DBDF ; - --title-color: #85929E; + --first-color-light: #90C0E0; + --title-color: #336699; --text-color: #444444; - --text-color-light: #85929E; + --text-color-light: #336699; --body-color: #FFFFFF; - --container-color: #AEB6BF; + --container-color: #3399CC; /*========== Font and typography ==========*/ --body-font: 'Arial', sanf-serif; @@ -327,6 +327,7 @@ input { font:14px consolas,monospace; padding-left:3px; border:solid 1px #CCCCCC; + height:2.0rem; } .cntr { diff --git a/components/webguiapp b/components/webguiapp index ccf93b6..936d2db 160000 --- a/components/webguiapp +++ b/components/webguiapp @@ -1 +1 @@ -Subproject commit ccf93b696a1d7144ae62b87363751b7d2a8924ec +Subproject commit 936d2db0807024fc99c6fe92c1ca46ac315072e7