better apply progress

diff --git a/doc/todo.txt b/doc/todo.txt
index c5af23abee5d7218f9336f62d0d1cebc03a7608a..05005c79e098eb9fffd311409f5b82b3dbab8abd 100644 (file)
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -1,8 +1,9 @@
 -> group @config rules to top
--> what do we do with working schedule
 -> browser compatibility test
 -> hint text next to section titles
+-> clickable hints
 -> authentication
+-> better ajax error handling
 -> proxy for slave motioneyes
 -> add a view log functionality
 -> click to zoom on cameras

diff --git a/static/css/base-site.css b/static/css/base-site.css
index 92ffcb0ee9d4a78e22f1cb46ad4d6f2b509ace2c..c104b06b2d83e315476a52b080995f07a42e3684 100644 (file)
--- a/static/css/base-site.css
+++ b/static/css/base-site.css
@@ -196,7 +196,11 @@ div.apply-button:ACTIVE {
 }
 
 div.apply-button.progress {
-    background-color: #FF9340;
+    background-color: #FF6F00;
+}
+
+img.apply-progress {
+    margin-top: 3px;
 }
 
 div.settings-top-bar.open select.video-device {

diff --git a/static/img/progress.gif b/static/img/progress.gif
index 12ccd9b30dd790348ee9e7c7aaacccb3d7d117c2..610f7331dd34016f132fc3d5bb49f3abd1e38463 100644 (file)
Binary files a/static/img/progress.gif and b/static/img/progress.gif differ

diff --git a/static/js/base-site.js b/static/js/base-site.js
index 378a4cf9834facb2eec22fc5e2320dc3c2e89be5..61a9787bb2333f1400ec152f7b2dccdfb33a9544 100644 (file)
--- a/static/js/base-site.js
+++ b/static/js/base-site.js
@@ -11,7 +11,7 @@ function ajax(method, url, data, callback) {
         data: data,
         cache: false,
         success: callback,
-        failure: function (request, options, error) {
+        error: function (request, options, error) {
             alert('Request failed with code: ' + request.status);
             if (callback) {
                 callback();
@@ -492,7 +492,7 @@ function showProgress() {
         return; /* progress already visible */
     }
     
-    applyButton.html('<img src="' + staticUrl + 'img/progress.gif">');
+    applyButton.html('<img class="apply-progress" src="' + staticUrl + 'img/progress.gif">');
     applyButton.css('display', 'inline-block');
     applyButton.animate({'opacity': '1'}, 100);
     applyButton.addClass('progress');
@@ -551,6 +551,11 @@ function doApply() {
             finishedCount++;
             testReady();
         });
+        
+        /* update the camera name in the device select */
+        if (config.key !== 'main') {
+            $('#videoDeviceSelect').find('option[value=' + config.key + ']').html(config.config.name);
+        }
     }
     
     pushConfigs = {};