diff options
| -rw-r--r-- | www/js/EventCtrl.js | 2 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 5 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 5 | ||||
| -rw-r--r-- | www/templates/montage.html | 4 |
4 files changed, 14 insertions, 2 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index c6eba07e..0f24cead 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -107,7 +107,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventCtrl', function ($ion req.success(function (resp) { console.log("SUCCESS: " + JSON.stringify(resp)); - var str = toast_blurb + "Event:" + resp.status.event; + var str = toast_blurb + "event:" + resp.status.event; console.log(str); $ionicLoading.show({ template: str, diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index f6367310..d275f0a7 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -14,11 +14,16 @@ <!-- replay can also be gapless --> <div ng-if="!isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="{{loginData.url}}/cgi-bin/nph-zms?source=event&mode=jpeg&event={{eventId}}&frame=1&scale=100&rate=100&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}" width="100%" /> + </ion-scroll> </div> <div ng-if="isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="img/demo.gif" width="100%"> + </ion-scroll> + </div> </ion-content> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 0ab63679..ea5f8a1d 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -13,14 +13,17 @@ <ion-content> <!-- replay can also be gapless --> - {{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitorId}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}} <div ng-if="!isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitorId}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" /> + </ion-scroll> </div> <div ng-if="isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="img/demo.gif" width="100%"> + </ion-scroll> </div> </ion-content> diff --git a/www/templates/montage.html b/www/templates/montage.html index 434677c6..d6414837 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -26,12 +26,16 @@ FIXME: I should probably not pass username and password here - instead go the http interceptor and auth token mode --> <div ng-if="!isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&scale=100&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" /> + </ion-scroll> </div> <div ng-if="isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <img ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"> + </ion-scroll> </div> <!-- <img ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;" />--> |