diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 16 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index ca73ae9c..fcd0f8c9 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -11,25 +11,16 @@ </h1> </ion-header-bar> --> <ion-content> + <div ng-controller="ModalCtrl"> <!-- 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 imageonload="finishedLoadingImage()" ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&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%" /> + <img imageonload="finishedLoadingImage()" ng-src="{{loginData.streamingurl}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps={{loginData.maxFPS}}&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> </ion-scroll> - </div> - </ion-content> <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-close" label="exit event view" ng-click="closeModal()"></button> @@ -50,5 +41,6 @@ <a mfb-button icon="ion-play" label="play" ng-click="controlEventStream(eventCommands.play)"></a> </nav> - + </div> + </ion-content> </ion-modal-view> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 4bb36c1a..0cd0f0c8 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -11,6 +11,7 @@ </h1> </ion-header-bar> --> <ion-content> + <div ng-controller="ModalCtrl"> <!-- replay can also be gapless imageonload="finishedLoadingImage()"--> @@ -54,6 +55,7 @@ <circular options="radialMenuOptions"> </circular> </div> + </div> </div> </ion-modal-view> diff --git a/www/templates/montage.html b/www/templates/montage.html index ead94684..3e3f940a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -11,6 +11,7 @@ <ion-content padding="true" > + <div ng-controller="ModalCtrl"> <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher> @@ -65,6 +66,7 @@ </div> </div> + </div> </ion-content> </ion-view> |