From 2a8e2ae715bb8aa9d1959a62241289844bf060c8 Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Sun, 28 Aug 2022 13:27:10 +0200
Subject: [PATCH] save and apply buttons in web interface, some styles fixed
 for better looks

---
 HTML/adapters.html   | 12 ++++++------
 HTML/res.js          |  5 +++--
 HTML/styles.css      |  8 +++++---
 components/webguiapp |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/HTML/adapters.html b/HTML/adapters.html
index eccc81c..83a0638 100644
--- a/HTML/adapters.html
+++ b/HTML/adapters.html
@@ -18,7 +18,7 @@
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-				 <form name="conf1" method="post">
+				 <form name="eth" method="post">
 				<div class="mlhdr">ETHERNET</div>				  
 				<table class='cntr'><tr>
 				<script>PrintCheckBox('Включить ETHERNET','ethen','~ethen~','configIPBoxes()');
@@ -33,14 +33,14 @@
 				<tr><td></td></tr></table><br/>	
 				
 				<script>PrintSaveFail('~status_fail~');
-				PrintSaveBtn();</script>				
+				PrintSaveBtn('eth'); PrintApplyBtn('eth');</script>				
 				</form>
 				</div>
 			  </div>
 			  
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
-				<form name="conf2" method="post">
+				<form name="wifi" 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>
@@ -67,7 +67,7 @@
 				<tr><td></td></tr></table><br/>	
 			
 				<script>PrintSaveFail('~status_fail~');
-				PrintSaveBtn();</script>			
+				PrintSaveBtn('wifi'); PrintApplyBtn('wifi');</script>			
 				</form>
 				</div>
 			  </div>
@@ -75,7 +75,7 @@
 			  <div class="masonry-layout__panel">
 				<div class="masonry-layout__panel-content">
 				<div class="mlhdr">GPRS</div>
-				<form name="conf3" method="post">			
+				<form name="gprs" method="post">			
 				<table class='cntr'>
 				<script>PrintCheckBox('Включить GSM','gsmen','~gsmen~',null);
 				PrintLabel('Модуль:','~gsmmod~');
@@ -90,7 +90,7 @@
 				PrintLabel('DNS3:','~flgsmdns~');</script>
 				<tr><td></td></tr></table><br/>	
 				<script>PrintSaveFail('~status_fail~');
-				PrintSaveBtn();</script>				
+				PrintSaveBtn('gprs'); PrintApplyBtn('gprs');</script>				
 				</form>
 				</div>
 			  </div>
diff --git a/HTML/res.js b/HTML/res.js
index 52cdfe1..e6f4676 100644
--- a/HTML/res.js
+++ b/HTML/res.js
@@ -90,5 +90,6 @@ function PrintCheckBox(title,name,checked,action){document.write("<tr><td class=
 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>");}
 function PrintIntId(title,id,value,min,max){document.write("<tr><td class='rl'>"+title+"</td><td><input type='number' required min='"+min+"' max='"+max+"' id='"+id+"' value ='"+value+"'/></td></tr>");}
 function PrintSep(){document.write("<tr><td height='20px'></td></tr>");}
-function PrintSaveBtn(){document.write("<div style='text-align:center;margin-top:10px'><button type='submit' class='btn' name='sav' value='prs'>Сохранить</button></div>");}
-function PrintSaveFail(isfail){document.write("<div class='resfail' style='text-align:center;display:"+isfail+"' color='#F00'><font color='red'><h4>Неверный формат данных!</h4></font><br/></div>");}
+function PrintSaveBtn(form){document.write("<button type='submit' class='btn' name='save' value='"+form+"'>Save</button>");}
+function PrintApplyBtn(form){document.write("<button type='submit' class='btn' name='apply' value='"+form+"'>Apply</button>");}
+function PrintSaveFail(isfail){document.write("<div class='resfail' style='text-align:center;display:"+isfail+"' color='#F00'><font color='red'><h4>Wrong data format!</h4></font><br/></div>");}
diff --git a/HTML/styles.css b/HTML/styles.css
index ca5126c..23a1874 100644
--- a/HTML/styles.css
+++ b/HTML/styles.css
@@ -42,7 +42,7 @@
 
 body {
   margin: var(--header-height) 0 0 0;
-  padding: 1rem 1rem 0;
+  padding: 0 0 0;
   font-family: var(--body-font);
   font-size: var(--normal-font-size);
   background-color: var(--body-color);
@@ -249,7 +249,7 @@ img {
 
 @media screen and (min-width: 768px) {
   body {
-    padding: 1rem 3rem 0 5rem;
+    padding: 0 0 0 5rem;
   }
   .header {
     padding: 0 3rem 0 5rem;
@@ -353,9 +353,11 @@ textarea {
 
 .masonry-layout__panel {
   break-inside: avoid;
+  padding:5px;
+  
 }
 .masonry-layout__panel-content {
-  margin: 10px 0 0 10px;
+  margin: 10px 0;
   padding: 10px;
   border-radius: 10px;
   border:solid 1px #CCCCCC;
diff --git a/components/webguiapp b/components/webguiapp
index 876f7da..34be6b7 160000
--- a/components/webguiapp
+++ b/components/webguiapp
@@ -1 +1 @@
-Subproject commit 876f7dada9ab0f77090a47a76f43db0d1883b522
+Subproject commit 34be6b7dab4f342fcf2d8778471ea7bb357c53c2