#775 - initial updates

1 files changed, 58 insertions, 2 deletions

diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 597b7fe8..791932ae 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -26,7 +26,63 @@
       <span ng-repeat="monitor in MontageMonitors | onlyEnabledAndEventHas |limitTo: currentLimit">
 
 
-        <div ng-if="monitor.Monitor.eventUrl != 'img/noimage.png' && monitor.Monitor.connKey !=''">
+
+        <!-- Video -->
+
+        <div ng-if="monitor.Monitor.eventType == 'video'">
+          <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'">
+
+
+              <videogular vg-can-play="onCanPlay()" vg-native-fullscreen="monitor.Monitor.videoObject.config.nativeFullScreen"
+                vg-player-ready="onPlayerReady($API)" vg-update-playback="onPlaybackUpdate($playBack)" vg-plays-inline="monitor.Monitor.videoObject.config.playsInline"
+                vg-theme="monitor.Monitor.videoObject.config.theme" vg-complete="playbackFinished()" vg-autoplay="monitor.Monitor.videoObject.config.autoPlay"
+                vg-responsive="monitor.Monitor.videoObject.config.responsive" vg-update-time="videoTime(event.Event.StartTime,$currentTime)"
+                vg-error="onVideoError($event)">
+                <vg-media vg-src="monitor.Monitor.videoObject.config.sources" vg-native-controls="monitor.Monitor.videoObject.config.nativeControls">
+                </vg-media>
+                <vg-controls>
+                  <vg-playback-button></vg-playback-button>
+                  <vg-play-pause-button></vg-play-pause-button>
+                  <vg-time-display>{{ videoTime(event.Event.StartTime, currentTime ); }}</vg-time-display>
+                  <vg-scrub-bar>
+                    <vg-scrub-bar-current-time></vg-scrub-bar-current-time>
+                    <vg-cuepoints vg-cuepoints-config="monitor.Monitor.videoObject.config.cuepoints" vg-cuepoints-theme="monitor.Monitor.videoObject.config.cuepoints.theme.url">
+                    </vg-cuepoints>
+                  </vg-scrub-bar>
+                  <vg-time-display>{{ timeLeft | date:'mm:ss':'+0000' }}</vg-time-display>
+                  <vg-fullscreen-button></vg-fullscreen-button>
+                  <vg-volume>
+                    <vg-mute-button></vg-mute-button>
+                  </vg-volume>
+                </vg-controls>
+
+              </videogular>
+
+              <figcaption class="normal-figcaption">
+
+                &nbsp; [{{monitor.Monitor.eventType}}]
+
+                <i class="ion-ios-videocam"></i>
+                <span style="background-color:red;color:#fff" ng-if="monitor.Monitor.isPaused">&nbsp;
+
+                  <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">[{{monitor.Monitor.eid}}]
+                  <i class="ion-clock"></i> {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}}
+                  ({{humanizeTime(monitor.Monitor.eventUrlTime)}})&nbsp;
+                </div>
+              </figcaption>
+            </figure>
+           
+        
+          </div>
+        </div>
+
+        <div ng-if="monitor.Monitor.eventUrl != 'img/noimage.png' && monitor.Monitor.connKey !='' && monitor.Monitor.eventType == 'jpeg'">
           <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'">
@@ -36,7 +92,7 @@
                 img-spinner-h="{{monitor.Monitor.Height}}" />
               <figcaption class="normal-figcaption">
 
-                &nbsp;
+                &nbsp; [[ {{monitor.Monitor.eventType}}]]
 
                 <i class="ion-ios-videocam"></i>
                 <span style="background-color:red;color:#fff" ng-if="monitor.Monitor.isPaused">&nbsp;