diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-20 11:11:28 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-20 11:11:28 -0400 |
| commit | 15e02ed6cce23e0d69e5e2370e6c3d5a335b4db8 (patch) | |
| tree | 5fd5369a7c32da38226361c3574ba0ccc400693a /www/templates | |
| parent | 26dc9c5bcd2ed556472976208148ce4b51cd8b63 (diff) | |
#601 commented out inital test to see how iframes would look as a monitor
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/montage.html | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html index 8580d72a..11008f85 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -83,9 +83,17 @@ <div class="grid-sizer grid-item-5"></div> <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.Enabled !='0' ">--> + + + <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> <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> + <iframe width="200" height="100" src="https://news.google.com" frameborder="2" ></iframe> + </figure>--> + + <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> @@ -93,8 +101,7 @@ <div ng-if = "!minimal" > <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> - - + </div> |