diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-17 11:11:31 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-17 11:11:31 -0400 |
| commit | 73230565af35e1830fb7faf0f8cf365b5ec0e3b5 (patch) | |
| tree | 426a4b5ab0e68b0793cc262c58ccf006ae861dcb /www/templates | |
| parent | 654c8b574639bdf026e756a5bc0afadb287a2138 (diff) | |
more tweaks for #350 - removed the image pause divs - initied packery only after auth token is received - imagesLoaded seems to be correct now
Former-commit-id: 9730031f045c8aae1d7a65d4da0b04e32a177ecc
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/montage.html | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index ef7a4224..18280cab 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -66,18 +66,19 @@ - <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}} " > + <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 class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> + <figure class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> <!--<div ng-if="!isModalActive" >--> - <div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading"> + <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> + <div ng-if="$root.authSession!='undefined' && !isBackground() "> <div ng-if = "!minimal"> - <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem($index);" image-spinner-loader="lines" /> + <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem($index);" image-spinner-loader="lines" /> </div> @@ -86,10 +87,12 @@ </div> </div> - <div ng-if="!$root.authSession=='undefined' || isBackground() || areImagesLoading"> + <!--<div ng-if="!$root.authSession=='undefined' || isBackground() || areImagesLoading"> <img id="img-{{$index}}" image-spinner-src="img/pausevideo.png" /> - </div> + + <canvas style="background:black;width:{{monitor.Monitor.Width}}; "></canvas> + </div>--> |