From 469f08938c27fcf6e774d92f188b1bb089283142 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 6 Oct 2013 19:33:55 +0300 Subject: [PATCH] added no camera image --- doc/todo.txt | 1 - static/css/main.css | 8 ++++++ static/img/no-camera.svg | 61 ++++++++++++++++++++++++++++++++++++++++ static/js/main.js | 4 +-- 4 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 static/img/no-camera.svg diff --git a/doc/todo.txt b/doc/todo.txt index 937f34b..d8b1a52 100644 --- a/doc/todo.txt +++ b/doc/todo.txt @@ -2,7 +2,6 @@ -> authentication -> hide horrible 404 image on cameras --> camera not available background and icon design -> prevent Request closed errors by stopping mjpg clients before stopping motion -> make all the server http requests async diff --git a/static/css/main.css b/static/css/main.css index 8d2b1dd..963a70f 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -373,6 +373,13 @@ div.camera-placeholder { bottom: 0px; left: 0px; background-color: #555; + text-align: center; +} + +img.no-camera { + margin-top: 20%; + width: 30%; + opacity: 0.8; } div.camera-progress { @@ -384,6 +391,7 @@ div.camera-progress { opacity: 0; transition: all 0.2s linear; text-align: center; + background-color: rgba(0, 0, 0, 1); } img.camera-progress { diff --git a/static/img/no-camera.svg b/static/img/no-camera.svg new file mode 100644 index 0000000..b7f1800 --- /dev/null +++ b/static/img/no-camera.svg @@ -0,0 +1,61 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/static/js/main.js b/static/js/main.js index 430f93e..ea730cd 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -659,7 +659,6 @@ function showProgress() { applyButton.animate({'opacity': '1'}, 100); applyButton.addClass('progress'); - $('img.camera').css('opacity', '0.3'); $('div.camera-progress').css('opacity', '0.5'); } @@ -685,7 +684,6 @@ function endProgress() { } $('div.camera-progress').css('opacity', '0'); - $('img.camera').css('opacity', '1'); } function isProgress() { @@ -1083,7 +1081,7 @@ function addCameraFrameUi(cameraId, cameraName, framerate) { '' + '' + '
' + - '
' + + '
' + '' + '
' + '
' + -- 2.39.5