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

implemented "success messages" for submitted forms (?msg=...)

Browse Source
pull/2/head
Ondřej Hruška 7 years ago
parent d831d47f53
commit 64c1ebbf8f
Signed by: MightyPork
GPG Key ID: 2C5FD5035250423D
4 changed files with 39 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 19
      compile_html.php
  2. 24
      js/appcommon.js
  3. 2
      pages/_head.php
  4. 5
      sass/form/_form_layout.scss

19
compile_html.php
Unescape View File

@ -22,9 +22,22 @@ ob_start();
foreach($_pages as $_k => $p) { foreach($_pages as $_k => $p) {
if ($p->bodyclass == 'api') { if ($p->bodyclass == 'api') {
if (ESP_DEMO) { if (ESP_DEMO) {
$target = 'term.html'; echo "Generating: ~$_k.html (bounce)\n";
echo "Generating: ~$_k.html -> $target\n";
$s = "<!DOCTYPE HTML><meta http-equiv=\"refresh\" content=\"0;url=$target\">"; if ($_k=='index') {
$s = "<!DOCTYPE HTML><meta http-equiv=\"refresh\" content=\"0;url=term.html\">";
}
else {
$s = "<!DOCTYPE HTML>
<script>
var ref = document.referrer;
var qat = document.referrer.indexOf('?');
if (qat !== -1) ref = ref.substring(0, qat)
location.href=ref+'?msg=Request ignored, this is a demo.';
</script>";
}
} else { } else {
continue; continue;
} }

24
js/appcommon.js
Unescape View File

@ -90,24 +90,32 @@ $.ready(function () {
// (a way to pass errors back from server via redirect) // (a way to pass errors back from server via redirect)
let errAt = window.location.search.indexOf('err=') let errAt = window.location.search.indexOf('err=')
if (errAt !== -1 && qs('.Box.errors')) { if (errAt !== -1 && qs('.Box.errors')) {
let errs = window.location.search.substr(errAt + 4).split(',') let errs = decodeURIComponent(window.location.search.substr(errAt + 4)).split(',')
let humanReadableErrors = [] let humanReadableErrors = []
errs.forEach(function (er) { errs.forEach(function (er) {
let lbls = qsa('label[for="' + er + '"]') let lbls = qsa('label[for="' + er + '"]')
for (let i = 0; i < lbls.length; i++) { if (lbls) {
let lbl = lbls[i] for (let i = 0; i < lbls.length; i++) {
lbl.classList.add('error') let lbl = lbls[i]
if (i === 0) humanReadableErrors.push(lbl.childNodes[0].textContent.trim().replace(/: ?$/, '')) lbl.classList.add('error')
if (i === 0) humanReadableErrors.push(lbl.childNodes[0].textContent.trim().replace(/: ?$/, ''))
}
} else {
humanReadableErrors.push(er)
} }
// else {
// hres.push(er)
// }
}) })
qs('.Box.errors .list').innerHTML = humanReadableErrors.join(', ') qs('.Box.errors .list').innerHTML = humanReadableErrors.join(', ')
qs('.Box.errors').classList.remove('hidden') qs('.Box.errors').classList.remove('hidden')
} }
let msgAt = window.location.search.indexOf('msg=')
if (msgAt !== -1 && qs('.Box.message')) {
let msg = decodeURIComponent(window.location.search.substr(msgAt + 4))
qs('.Box.message').innerHTML = msg
qs('.Box.message').classList.remove('hidden')
}
modal.init() modal.init()
notify.init() notify.init()

2
pages/_head.php
Unescape View File

@ -32,4 +32,6 @@ if (strpos($_GET['BODYCLASS'], 'cfg') !== false) {
<span class="lead"><?= tr('form_errors') ?></span>&nbsp;<span class="list"></span> <span class="lead"><?= tr('form_errors') ?></span>&nbsp;<span class="list"></span>
</div> </div>
<div class="Box message hidden"></div>
<?php endif; ?> <?php endif; ?>

5
sass/form/_form_layout.scss
Unescape View File

@ -12,6 +12,11 @@ form { @include naked(); }
} }
} }
.Box.message {
font-weight: bold;
color: #0fca50;
}
.Row { .Row {
vertical-align: middle; vertical-align: middle;
margin: 12px auto; margin: 12px auto;

Write Preview
Loading…
Cancel
Save