From 12a15dceedbe96d147bf2d1e4ed80bc098009176 Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Fri, 26 Aug 2022 18:07:07 +0200
Subject: [PATCH] design and styles for the new web interface

---
 HTML/{set_adapters.html => adapters.html} |  16 ++++---
 HTML/espfs.paths                          |   9 ++--
 HTML/index.html                           |   6 +--
 HTML/logo.png                             | Bin 0 -> 10213 bytes
 HTML/res.js                               |  12 +++---
 HTML/{set_services.html => services.html} |   4 +-
 HTML/styles.css                           |  50 ++++++++++++++--------
 HTML/{set_system.html => system.html}     |  27 ++++++------
 components/webguiapp                      |   2 +-
 9 files changed, 72 insertions(+), 54 deletions(-)
 rename HTML/{set_adapters.html => adapters.html} (90%)
 create mode 100644 HTML/logo.png
 rename HTML/{set_services.html => services.html} (97%)
 rename HTML/{set_system.html => system.html} (77%)

diff --git a/HTML/set_adapters.html b/HTML/adapters.html
similarity index 90%
rename from HTML/set_adapters.html
rename to HTML/adapters.html
index 6e99446..eccc81c 100644
--- a/HTML/set_adapters.html
+++ b/HTML/adapters.html
@@ -19,7 +19,7 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				 <form name="conf1" method="post">
-				<h3>Ethernet</h3>				  
+				<div class="mlhdr">ETHERNET</div>				  
 				<table class='cntr'><tr>
 				<script>PrintCheckBox('Включить ETHERNET','ethen','~ethen~','configIPBoxes()');
 				PrintCheckBox('Включить DHCP','dhcp','~ecbdh~','configIPBoxes()');
@@ -40,12 +40,16 @@
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-					<form name="conf2" method="post">
-					<h3>WiFi</h3>
+				<form name="conf2" method="post">
+				<div class="mlhdr">WiFi</div>
 				<table class='cntr'>
 				<tr><td class='rl'>Включить WiFi</td><td><input type="checkbox" name="wifien" value="1"  ~wfen~/></td></tr>
-				<td class='rl'>Режим WiFi</td></td><td><input name="netm" type="radio" value="2" onclick="configIPBoxes()" ~cln~>Клиент(CLN)</input></td></tr>
-				<tr><td></td><td><input name="netm" type="radio" value="1" onclick="configIPBoxes()" ~apn~>Точка доступа(AP)</input></td></tr>
+				
+				
+				<tr><td class='rl'>Режим WiFi:</td><td><input name="netm" type="radio" value="2" onclick="configIPBoxes()" ~cln~>Клиент(CLN)</input></br>
+				<input name="netm" type="radio" value="1" onclick="configIPBoxes()" ~apn~>Точка доступа(AP)</input></td></tr>
+				
+				
 				<script>PrintTextInput('Имя WiFi сети(AP):','wfiap','~ssidap~',3,31);
 				PrintTextInput('Ключ WiFi сети(AP):','wfpap','~wkeyap~',8,31);
 				PrintIPInput('IP адрес(AP):','ipaap','~ipap~');
@@ -70,7 +74,7 @@
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-				<h3>GPRS</h3>
+				<div class="mlhdr">GPRS</div>
 				<form name="conf3" method="post">			
 				<table class='cntr'>
 				<script>PrintCheckBox('Включить GSM','gsmen','~gsmen~',null);
diff --git a/HTML/espfs.paths b/HTML/espfs.paths
index 9a08e7d..97044b2 100644
--- a/HTML/espfs.paths
+++ b/HTML/espfs.paths
@@ -1,3 +1,4 @@
+adapters.html
 api
 api/dbg.json
 api/dbg2.json
@@ -13,12 +14,12 @@ favicon.ico
 iconsfont.css
 iconsfont.woff2
 index.html
+logo.png
 main.js
 reboot.html
 res
 res.js
 res/ca_cert.pem
