diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/monitors-modal.html | 12 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index e1d5c98a..aa87844e 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -6,12 +6,15 @@ <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> <!-- android needs this 100vh - otherwise max- does not work --> + <div style="height: 100vh;"> <img imageonload="finishedLoadingImage()" - ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" /> + ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" ng-class="{'zm-image-fit':imageStyle==true, 'zm-image-crop':imageStyle==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" fade-in /> + </div> + </ion-scroll> </ion-content> @@ -31,3 +34,10 @@ <button mfb-button icon="ion-arrow-expand" label="pan/tilt/zoom" ng-click="togglePTZ();"></button> <button mfb-button icon="ion-close" label="exit live view" ng-click="closeModal();"></button> </nav> + +<span class="camera-icon"> + <a class="button icon ion-ios-camera button-positive" href="" ng-click="saveImageToPhone(tempmid)"></a> +</span> + + + diff --git a/www/templates/montage.html b/www/templates/montage.html index d63a3bcd..13f21952 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -26,7 +26,7 @@ </ion-nav-buttons> - <ion-content has-bouncing="false" > + <ion-content has-bouncing="false" style="background-color:#FEFEFE"> <div ng-controller="ModalCtrl"> <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher> <span ng-show="!minimal"> |