From 1741c429c63fe9c0a72ccfdeeaaa15b48592cd8e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 24 Nov 2013 16:58:06 +0200 Subject: [PATCH] progress is shown now when adding the first camera --- static/css/main.css | 5 +++++ static/js/main.js | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/static/css/main.css b/static/css/main.css index 08d5d60..8471257 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -150,6 +150,11 @@ img.main-loading-progress { margin-top: 50px; } +div.add-camera-message { + text-align: center; + margin-top: 30px; +} + /* settings */ diff --git a/static/js/main.js b/static/js/main.js index 3c2873c..5999525 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -737,9 +737,10 @@ function showProgress() { applyButton.html(''); applyButton.css('display', 'inline-block'); applyButton.animate({'opacity': '1'}, 100); - applyButton.addClass('progress'); + applyButton.addClass('progress'); $('div.camera-progress').css('opacity', '0.5'); + $('div.add-camera-message').html(''); } function hideApply() { @@ -766,6 +767,7 @@ function endProgress() { } $('div.camera-progress').css('opacity', '0'); + $('div.add-camera-message').remove(); /* in case the message exists */ } function isProgress() { @@ -1722,7 +1724,7 @@ function recreateCameraFrames(cameras) { if ($('#videoDeviceSelect').find('option').length < 2 && user === 'admin' && $('#motionEyeSwitch')[0].checked) { /* invite the user to add a camera */ - var addCameraLink = $('
' + + var addCameraLink = $(''); pageContainer.append(addCameraLink); } -- 2.39.5