# HG changeset patch
# User Aleksej Bobylev
# Date 1438644731 -10800
# Node ID aaf630cf6a8bb477d80830fcd73826526ff8b726
# Parent e2a7569a50d89fde22b1ae92bc26be7ff083ce67
tazpanel.js, footer.html: fix AJAX loader display; misc tiny edits
diff -r e2a7569a50d8 -r aaf630cf6a8b lib/tazpanel.js
--- a/lib/tazpanel.js Mon Aug 03 17:39:38 2015 +0200
+++ b/lib/tazpanel.js Tue Aug 04 02:32:11 2015 +0300
@@ -339,7 +339,15 @@
// AJAX code for dynamic requests
//
+// Global status of the AJAX loader
+// Increment ajaxLoader on the start, decrement on the finish,
+// Show it if value > 0
+ajaxLoader = 0
+
function ajax(cgiUrl, command, ajaxOut) {
+ // (0) show AJAX loader
+ ajaxLoader++
+
// (1) create object for server request
var req = new XMLHttpRequest();
@@ -351,11 +359,19 @@
if (req.readyState == XMLHttpRequest.DONE) {
// if request done
- if (req.statusText == 'OK') {
- statusElem.innerHTML = ""
+ ajaxLoader--
+ if (ajaxLoader == 0) {
+
+ statusbar('')
+
+ if (req.statusText == 'OK') {
+ statusElem.innerHTML = ''
+ } else {
+ statusElem.innerHTML = '' +
+ req.statusText + '' // show status (Not Found, ...)
+ }
} else {
- statusElem.innerHTML = "" +
- req.statusText + "" // show status (Not Found, ...)
+ statusElem.innerHTML = ''
}
// if status 200 (ОК) - show answer to user
@@ -550,7 +566,7 @@
ds.style.display = 'none'; sb.innerHTML = status; sb.style.display = '';
// show optional ticker
if (ticker != '') {
- as.innerHTML = '
';
+ as.innerHTML = '';
}
}
}
diff -r e2a7569a50d8 -r aaf630cf6a8b settings.cgi
--- a/settings.cgi Mon Aug 03 17:39:38 2015 +0200
+++ b/settings.cgi Tue Aug 04 02:32:11 2015 +0300
@@ -331,7 +331,7 @@
cat <
$(_ 'Password:')
-
+
diff -r e2a7569a50d8 -r aaf630cf6a8b styles/default/base.css
--- a/styles/default/base.css Mon Aug 03 17:39:38 2015 +0200
+++ b/styles/default/base.css Tue Aug 04 02:32:11 2015 +0300
@@ -18,6 +18,7 @@
position: fixed; top: 0; left: 0;
width: 100%; height: 40px;
background-color: #222;
+ background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJAQMAAADaX5RTAAAABlBMVEUXFxciIygUb+JNAAAAEUlEQVQIHWNkYGDMFQYhDAYAJbADCjwbCYUAAAAASUVORK5CYII=');
}
body > header h1 {
@@ -160,6 +161,8 @@
}
section header button, section footer button { margin: 0; }
+section header a { float: right; }
+
section footer {
padding: 0 0.3rem 0.2rem; margin: 0;
display: block;
diff -r e2a7569a50d8 -r aaf630cf6a8b styles/default/footer.html
--- a/styles/default/footer.html Mon Aug 03 17:39:38 2015 +0200
+++ b/styles/default/footer.html Tue Aug 04 02:32:11 2015 +0300
@@ -1,11 +1,11 @@
export TEXTDOMAIN='tazpanel'
-cat << EOT
+cat <
diff -r e2a7569a50d8 -r aaf630cf6a8b styles/default/header.html
--- a/styles/default/header.html Mon Aug 03 17:39:38 2015 +0200
+++ b/styles/default/header.html Tue Aug 04 02:32:11 2015 +0300
@@ -22,7 +22,7 @@