From ddbdd88eb982cc29ada22d4304e0f2f6cb786658 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 24 Nov 2018 15:25:35 -0500 Subject: image cleanup --- www/img/background.png | Bin 1930992 -> 0 bytes www/img/frameerror.png | Bin 12285 -> 0 bytes www/img/noevent.png | Bin 42270 -> 0 bytes www/img/noimage.png | Bin 0 -> 12285 bytes www/img/novideo.png | Bin 37714 -> 0 bytes www/img/pausevideo.png | Bin 40672 -> 0 bytes www/js/MontageHistoryCtrl.js | 16 ++++++++-------- www/js/app.js | 6 +++--- www/templates/events-modal.html | 2 +- www/templates/events.html | 2 +- www/templates/monitors-modal.html | 8 ++++---- www/templates/montage-history.html | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 www/img/background.png delete mode 100644 www/img/frameerror.png delete mode 100644 www/img/noevent.png create mode 100644 www/img/noimage.png delete mode 100644 www/img/novideo.png delete mode 100644 www/img/pausevideo.png (limited to 'www') diff --git a/www/img/background.png b/www/img/background.png deleted file mode 100644 index 65eaa94e..00000000 Binary files a/www/img/background.png and /dev/null differ diff --git a/www/img/frameerror.png b/www/img/frameerror.png deleted file mode 100644 index c5bb6e1f..00000000 Binary files a/www/img/frameerror.png and /dev/null differ diff --git a/www/img/noevent.png b/www/img/noevent.png deleted file mode 100644 index 3fb3bfd4..00000000 Binary files a/www/img/noevent.png and /dev/null differ diff --git a/www/img/noimage.png b/www/img/noimage.png new file mode 100644 index 00000000..c5bb6e1f Binary files /dev/null and b/www/img/noimage.png differ diff --git a/www/img/novideo.png b/www/img/novideo.png deleted file mode 100644 index 37372bbd..00000000 Binary files a/www/img/novideo.png and /dev/null differ diff --git a/www/img/pausevideo.png b/www/img/pausevideo.png deleted file mode 100644 index 0f24b3ad..00000000 Binary files a/www/img/pausevideo.png and /dev/null differ diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 0373adcd..b9d031c0 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -234,7 +234,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc if ($rootScope.platformOS != 'ios') { NVRDataModel.debug("Killing existing streams, if alive..."); for (i = 0; i < $scope.MontageMonitors.length; i++) { - if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png') NVRDataModel.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name); + if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noimage.png') NVRDataModel.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name); } } else { NVRDataModel.stopNetwork("montage-history footerCollapse"); @@ -249,7 +249,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc for (i = 0; i < $scope.MontageMonitors.length; i++) { //$scope.MontageMonitors[i].Monitor.connKey=''; //$scope.MontageMonitors[i].Monitor.connKey = (Math.floor((Math.random() * 99999) + 1)).toString(); - $scope.MontageMonitors[i].Monitor.eventUrl = 'img/noevent.png'; + $scope.MontageMonitors[i].Monitor.eventUrl = 'img/noimage.png'; $scope.MontageMonitors[i].Monitor.eid = "-1"; $scope.MontageMonitors[i].Monitor.eventUrlTime = ""; $scope.MontageMonitors[i].Monitor.isPaused = false; @@ -296,7 +296,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.MontageMonitors[j].Monitor.isPaused = false; // that's the earliest match and play gapless from there if ($scope.MontageMonitors[j].Monitor.Id == mid) { - if ($scope.MontageMonitors[j].Monitor.eventUrl == 'img/noevent.png') { + if ($scope.MontageMonitors[j].Monitor.eventUrl == 'img/noimage.png') { // console.log ("Old value of event url " + $scope.MontageMonitors[j].eventUrl); //console.log ("ldurl is " + ld.streamingurl); var bw = NVRDataModel.getBandwidth() == "lowbw" ? zm.eventMontageQualityLowBW : ld.montageHistoryQuality; @@ -325,7 +325,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc var promises = []; for (i = 0; i < $scope.MontageMonitors.length; i++) { //console.log("Fair chance check for " + $scope.MontageMonitors[i].Monitor.Name); - if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noevent.png') { + if ($scope.MontageMonitors[i].Monitor.eventUrl == 'img/noimage.png') { var indivGrab = ld.apiurl + "/events/index/MonitorId:" + $scope.MontageMonitors[i].Monitor.Id + "/StartTime >=:" + TimeObjectFrom + "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0) + ".json"; NVRDataModel.debug("Monitor " + $scope.MontageMonitors[i].Monitor.Id + ":" + $scope.MontageMonitors[i].Monitor.Name + " does not have events, trying " + indivGrab); var p = getExpandedEvents(i, indivGrab); @@ -396,7 +396,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc //console.log(">>> Setting Event for " + $scope.MontageMonitors[i].Monitor.Name + " to " + data.events[0].Event.Id); NVRDataModel.log("Found expanded event " + data.events[0].Event.Id + " for monitor " + $scope.MontageMonitors[i].Monitor.Id); } else { - // $scope.MontageMonitors[i].eventUrl="img/noevent.png"; + // $scope.MontageMonitors[i].eventUrl="img/noimage.png"; // $scope.MontageMonitors[i].eventUrlTime = ""; // NVRDataModel.log ("Setting img src to null as data received in background"); } @@ -436,7 +436,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // don't check for monitors that are not shown // because nph connkey won't exist and the response // will fail - if ($scope.MontageMonitors[i].Monitor.eventUrl != "" && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png' && $scope.MontageMonitors[i].Monitor.connKey != '' && $scope.MontageMonitors[i].Monitor.Function != 'None' && $scope.MontageMonitors[i].Monitor.listDisplay != 'noshow' && $scope.MontageMonitors[i].Monitor.Enabled != '0') { + if ($scope.MontageMonitors[i].Monitor.eventUrl != "" && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noimage.png' && $scope.MontageMonitors[i].Monitor.connKey != '' && $scope.MontageMonitors[i].Monitor.Function != 'None' && $scope.MontageMonitors[i].Monitor.listDisplay != 'noshow' && $scope.MontageMonitors[i].Monitor.Enabled != '0') { // NVRDataModel.debug("Checking event status for " + $scope.MontageMonitors[i].Monitor.Name + ":" + $scope.MontageMonitors[i].Monitor.eventUrl + ":" + $scope.MontageMonitors[i].Monitor.Function + ":" + $scope.MontageMonitors[i].Monitor.listDisplay); // console.log ("Sending query 99 for " + $scope.MontageMonitors[i].Monitor.Name + " with ck="+$scope.MontageMonitors[i].Monitor.connKey); controlEventStream('99', '', $scope.MontageMonitors[i].Monitor.connKey, i); @@ -814,7 +814,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc NVRDataModel.debug("Killing all streams in montage to save memory/nw..."); for (var i = 0; i < $scope.MontageMonitors.length; i++) { - if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noevent.png') NVRDataModel.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name); + if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show' && $scope.MontageMonitors[i].Monitor.eventUrl != 'img/noimage.png') NVRDataModel.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL, $scope.MontageMonitors[i].Monitor.Name); } @@ -1112,7 +1112,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc for (var i = 0; i < $scope.MontageMonitors.length; i++) { //$scope.MontageMonitors[i].Monitor.connKey=''; $scope.MontageMonitors[i].Monitor.eid = "-1"; - $scope.MontageMonitors[i].Monitor.eventUrl = 'img/noevent.png'; + $scope.MontageMonitors[i].Monitor.eventUrl = 'img/noimage.png'; $scope.MontageMonitors[i].Monitor.eid = "-1"; $scope.MontageMonitors[i].Monitor.eventUrlTime = ""; $scope.MontageMonitors[i].Monitor.isPaused = false; diff --git a/www/js/app.js b/www/js/app.js index 86617745..604912a0 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -201,7 +201,7 @@ angular.module('zmApp', [ angular.forEach(input, function (item) { - if ((item.Monitor.Function != 'None') && (item.Monitor.Enabled != '0') && (item.Monitor.eventUrl != 'img/noevent.png') && (item.Monitor.listDisplay != 'noshow')) { + if ((item.Monitor.Function != 'None') && (item.Monitor.Enabled != '0') && (item.Monitor.eventUrl != 'img/noimage.png') && (item.Monitor.listDisplay != 'noshow')) { out.push(item); } @@ -523,7 +523,7 @@ angular.module('zmApp', [ loader.remove(); - var url = 'img/novideo.png'; + var url = 'img/noimage.png'; var w = $attributes.imgSpinnerW; @@ -597,7 +597,7 @@ angular.module('zmApp', [ $element[0].style.backgroundImage = 'url(' + $attributes.imageSpinnerSrc + ')'; - //$element[0].style.backgroundImage = 'url(' + 'img/novideo.png'+ ')'; + //$element[0].style.backgroundImage = 'url(' + 'img/noimage.png'+ ')'; }; diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 319f8366..99994380 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -10,7 +10,7 @@
-
diff --git a/www/templates/events.html b/www/templates/events.html index b2eb416a..b3da4bf3 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -89,7 +89,7 @@ + width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" fallback-src="img/noimage.png" />
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 72ed2baa..998dc6c3 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -20,11 +20,11 @@ imageonload="imageLoaded()" />
- +
-
@@ -49,11 +49,11 @@ imageonload="imageLoaded()" />
- +
-
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 6f67ad7f..629c31ae 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -24,7 +24,7 @@ -
+
@@ -70,7 +70,7 @@
-- cgit v1.2.3