From 634fee8d84d60dea9593e4f5095ed91e84712ef0 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 18 Apr 2018 09:43:28 -0400
Subject: #606 montage history cleanup

---
 www/templates/montage-history.html | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 68987fdd..929b1e05 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -19,29 +19,11 @@
             <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng- -->
             <span ng-repeat="monitor in MontageMonitors | onlyEnabledAndEventHas |limitTo: currentLimit">
 				<div ng-if="$root.authSession!='undefined'">
-					<div ng-if = "monitor.Monitor.eventUrl == 'img/noevent.png' ">
-						<!-- make sure we don't use id here
-                             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-if=" monitor.Monitor.listDisplay!='noshow'">
-								<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;
-										
-										<i class="ion-ios-videocam"></i>
-                                       {{monitor.Monitor.Name}}&nbsp;
-
-                                
-									
-									</figcaption>
-								</figure>
-							</div>
-						</div>
+					
 						<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-if=" monitor.Monitor.listDisplay!='noshow'">
-									<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}}"/>
+									<img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{constructStream(monitor)}}"  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;
-- 
cgit v1.2.3