diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/montage.html | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/www/templates/events.html b/www/templates/events.html index 2d0d7bdc..bf02fd8a 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -33,10 +33,10 @@ <ion-content on-tap="tapped();" delegate-handle="mainScroll" lazy-scroll has-subheader="true"> - <ion-refresher + <!--<ion-refresher pulling-text="Tap <i class='ion-android-more-vertical'></i> and <i class='ion-refresh'></i> to refresh" spinner="bubbles" on-refresh="dummyDoRefresh();"> - </ion-refresher> + </ion-refresher>--> <!-- lets make sure the events list is not empty as collection repeat needs height --> <div ng-if = "!eventsBeingLoaded"> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 18556b10..04596dca 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -10,10 +10,10 @@ direction="xy" style="width: 100%; "> <!-- android needs this 100vh - otherwise max- does not work --> - <div style="height: 100vh;"> + <div style="height: 100vh;" class="main"> <img imageonload="finishedLoadingImage()" image-spinner-loader="lines" - image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> + image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> </div> </ion-scroll> </ion-content> diff --git a/www/templates/montage.html b/www/templates/montage.html index eee66555..fa95234f 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -44,7 +44,8 @@ <!-- back to ng-src. spinner was not updating when rand changes--> <!-- FIXME: Scale is 50% hardcoded --> - <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" + <!-- moving to single so I can rely on rand for reloads --> + <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" |