diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-06-19 21:03:53 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-06-19 21:03:53 -0400 |
| commit | 501c917b4fb15355221722d49dee3522231a71b9 (patch) | |
| tree | 2299b921abef143ada0511bd824297e2b3a41794 | |
| parent | a8fe3392481483299bb32eb1583a1f440486c70a (diff) | |
fixed modal floating button position
| -rw-r--r-- | www/templates/monitors-modal.html | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 0cd0f0c8..f8f15029 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -23,13 +23,7 @@ <!-- <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps=3&buffer=1000&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 imageonload="finishedLoadingImage()" ng-src="img/demo.gif" width="100%" /> - </ion-scroll> - </div> + </div> </ion-content> @@ -42,13 +36,7 @@ </div>--> - <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> - <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></button> - - <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> <div ng-show="isControllable=='1' && showPTZ"> <div class="ptzcentered"> @@ -58,4 +46,14 @@ </div> </div> + + </ion-modal-view> + +<nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> + <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView()"></button> + + <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> |