From 19df41f9d087a815d42d81fa2d0c3d02ba00cdf7 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 28 Sep 2013 18:07:08 +0300 Subject: [PATCH] better apply progress --- doc/todo.txt | 3 ++- static/css/base-site.css | 6 +++++- static/img/progress.gif | Bin 4782 -> 5055 bytes static/js/base-site.js | 9 +++++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/todo.txt b/doc/todo.txt index c5af23a..05005c7 100644 --- 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 92ffcb0..c104b06 100644 --- 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 GIT binary patch literal 5055 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 B=dS<& literal 4782 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 W!53$aoc>_tuU0NtdjIdnZ{xpWqrDUW diff --git a/static/js/base-site.js b/static/js/base-site.js index 378a4cf..61a9787 100644 --- 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(''); + applyButton.html(''); 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 = {}; -- 2.39.5