diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-02-03 14:01:31 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-02-03 14:01:31 -0500 |
| commit | b8420f2c2cd1f1bae188881c7d39127687f4d19a (patch) | |
| tree | 2a451d74600adc0807fb14bb03e8b2748720fd7c | |
| parent | 19c263a94a8008ea6da17af5e8ff9baa9dafd88d (diff) | |
#154 - force chrome limit of 6 for desktop and android - sucks
Former-commit-id: 1b788ef632c705af973a1f2bf91f61d58ac338f7
| -rw-r--r-- | www/templates/montage-history.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index fc99582e..c1cdd5fa 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -26,7 +26,8 @@ <div class="timeline_text" ion-datetime-picker ng-model="datetimeValue.value" ng-change="dateChanged()"> - <b>Tap to change: {{datetimeValue.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x</b> + <b>Tap to change: {{datetimeValue.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x</b><div ng-if="$root.platformOS != 'ios'">(max of 6 monitors - chrome limit)</div> + </div> @@ -40,7 +41,7 @@ <div ng-style="packMontage ? { '-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','-webkit-column-fill': 'balance', 'column-fill': 'balance' } : {'-webkit-column-count':slider.monsize,'-webkit-column-gap':'0px','line-height':'0px','display':'-webkit-flex','-webkit-flex-direction':'row','flex-direction':'row', 'flex-wrap':'wrap' }"> - + <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng- --> <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.listDisplay!='noshow' && monitor.Monitor.Enabled !='0'"> @@ -63,6 +64,8 @@ <img ng-if="!isBackground()" id="img-$index" image-spinner-src="{{monitor.eventUrl}}&scale={{LoginData.singleImageQuality}}{{$root.authSession}}&rand={{$root.rand}}&rate={{sliderVal.realRate}}&connkey={{monitor.Monitor.connKey}}" image-spinner-loader="lines" style=" width: 100% !important; height: auto !important;" on-tap="togglePause(monitor.Monitor.Id)" /> + + <img ng-if="isBackground()" id="img-$index" image-spinner-src="" image-spinner-loader="lines" style=" width: 100% !important; @@ -143,12 +146,12 @@ <div class="list list-inset"> - <ion-toggle ng-model="sliderVal.hideNoEvents" ng-checked="{{sliderVal.hideNoEvents}}" toggle-class="toggle-dark">Hide monitors without events</ion-toggle> + <ion-toggle ng-model="sliderVal.hideNoEvents" ng-checked="{{sliderVal.hideNoEvents}}" toggle-class="toggle-dark"><span class="item-text-wrap">Hide monitors without events</span></ion-toggle> <ion-toggle ng-model="sliderVal.enableGapless" ng-checked="{{sliderVal.enableGapless}}" toggle-class="toggle-dark">enable gapless playback</ion-toggle> - <ion-toggle ng-model="sliderVal.exactMatch" ng-checked="{{sliderVal.exactMatch}}" toggle-class="toggle-dark">Only match events active in this time<p>(default: any event on or after this time)</p></ion-toggle> + <ion-toggle ng-model="sliderVal.exactMatch" ng-checked="{{sliderVal.exactMatch}}" toggle-class="toggle-dark"><span class="item-text-wrap">Only match events active in this time<p>(default: any event on or after this time)</p></span></ion-toggle> <ion-toggle ng-model="sliderVal.showTimeline" ng-checked="{{sliderVal.showTimeline}}" toggle-class="toggle-dark">show event time <p>(resource intensive)</p> |