-set_adapters.html
-set_services.html
-set_system.html
-styles.css
\ No newline at end of file
+services.html
+styles.css
+system.html
\ No newline at end of file
diff --git a/HTML/index.html b/HTML/index.html
index 8588d8a..e8c0a3a 100644
--- a/HTML/index.html
+++ b/HTML/index.html
@@ -21,20 +21,20 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				
-				<h3>Application1</h3>				  
+				<div class="mlhdr">Application 1</div>				  
 			
 				</div>
 			  </div>
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-				<h3>Application2</h3>
+				<div class="mlhdr">Application 2</div>
 				</div>
 			  </div>
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-				<h3>Application3</h3>
+				<div class="mlhdr">Application 3</div>
 				</div>
 			  </div>
 
diff --git a/HTML/logo.png b/HTML/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7fc39a871f36006f0ab3c4279d726cb1eed041
GIT binary patch
literal 10213
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
R`uERO20$a-Ms26q{{v(0)71a~

literal 0
HcmV?d00001

diff --git a/HTML/res.js b/HTML/res.js
index 7072f1a..52cdfe1 100644
--- a/HTML/res.js
+++ b/HTML/res.js
@@ -1,7 +1,7 @@
 var hedmen = `
         <header class="header">
             <div class="header__container">
-                <img src="youlogo.gif" alt="LOGO" class="header__img">
+                <img src="logo.png" alt="LOGO" class="header__img"/>
                 <a href="index.html" class="header__logo">YouDevice</a>
                 <div class="header__toggle">
                     <i class='icon-menu' id="header-toggle"></i>
@@ -47,8 +47,8 @@ var hedmen = `
 
                                 <div class="nav__dropdown-collapse">
                                     <div class="nav__dropdown-content">
-										<a href="set_network.html" class="nav__dropdown-item">Adapters</a>
-										<a href="set_services.html" class="nav__dropdown-item">Services</a>
+										<a href="adapters.html" class="nav__dropdown-item">Adapters</a>
+										<a href="services.html" class="nav__dropdown-item">Services</a>
                                     </div>
                                 </div>
 
@@ -56,13 +56,13 @@ var hedmen = `
 							<div class="nav__dropdown">
 								<a href="#" class="nav__link">
                                     <i class='icon-cog-alt nav__icon' ></i>
-                                    <span class="nav__name">STSTEM</span>
+                                    <span class="nav__name">DEVICE</span>
                                     <i class='icon-down-open nav__icon nav__dropdown-icon'></i>
                                 </a>
 
                                 <div class="nav__dropdown-collapse">
                                     <div class="nav__dropdown-content">
-                                        <a href="set_system.html" class="nav__dropdown-item">System</a>
+                                        <a href="system.html" class="nav__dropdown-item">Maintain</a>
                                     </div>
                                 </div>
 							</div>
