diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-20 15:28:32 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-20 15:28:32 -0400 |
| commit | ae61921c2afe13fe75f63e9b4d3acde91f372ab7 (patch) | |
| tree | 3216d09e56cfa550856b06eed491d38a26f6816d /www/templates | |
| parent | ca5ec6140a23f9d506685541241b9de90df3efe6 (diff) | |
#286 - did I finally resolve it ? Almost ?
Former-commit-id: 1737966892f9f741a0b1827440a0e7cb2ea3e84f
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/montage.html | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index c27e2ef9..4ce29ab3 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -65,14 +65,14 @@ - <figure class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> - <div ng-if="!isModalActive" > + <figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'"> + <!--<div ng-if="!isModalActive" >--> <div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading"> <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}}/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> @@ -82,7 +82,7 @@ </div> <div ng-if="!$root.authSession=='undefined' || isBackground() || areImagesLoading"> - <img image-spinner-src="img/pausevideo.png" /> + <img img id="{{img-$index}}" image-spinner-src="img/pausevideo.png" /> </div> @@ -97,10 +97,11 @@ - </div> <!-- modal not active--> + <!--</div>--> <!-- modal not active--> + <!-- <div ng-if="isModalActive"> - <img image-spinner-src="img/pausevideo.png" /> - </div> + <img img id="{{img-$index}}" image-spinner-src="img/pausevideo.png" /> + </div>--> </figure> </div> |