From 6d3be4253d91ef9289fa4f3b7e280b2258fabaf1 Mon Sep 17 00:00:00 2001 From: Roman Bazalevskiy <rvb@rvb.name> Date: Mon, 21 Nov 2022 08:29:52 +0300 Subject: [PATCH] =?utf8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B4?= =?utf8?q?=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20=D1=81=D1=82?= =?utf8?q?=D0=B8=D0=BB=D0=B5=D0=B9=20=D0=B2=D0=B5=D0=B1-=D0=B8=D0=BD=D1=82?= =?utf8?q?=D0=B5=D1=80=D1=84=D0=B5=D0=B9=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- data/web/script.js | 6 +++--- data/web/style.css | 19 +++++++++++++++++-- ui.yml | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/data/web/script.js b/data/web/script.js index e9a100e..247126c 100644 --- a/data/web/script.js +++ b/data/web/script.js @@ -214,12 +214,12 @@ function getWiFi(id) { 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) { - 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>' } @@ -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+'">' - + '<div class="send-button" onclick="sendTime(\''+element.id+'\')">-></div></div>' + + '<div class="send-button" onclick="sendTime(\''+element.id+'\')">→</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': diff --git a/data/web/style.css b/data/web/style.css index 8771621..e9feb42 100644 --- a/data/web/style.css +++ b/data/web/style.css @@ -1310,11 +1310,19 @@ footer a { margin: 10% auto; padding: 1rem } + .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 */ @@ -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); + margin: 0.5em 1em 0.5em 1em; } /* weekdays */ @@ -1491,7 +1500,13 @@ input[type=file]::-ms-browse { .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 */ diff --git a/ui.yml b/ui.yml index ec261c2..bc8a0f2 100644 --- a/ui.yml +++ b/ui.yml @@ -1,6 +1,6 @@ project: name: WiFi Clock - version: 0.2.0 + version: 0.2.1 contacts: - mailto:rvb@rvb.name - tg:rvbglas -- 2.34.1