diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/css/ionic.app.css | 4 | ||||
| -rw-r--r-- | www/css/style.css | 1 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 11 | ||||
| -rwxr-xr-x | www/js/app.js | 8 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/www/css/ionic.app.css b/www/css/ionic.app.css index 13676ee1..d7a0409f 100644 --- a/www/css/ionic.app.css +++ b/www/css/ionic.app.css @@ -9672,7 +9672,9 @@ a.button { padding-right: calc(constant(safe-area-inset-right) + 54px); } .item-icon-right .icon { right: calc(constant(safe-area-inset-right) + 11px); } - .item-complex, a.item.item-complex, button.item.item-complex { + .item-complex, + a.item.item-complex, + button.item.item-complex { padding: 0; } .item-complex .item-content, a.item.item-complex .item-content, button.item.item-complex .item-content { padding: 16px calc(constant(safe-area-inset-right) + 49px) 16px calc(constant(safe-area-inset-left) + 16px); } diff --git a/www/css/style.css b/www/css/style.css index c850fb41..d4513b80 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -125,6 +125,7 @@ ion-popover-view.fit ion-content { width: 100% } + /*.modal { top: 100; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index f8ff4b01..02128ebc 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -850,10 +850,15 @@ angular.module('zmApp.controllers') disableAnimate: true, disableBack: true }); - $state.go("app.montage", { + + $state.go('app.refresh', { + "view": 'app.montage' + }); + + /* $state.go("app.montage", { minimal: $scope.minimal, isRefresh: true - }); + });*/ return; }; @@ -1623,7 +1628,7 @@ angular.module('zmApp.controllers') $scope.constructStream = function (monitor) { var stream; - //if (areStreamsStopped) return ""; //getmode doing snapshot now + if (areStreamsStopped) return ""; stream = monitor.Monitor.streamingURL + "/nph-zms?mode=" + getMode() + "&monitor=" + monitor.Monitor.Id + diff --git a/www/js/app.js b/www/js/app.js index 01928d5e..f6da56cd 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -644,12 +644,12 @@ angular.module('zmApp', [ //console.log (">>>>>>>>>>>>> INTERCEPT OBJECT " + JSON.stringify(config)); - if ($rootScope.zmCookie) { - config.headers.Cookie = "ZMSESSID=" + $rootScope.zmCookie; + // if ($rootScope.zmCookie) { + // config.headers.Cookie = "ZMSESSID=" + // $rootScope.zmCookie; // console.log (">>>>> WOOOT HAVE COOKIE AND USING: "+$rootScope.zmCookie); - } else { + // } else { // console.log ("No cookie present in " + config.url); - } + // } if ($rootScope.apiAuth) { // console.log("********** API AUTH"); diff --git a/www/templates/montage.html b/www/templates/montage.html index 0742e3d3..90a3bc23 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -90,7 +90,7 @@ - <span ng-if="!singleMonitorModalOpen" ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> + <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} "> <!-- <figure> |