Мелкие доработки стилей веб-интерфейса

diff --git a/data/web/script.js b/data/web/script.js
index e9a100e145fe6dc12159334a00811b1100d7a340..247126c394ad78ad4831c3bd02e74b23db07efb6 100644 (file)
--- a/data/web/script.js
+++ b/data/web/script.js
@@ -214,12 +214,12 @@ function getWiFi(id) {
       return;
     }
     var json = JSON.parse(this.responseText)
       return;
     }
     var json = JSON.parse(this.responseText)

-    var table = '<table cellpadding="5" border="0" align="center"><thead class="table-header"><tr><td>SSID</td><td>BSSID</td><td>RSSI</td><td>Канал</td><td>Защита</td></tr></thead><tbody>'
+    var table = '<table align="center"><thead class="table-header"><tr><td>SSID</td><td>BSSID</td><td>RSSI</td><td>Канал</td><td>Защита</td></tr></thead><tbody>'

     if (!json.length) {
       setTimeout(getWiFi(id),5000);
     }
     for (idx in json) {
     if (!json.length) {
       setTimeout(getWiFi(id),5000);
     }
     for (idx in json) {

-      var encryption = json[idx].secure == 2? "TKIP" : json[idx].secure == 5? "WEP" : json[idx].secure == 4? "CCMP" : json[idx].secure == 7? "нет" : json[idx].secure == 8? "Автоматически" : "Не определено";
+      var encryption = json[idx].secure == 2? "TKIP" : json[idx].secure == 5? "WEP" : json[idx].secure == 4? "CCMP" : json[idx].secure == 7? "нет" : json[idx].secure == 8? "Авто" : "Неизв.";

       table += '<tr onclick="selectWiFi(\''+id+'\',\''+json[idx].ssid+'\')"><td>'+json[idx].ssid+'</td><td>'+json[idx].bssid+'</td><td>'+json[idx].rssi+'</td><td>'+json[idx].channel+'</td><td>'+encryption+'</td></tr>'
     }
     
       table += '<tr onclick="selectWiFi(\''+id+'\',\''+json[idx].ssid+'\')"><td>'+json[idx].ssid+'</td><td>'+json[idx].bssid+'</td><td>'+json[idx].rssi+'</td><td>'+json[idx].channel+'</td><td>'+encryption+'</td></tr>'
     }
     


@@ -346,7 +346,7 @@ function elementHTML(element) {
       value = now.toISOString().slice(0, -1);
       return '<div class="pure-u-1 pure-u-md-1-3"><label for="_ui_element_' + element.id + '">' + encode(element.label) + '</label>'
         +'<input id="_ui_element_'+element.id+'" data-ui_class="timeset" class="inline-input" type="datetime-local" value="'+value+'">'
       value = now.toISOString().slice(0, -1);
       return '<div class="pure-u-1 pure-u-md-1-3"><label for="_ui_element_' + element.id + '">' + encode(element.label) + '</label>'
         +'<input id="_ui_element_'+element.id+'" data-ui_class="timeset" class="inline-input" type="datetime-local" value="'+value+'">'

-        + '<div class="send-button" onclick="sendTime(\''+element.id+'\')">-></div></div>'
+        + '<div class="send-button" onclick="sendTime(\''+element.id+'\')">&#8594;</div></div>'

     case 'text':
       return '<div class="pure-u-1 pure-u-md-1-3"><h2 id="_ui_element_'+ element.id +'" ' + (element.color?'style="color:'+ element.color+'" ':'')+ '>' + encode(value) + '</h2></div>'
     case 'number':
     case 'text':
       return '<div class="pure-u-1 pure-u-md-1-3"><h2 id="_ui_element_'+ element.id +'" ' + (element.color?'style="color:'+ element.color+'" ':'')+ '>' + encode(value) + '</h2></div>'
     case 'number':

diff --git a/data/web/style.css b/data/web/style.css
index 877162148e010cefe5c7957058cab9d09d9d58be..e9feb429e9aa16ac1b78de6f541cbb14fb4cbe02 100644 (file)
--- a/data/web/style.css
+++ b/data/web/style.css
@@ -1310,11 +1310,19 @@ footer a {
   margin: 10% auto;
   padding: 1rem
 }
   margin: 10% auto;
   padding: 1rem
 }

+

 .table-header {
   font-weight: bold;
   font-size: 120%;
   text-align: center;
 .table-header {
   font-weight: bold;
   font-size: 120%;
   text-align: center;

-  border-bottom: var(--accent) solid 0.1em;
+}
+
+.table-header tr td {
+  border-bottom: 0.1em solid var(--light-gray)
+}
+
+.modal-content table {
+  border-spacing: 0.5em 1em;

 }
 
 /* overlapping hint button */
 }
 
 /* overlapping hint button */


@@ -1416,6 +1424,7 @@ label.switch.socket input[type=checkbox]:checked + span.slider:after {
  color: var(--dark-gray);
  border:none transparent;
  background-color: var(--light-gray);
  color: var(--dark-gray);
  border:none transparent;
  background-color: var(--light-gray);

+ margin: 0.5em 1em 0.5em 1em;

 }
 
 /* weekdays */
 }
 
 /* weekdays */


@@ -1491,7 +1500,13 @@ input[type=file]::-ms-browse {
 
 .row-button.row-button.row-button {
   display: inline-block;
 
 .row-button.row-button.row-button {
   display: inline-block;

-  margin: 0 2em 1em 2em
+}
+
+/* hr */
+
+hr {
+ margin: 0.5em 2em 0.5em 2em;
+ color: var(--accent);

 }
 
 /* fonts */
 }
 
 /* fonts */

diff --git a/ui.yml b/ui.yml
index ec261c21530873996eded596e708642578fd0db0..bc8a0f2324c5be5d672998788cc9afe0a9467749 100644 (file)
--- a/ui.yml
+++ b/ui.yml
@@ -1,6 +1,6 @@
 project:
   name: WiFi Clock
 project:
   name: WiFi Clock

-  version: 0.2.0
+  version: 0.2.1

   contacts:
     - mailto:rvb@rvb.name
     - tg:rvbglas
   contacts:
     - mailto:rvb@rvb.name
     - tg:rvbglas