From 07654b2eaaba4890cbbc45dec70e5995fd36a655 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 11 Oct 2016 12:32:45 -0400
Subject: cleanup and fixes to montage history

Former-commit-id: 440b7c8a70e4085afcdc7ed8e9b14eb979198177
---
 www/templates/events-modal.html    |  2 +-
 www/templates/montage-history.html | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 2c1c38c7..b71cf751 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -78,7 +78,7 @@
             <div ng-if="( (defaultVideo=='') || (loginData.enableh264==false)) && (loginData.useNphZmsForEvents==true)">
                 <div id="event_canvas">
                     <canvas style="padding-left:23px;
-                        padding-right:23px;" id="eventchart" width="auto" height="20px"></canvas>
+                        padding-right:23px;" id="eventchart" width="auto" height="20"></canvas>
                 </div>
                 <div ng-if="checkEventOn" id="event_slider" data-tap-disabled="false">
                     <div class="range">
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index aa38df16..98426dc1 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
 			<!-- <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' && !sliderVal.hideNoEvents">
+					<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}}" >
@@ -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()" />
+									<img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}"  image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)"  on-swipe-left="toggleControls()" />
 									<figcaption class="normal-figcaption" >
 
                                         &nbsp;
@@ -50,12 +50,12 @@
 											<i class="ion-pause"></i>&nbsp;
 										</span> {{monitor.Monitor.Name}}&nbsp;
             
-										<div ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style="white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:9px" class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">
+										<div ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style="white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:9px" class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">[{{monitor.Monitor.eid}}]
 											<i class="ion-clock"></i> {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}} ({{humanizeTime(monitor.Monitor.eventUrlTime)}})&nbsp; 
 										</div>
 									</figcaption>
 								</figure>
-								<div ng-if="showControls">
+								<div ng-show="showControls">
                                      
                             
                        
@@ -63,12 +63,13 @@
 										<input on-release="seek(monitor.Monitor.Id,monitor.Monitor.sliderProgress.progress )" type="range" min="0" max="{{monitor.Monitor.eventDuration}}" ng-model="monitor.Monitor.sliderProgress.progress">
 										</div>
                                     <div id="history_canvas_video">
-                                        eventchart-{{monitor.Monitor.Id}}
-                                        <canvas id="eventchart-{{monitor.Monitor.Id}}" width="95%" height="20px"></canvas>
-                                    </div>
+                                        
+                                        <canvas style="padding-left:23px;
+                        padding-right:23px;" id="eventchart-{{monitor.Monitor.Id}}" width="auto" height="20"></canvas>
+                                    
 
 									</div>
-									<div id="flyoutmenu" ng-if="showControls" style="position:absolute;top:50%;left:50%;z-index:99999;transform: translate(-50%, -50%);">
+									<div id="flyoutmenu" ng-if="showControls" style="position:absolute;bottom:5%;left:50%;z-index:99999;transform: translate(-50%, -50%);">
 										<ul>
 											<li>
 												<a href="" ng-click="moveSlower(monitor.Monitor.Id)"> {{'kEventHistSlower' | translate}} </a>
@@ -81,6 +82,8 @@
 											</li>
 										</ul>
 									</div>
+                                </div>
+                                
 								</div>
 							</div>
 						</div>
-- 
cgit v1.2.3