espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

error indication via GET arg err=...

Browse Source
This commit is contained in:
MightyPork
2017-07-23 01:47:18 +02:00
parent b238390ca8
commit 3c202a1f50
13 changed files with 235 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html_orig/css/app.css
+11 -8
View File
@@ -579,17 +579,12 @@ ul > * {
.NotifyMsg {
position: fixed;
bottom: 2.61792rem;
top: 1.618rem;
right: 2.61792rem;
padding: 0.61805rem 1rem;
left: 50%;
-webkit-transform: translate(-50%, 0);
-moz-transform: translate(-50%, 0);
-ms-transform: translate(-50%, 0);
-o-transform: translate(-50%, 0);
transform: translate(-50%, 0);
-webkit-font-smoothing: subpixel-antialiased;
-webkit-transform: translateZ(0) scale(1, 1);
background: #37a349;
background: #3887d0;
color: white;
text-shadow: 0 0 2px black;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.6);
@@ -740,6 +735,12 @@ input[type="number"], input[type="password"], input[type="text"], textarea, sele
input[type="number"] {
width: 125px; }
.Box.errors .list {
color: crimson;
font-weight: bold; }
.Box.errors .lead {
color: white; }
form .Row {
vertical-align: middle;
margin: 12px auto;
@@ -794,6 +795,8 @@ form .Row {
user-select: none;
white-space: nowrap;
word-wrap: normal; }
form .Row label.error {
color: crimson; }
form .Row input[type="range"] {
width: 200px; }
@media screen and (max-width: 544px) {
html_orig/js/app.js
+51
View File
@@ -852,6 +852,38 @@ function jsp() {
window.Modal = modal;
})();
(function (nt) {
var sel = '#notif';
var hideTmeo1; // timeout to start hiding (transition)
var hideTmeo2; // timeout to add the hidden class
nt.show = function (message, timeout) {
$(sel).html(message);
Modal.show(sel);
clearTimeout(hideTmeo1);
clearTimeout(hideTmeo2);
if (undef(timeout)) timeout = 2500;
hideTmeo1 = setTimeout(nt.hide, timeout);
};
nt.hide = function () {
var $m = $(sel);
$m.removeClass('visible');
hideTmeo2 = setTimeout(function () {
$m.addClass('hidden');
}, 250); // transition time
};
nt.init = function() {
$(sel).on('click', function() {
nt.hide(this);
});
};
})(window.Notify = {});
/** Global generic init */
$.ready(function () {
// Checkbox UI (checkbox CSS and hidden input with int value)
@@ -915,7 +947,26 @@ $.ready(function () {
e.preventDefault();
});
var errAt = location.search.indexOf('err=');
if (errAt !== -1 && qs('.Box.errors')) {
var errs = location.search.substr(errAt+4).split(',');
var hres = [];
errs.forEach(function(er) {
var lbl = qs('label[for="'+er+'"]');
if (lbl) {
lbl.classList.add('error');
hres.push(lbl.childNodes[0].textContent.trim().replace(/: ?$/, ''));
} else {
hres.push(er);
}
});
qs('.Box.errors .list').innerHTML = hres.join(', ');
qs('.Box.errors').classList.remove('hidden');
}
Modal.init();
Notify.init();
});
$._loader = function(vis) {
html_orig/jssrc/appcommon.js
+19
View File
@@ -61,7 +61,26 @@ $.ready(function () {
e.preventDefault();
});
var errAt = location.search.indexOf('err=');
if (errAt !== -1 && qs('.Box.errors')) {
var errs = location.search.substr(errAt+4).split(',');
var hres = [];
errs.forEach(function(er) {
var lbl = qs('label[for="'+er+'"]');
if (lbl) {
lbl.classList.add('error');
hres.push(lbl.childNodes[0].textContent.trim().replace(/: ?$/, ''));
} else {
hres.push(er);
}
});
qs('.Box.errors .list').innerHTML = hres.join(', ');
qs('.Box.errors').classList.remove('hidden');
}
Modal.init();
Notify.init();
});
$._loader = function(vis) {
html_orig/lang/en.php
+6 -4
View File
@@ -13,11 +13,12 @@ return [
'title.term' => 'Terminal',
'net.ap' => 'Access Point DHCP Config',
'net.sta' => 'Client IP Config',
'net.ap' => 'DHCP Server',
'net.sta' => 'DHCP Client',
'net.explain_sta' => '
Those settings affect the built-in DHCP client. Switching it off
Those settings affect the built-in DHCP client used for
connecting to an external network. Switching DHCP (dynamic IP) off
makes ESPTerm use the configured static IP. Please double-check
those settings before submitting, setting them incorrectly may
make it hard to access ESPTerm via the external network.',
@@ -33,7 +34,7 @@ return [
'net.ap_addr_ip' => 'Own IP address',
'net.ap_addr_mask' => 'Subnet mask',
'net.sta_dhcp_enable' => 'Enable DHCP',
'net.sta_dhcp_enable' => 'Use dynamic IP',
'net.sta_addr_ip' => 'ESPTerm static IP',
'net.sta_addr_mask' => 'Subnet mask',
'net.sta_addr_gw' => 'Gateway IP',
@@ -77,4 +78,5 @@ return [
'yes' => 'Yes',
'no' => 'No',
'confirm' => 'OK',
'form_errors' => 'Validation errors for:',
];
html_orig/packjs.sh
+1
View File
@@ -5,5 +5,6 @@ echo "Packing js..."
cat jssrc/chibi.js \
jssrc/utils.js \
jssrc/modal.js \
jssrc/notif.js \
jssrc/appcommon.js \
jssrc/term.js > js/app.js
html_orig/pages/_head.php
+5
View File
@@ -23,4 +23,9 @@ if (strpos($_GET['BODYCLASS'], 'cfg') !== false) {
<img src="/img/loader.gif" alt="Loading…" id="loader">
<?php if ($cfg): ?>
<h1><?= tr('menu.' . $_GET['page']) ?></h1>
<div class="Box errors hidden">
<span class="lead"><?= tr('form_errors') ?></span>&nbsp;<span class="list"></span>
</div>
<?php endif; ?>
html_orig/pages/_tail.php
+4
View File
@@ -1,5 +1,9 @@
<div class="NotifyMsg hidden" id="notif"></div>
</div>
</div>
</body>
</html>
html_orig/sass/form/_form_layout.scss
+15
View File
@@ -9,6 +9,17 @@ input[type="number"] {
width: $form-field-w/2;
}
.Box.errors {
.list {
color: crimson;
font-weight: bold;
}
.lead {
color: white;
}
}
form .Row {
vertical-align: middle;
margin: 12px auto;
@@ -89,6 +100,10 @@ form .Row {
@include nowrap;
}
label.error {
color: crimson;
}
//.checkbox-wrap {
// display: inline-block;
// width: $form-label-w;
html_orig/sass/layout/_modal.scss
+5 -4
View File
@@ -43,17 +43,18 @@
// "toast"
.NotifyMsg {
position: fixed;
bottom: dist(2);
top: dist(1);
right: dist(2);
padding: dist(-1) dist(0);
// center horizontally
left: 50%;
@include translate(-50%,0);
//left: 50%;
//@include translate(-50%,0);
// hack to remove blur in chrome
-webkit-font-smoothing: subpixel-antialiased;
-webkit-transform: translateZ(0) scale(1.0, 1.0);
background: #37a349;
background: #3887d0;
&.error {
background: #d03e42;
}