@@ -84,7 +84,7 @@ function PrintMACInput(title,name,value){document.write("<tr><td class='rl'>"+ti
 function PrintTextInput(title,name,value,min,max){document.write("<tr><td class='rl'>"+title+"</td><td><input type='text' required size='20' name='"+name+"' value="+value+" title='"+min+"-"+max+" символов A-Za-z0-9_\-*!<>)(.@,/'  pattern='^[0-9a-zA-Z_\\-*!<>.@\,/)(\s]{"+min+","+max+"}$' /></td></tr>");}
 function PrintHexInput(title,name,value,min,max){document.write("<tr><td class='rl'>"+title+"</td><td><input type='text' required size='20' name='"+name+"' value="+value+" title='"+min+"-"+max+" символов A-Fa-f0-9'  pattern='^[0-9a-fA-F]{"+min+","+max+"}$' /></td></tr>");}
 function PrintTextInputNoReg(title,name,value,min,max){document.write("<tr><td class='rl'>"+title+"</td><td><input type='text' required size='20' name='"+name+"' value="+value+" title='"+min+"-"+max+" символов'/></td></tr>");}
-function PrintLabel(title,value){document.write("<tr><td class='rl'>"+title+"</td><td align='left'>"+value+"</td></tr>");}
+function PrintLabel(title,value){document.write("<tr><td class='rl lab'>"+title+"</td><td align='left' class='lab'>"+value+"</td></tr>");}
 function PrintSpanLabel(title,idx){document.write("<tr><td class='rl'>"+title+"</td><td align='left'><span id='"+idx+"'>?</span></td></tr>");}
 function PrintCheckBox(title,name,checked,action){document.write("<tr><td class='rl'>"+title+"</td><td><input type='checkbox' name='"+name+"' value='1' onclick="+action+" "+checked+" /></td></tr>");}
 function PrintInt(title,name,value,min,max){document.write("<tr><td class='rl'>"+title+"</td><td><input type='number' required min='"+min+"' max='"+max+"' name='"+name+"' value ='"+value+"'/></td></tr>");}
diff --git a/HTML/set_services.html b/HTML/services.html
similarity index 97%
rename from HTML/set_services.html
rename to HTML/services.html
index 01dfd50..9a488e1 100644
--- a/HTML/set_services.html
+++ b/HTML/services.html
@@ -19,7 +19,7 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				 <form name="conf1" method="post">
-				<h3>SNTP</h3>				  
+				<div class="mlhdr">SNTP</div>				  
 									
 				<table class='cntr'>
 				<tr><td class='rl'>Включить SNTP клиент</td><td><input type="checkbox" name="sntpen" value="1" ~sntpen~></td></tr>
@@ -45,7 +45,7 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				<form name="conf2" method="post">
-				<h3>MQTT</h3>
+				<div class="mlhdr">MQTT</div>
 				<table class='cntr'>
 				<script>PrintCheckBox('Включить MQTT 1','mqttenb1','~mqtten1~',null);
 				PrintTextInput('URL шлюза сообщений','cld1','~ipcld1~',3,31);
diff --git a/HTML/styles.css b/HTML/styles.css
index 1604af9..6c05c91 100644
--- a/HTML/styles.css
+++ b/HTML/styles.css
@@ -1,6 +1,3 @@
-/*========== GOOGLE FONTS ==========*/
-
-
 /*========== VARIABLES CSS ==========*/
 :root {
   --header-height: 3.5rem;
@@ -10,10 +7,10 @@
   --first-color: #FFFFFF;
   --first-color-light: #90C0E0;
   --title-color: #336699;
-  --text-color: #444444;
+  --text-color: #404040;
   --text-color-light: #336699;
   --body-color: #FFFFFF;
-  --container-color: #3399CC;
+  --container-color: #90C0E0;
 
   /*========== Font and typography ==========*/
   --body-font: 'Arial', sanf-serif;
@@ -210,6 +207,7 @@ img {
   font-size: var(--smaller-font-size);
   font-weight: var(--font-medium);
   color: var(--text-color);
+  margin: 5px 3px;
 }
 
 .nav__dropdown-item:hover {
@@ -316,25 +314,43 @@ img {
   }
 }
 
-.btn {color:var(--text-color);
-		font: 14px consolas,monospace;padding:15px 5px;
-		min-width:100px;
-		border-style:border:solid 1px #CCCCCC;;
-}
+.rl{text-align:right;}
 
-input {
-	color:#000;
-	font:14px consolas,monospace;
+
+
+input, .btn, .lab, textarea {
+	font:.8rem consolas,monospace;
 	padding-left:3px;
 	border:solid 1px #CCCCCC;
+	border-radius: 5px;
 	height:2.0rem;
+	margin: 3px 3px;
+	vertical-align: middle;
+}
+
+.btn{min-width:100px;}
+.btn:active{background-color:  #CCCCCC;}
+.btn:hover {border:solid 1px #999999;}
+
+.lab {border: none;}
+
+textarea {
+	height: 3.0rem;
+	width: auto;
+	margin:10px;
+	vertical-align: top;
 }
 
 .cntr {
-		   margin:auto;
-		   color:#000;
-		   font:14px consolas, monospace;}
-		   
+   margin:auto;
+   font: .8rem consolas, monospace;}
+
+.mlhdr {
+	font:16px consolas,monospace;
+	font-weight:bold;
+	color: var(--title-color);
+	margin: auto;
+}		   
 
 .masonry-layout__panel {
   break-inside: avoid;
diff --git a/HTML/set_system.html b/HTML/system.html
similarity index 77%
rename from HTML/set_system.html
rename to HTML/system.html
index e844115..41fb799 100644
--- a/HTML/set_system.html
+++ b/HTML/system.html
@@ -19,12 +19,10 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				 <form name="conf1" method="post">
-				<h3>SYSTEM</h3>				  
+				<div class="mlhdr">SYSTEM</div>				  
 				<table class='cntr'><script>PrintTextInputNoReg('Имя устройства:','nam','~dname~', 3, 31 );
 				PrintTextInput('Имя пользователя:','lgn','~login~', 3, 31 );
-				PrintTextInput('Пароль пользователя','psn','~pass~', 5, 31 );
-				PrintCheckBox('Подтверждать TCP','tcpdel','~tcpdel~',null);
-				PrintCheckBox('Подтверждать LoRaWAN','lrdel','~lrdel~',null);
+				PrintTextInput('Пароль пользователя:','psn','~pass~', 5, 31 );
 				PrintCheckBox('Включить OTA обновление','ota','~ota~',null);</script></table>
 				<table class='cntr'><tr><td align="center">URL файла обновления:</td></tr>
 				<tr><td align="center"><textarea type="text" cols="40" raws="5" name='otaurl'  title="64 символа" ">~otaurl~</textarea></td></tr>
@@ -46,20 +44,19 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				<form name="conf2" method="post">
-				<h3>STAT</h3>
+				<div class="mlhdr">STAT</div>
 				<table class='cntr'>
-				<tr><td class='rl'>Ethernet:</td><td><span id='eth'>?</span></td></tr>
-				<tr><td class='rl'>WiFi:</td><td><span id='wfi'>?</span></td></tr>
-				<tr><td class='rl'>GPRS:</td><td><span id='gpr'>?</span></td></tr>
-				<tr><td class='rl'>LoRaWAN:</td><td><span id='lrw'>?</span></td></tr>
+				<tr><td class='rl lab'>Ethernet:</td><td><span id='eth'>?</span></td></tr>
+				<tr><td class='rl lab'>WiFi:</td><td><span id='wfi'>?</span></td></tr>
+				<tr><td class='rl lab'>GPRS:</td><td><span id='gpr'>?</span></td></tr>
 				<tr><td height='20px'></td></tr>
-				<tr><td class='rl'>Основной адаптер:</td><td><span id='adp'>?</span></td></tr>
+				<tr><td class='rl lab'>Основной адаптер:</td><td><span id='adp'>?</span></td></tr>
 				<tr><td height='20px'></td></tr>
-				<tr><td class='rl'>MQTT соединение 1:</td><td><span id='mq1'>?</span></td></tr>
-				<tr><td class='rl'>MQTT соединение 2:</td><td><span id='mq2'>?</span></td></tr>
+				<tr><td class='rl lab'>MQTT соединение 1:</td><td><span id='mq1'>?</span></td></tr>
+				<tr><td class='rl lab'>MQTT соединение 2:</td><td><span id='mq2'>?</span></td></tr>
 				<tr><td height='20px'></td></tr>
-				<tr><td class='rl'>Свободной памяти:</td><td><span id='mem'>?</span></td></tr>
-				<tr><td class='rl'>Минимум памяти:</td><td><span id='mmem'>?</span></td></tr>
+				<tr><td class='rl lab'>Свободной памяти:</td><td><span id='mem'>?</span></td></tr>
+				<tr><td class='rl lab'>Минимум памяти:</td><td><span id='mmem'>?</span></td></tr>
 				</table>
 				</form>
 				</div>
@@ -68,7 +65,7 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				<form name="conf2" method="post">
-				<h3>CONTROL</h3>
+				<div class="mlhdr">CONTROL</div>
 				<div style='margin:auto;text-align:center'>
 				</br>
 				<button type="submit" class ='btn' name='cmd' value='1'>BAT ON</button>
diff --git a/components/webguiapp b/components/webguiapp
index 936d2db..4b4b4cd 160000
--- a/components/webguiapp
+++ b/components/webguiapp
@@ -1 +1 @@
-Subproject commit 936d2db0807024fc99c6fe92c1ca46ac315072e7
+Subproject commit 4b4b4cda4267f2251c0a5fb9668f74c3887d80d7