summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-04-08 08:03:27 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-04-08 08:03:27 -0400
commit37a7d1592639723d78842b9723bd689b6462bc17 (patch)
treebb5aa7c12d59ac9cb329d5a8c9dc46b69e8ee654 /www/templates
parent148c6fcb5b6b815d69e59c38e6f5e0edbc1294f4 (diff)
#606 event montage updates
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/montage-history.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 0aaaffbf..21b57554 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -12,7 +12,7 @@
</ion-nav-buttons>
<ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div class="timeline_text"> {{'kFrom' | translate}}:{{prettifyDateTimeFirst(datetimeValueFrom.value)}} ({{humanizeTime(datetimeValueFrom.value)}})
- <div ng-if="$root.platformOS != 'ios' && !isMultiPort">({{'kChromeMax' | translate}})</div>
+ <div ng-if="!isSimulStreaming">({{'kChromeMax' | translate}})</div>
</div>
<div class="grid" id="mygrid">
<div class="grid-sizer grid-item-10"></div>
@@ -24,7 +24,7 @@
or we lose the handle for cleanup forever!-->
<div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
<figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
- <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/>
+ <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}&connkey={{monitor.Monitor.connKey}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/>
<figcaption class="normal-figcaption" >
&nbsp;
@@ -41,7 +41,7 @@
<div ng-if = "monitor.Monitor.eventUrl != 'img/noevent.png' && monitor.Monitor.connKey !=''">
<div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
<figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
- <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" on-swipe-left="toggleControls()" on-swipe-right="toggleControls()" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/>
+ <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}&connkey={{monitor.Monitor.connKey}}{{$root.authSession}}" image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" on-swipe-left="toggleControls()" on-swipe-right="toggleControls()" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"/>
<figcaption class="normal-figcaption" >
&nbsp;