diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-30 15:45:00 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-30 15:45:00 -0400 |
| commit | fca9434de5456e2956bfabede0b412fbc206e2a1 (patch) | |
| tree | ed417c7cad454422fcb73c72d69a207e555689d1 | |
| parent | 34a52a7fa45cb6e82bbadb84abb6904786b58ed3 (diff) | |
#618 re-order frame
| -rw-r--r-- | www/js/MontageCtrl.js | 12 | ||||
| -rw-r--r-- | www/templates/reorder-modal.html | 8 |
2 files changed, 14 insertions, 6 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 0809fabc..f2f58e53 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -706,6 +706,18 @@ angular.module('zmApp.controllers') }, 20); } + + $scope.reorderFrame = function (item) { + var frame = ""; + frame = item.Monitor.streamingURL+"/nph-zms?mode=single" + + "&monitor="+item.Monitor.Id + + "&scale=50"; + + if ($rootScope.authSession!='undefined') frame+=$rootScope.authSession; + frame += NVRDataModel.insertBasicAuthToken(); + return frame; + }; + $scope.isCycleOn = function() { return NVRDataModel.getLogin().cycleMontageProfiles; }; diff --git a/www/templates/reorder-modal.html b/www/templates/reorder-modal.html index bc442128..4ed54fb6 100644 --- a/www/templates/reorder-modal.html +++ b/www/templates/reorder-modal.html @@ -8,14 +8,10 @@ </ion-header-bar> <ion-content> <div class="list"> - <span ng-repeat="item in copyMontage"> - - - - + <span ng-repeat="item in copyMontage"> <a ng-class="{ 'item item-avatar item-icon-right' : item.Monitor.listDisplay == 'show', 'item item-avatar item-icon-right eye-background-red' : item.Monitor.listDisplay!='show' }" ng-click="toggleHide($index)" href="" > - <img src="{{item.Monitor.streamingURL}}/nph-zms?mode=single&monitor={{item.Monitor.Id}}&scale=50{{$root.authSession}}" fallback-src /> + <img src="{{reorderFrame(item)}}" fallback-src /> <i ng-class="{'icon ion-eye':item.Monitor.listDisplay=='show','eye-red icon ion-eye-disabled':item.Monitor.listDisplay!='show'}"> </i><h2><span ng-class="{'eye-red':item.Monitor.listDisplay!='show'}">{{item.Monitor.Name}}</span></h2><p>{{'kId' | translate}}:{{item.Monitor.Id}}, {{'kMode' | translate}}:{{item.Monitor.Function}}</p> |