From 31ca68739126f5740681238539a8c6a1b66e0000 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 18 Nov 2016 09:28:08 -0500
Subject: mass formatting and normalization - tweaked JSBeautify options

---
 www/templates/events.html | 305 ++++++++++++++--------------------------------
 1 file changed, 93 insertions(+), 212 deletions(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index af2a7f89..48163d2e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,82 +1,49 @@
-
 <ion-view cache-view="false">
-    
     <ion-nav-title>{{scrollPosition();}}</ion-nav-title>
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()">
         </button>
-
         <button class="button button-icon icon ion-ios-minus-outline" ng-click="eventList.showDelete = !eventList.showDelete;"></button>
-
         <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
-
     </ion-nav-buttons>
-
     <ion-nav-buttons side="right">
         <a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)" ;>&nbsp;&nbsp;&nbsp;</a>
         <a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
     </ion-nav-buttons>
-
     <div ng-if="showSearch">
         <ion-header-bar class="bar bar-subheader item-input-inset">
-
             <label class="item-input-wrapper">
                 <i class="icon ion-ios7-search placeholder-icon"></i>
                 <input type="search" placeholder="{{'kSearch'|translate}}" ng-model="search.text" autocorrect="off" autocomplete="off">
             </label>
         </ion-header-bar>
     </div>
-
-
-   
     <!-- collection repeat forces js scrolling, thing to remember -->
-        
-        <ion-content  scroll-sista ng-cloak on-tap="tapped();" delegate-handle="mainScroll"    mouse-wheel-scroll>
+    <ion-content scroll-sista ng-cloak on-tap="tapped();" delegate-handle="mainScroll" mouse-wheel-scroll>
         <!-- needed for header-shrink so first item doesn't go below header-->
-       <!-- <div style="height: 64px;"></div>-->
+        <!-- <div style="height: 64px;"></div>-->
         <!-- lets make sure the events list is not empty as collection repeat needs height -->
-      
         <div ng-if="!eventsBeingLoaded">
-            
             <ion-list show-delete="eventList.showDelete">
-                <ion-item collection-repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}"  >
-                    
-                    
+                <ion-item collection-repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}">
                     <span style="float:left;margin-top:-18px;background-color:#96281B;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;</span>&nbsp;&nbsp;
-                    
-                                        
                     <span style="float:left;margin-top:-18px;background-color:#fff;color:#888;font-size:11px;opacity:1;">&nbsp;&nbsp;<i class="ion-arrow-right-b"></i>&nbsp;{{event.Event.humanizeTime}} <span ng-if="!event.Event.EndTime">(<span translate="kRecordingProgress"></span>)</span>
                     </span>
-                    
-                 
-                   
-                    
                     <span style="float:right;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}}
                         &nbsp;{{tzAbbr}}&nbsp;</span>
-                    
-                    
-                    
-
-
                     <div class="row">
                         <div class="col col-left">
                             <!-- this ngswitch displays different icons
                                         depending on the cause of the event -->
-
                             <div ng-switch on="event.Event.Cause">
                                 <div ng-switch-when="Motion">
-
                                     <i class="ion-android-walk" style="float:left; font-size:200%;"></i>
-                                    
-                                        <i ng-class="(event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!='')? 'ion-ios-videocam':'ion-images'" style="float:left; padding-left:5px; font-size:100%;"></i>
-                                  
+                                    <i ng-class="(event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!='')? 'ion-ios-videocam':'ion-images'" style="float:left; padding-left:5px; font-size:100%;"></i>
                                     <br/>
                                 </div>
                                 <div ng-switch-when="Signal">
                                     <i class="ion-wifi" style="float:left; font-size:200%;"></i>
-                                    
                                     <i ng-class="(event.Event.DefaultVideo !== undefined && event.Event.DefaultVideo!='')? 'ion-ios-videocam':'ion-images'" style="float:left; padding-left:5px; font-size:100%;"></i>
-                                    
                                     <br/>
                                 </div>
                                 <div ng-switch-default>
@@ -87,7 +54,6 @@
                             </div>
                             <!-- ng switch -->
                             <!-- {{event.Event.Cause}} -->
-
                             <br/>
                             <span style="font-size:80%; color:rgb(110,110,110)">
                                 {{event.Event.Length}}s
@@ -99,14 +65,12 @@
                                 <i class="ion-ios-videocam-outline"></i>
                                 <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}})
                             </div>
-
                             <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
                             <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
                             <i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}}
                         </div>
                     </div>
                     <!--row-->
-
                     <div class="row" style="font-size:80%; color:rgb(110,110,110)">
                         <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp; {{prettify(event.Event.StartTime)}}&nbsp;{{tzAbbr}}&nbsp;
                             <br/>
@@ -114,178 +78,113 @@
                             <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}-->
                         </div>
                     </div>
-
                     <span style="float:right">
                                 <div ng-if="event.Event.EndTime || 1">
                                     
                                     <button class="button button-small button-outline icon icon-left ion-stats-bars"
                                             ng-click="closeIfOpen(event);analyzeEvent(event)" >  <span translate="kAnalyze"></span>
-                                    </button>
-                                    
-                                    <button class="button button-outline button-small icon icon-left ion-ios-eye"
-                                            ng-click="toggleGroupScrub(event,$index,event.Event.Frames)" >  <span translate="kScrub"></span>
-                                    </button>
-                                    
-                                    <button  ng-if="event.Event.AlarmFrames > 0" class="button button-outline button-small icon icon-left ion-ios-bell"
-                                            ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)" >  <span translate="kAlarms"></span>
-                                    </button>
-
-
-                                    <button class="button button-outline button-small icon icon-left ion-ios-eye"
-                                            ng-click="closeIfOpen(event);openModal(event)" > <span translate="kFootage"></span>
-                                    </button>
-                                </div>
-                              
-                                
-                    </span>
-
-
-                    <!-- this is the event scrub/alarm frames area -->
-                    <div ng-if="isGroupShown(event)">
-                        
-                        
-                        
-                        <div ng-if="groupType=='alarms'">
-                            <br/><br/>
-                          
-                            <div style="height:190px;">
-                                <p>
-                                    <!--scroll <i class="icon ion-arrow-left-c"></i> 
+                    </button>
+                    <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="toggleGroupScrub(event,$index,event.Event.Frames)"> <span translate="kScrub"></span>
+                    </button>
+                    <button ng-if="event.Event.AlarmFrames > 0" class="button button-outline button-small icon icon-left ion-ios-bell" ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)"> <span translate="kAlarms"></span>
+                    </button>
+                    <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="closeIfOpen(event);openModal(event)"> <span translate="kFootage"></span>
+                    </button>
+        </div>
+        </span>
+        <!-- this is the event scrub/alarm frames area -->
+        <div ng-if="isGroupShown(event)">
+            <div ng-if="groupType=='alarms'">
+                <br/>
+                <br/>
+                <div style="height:190px;">
+                    <p>
+                        <!--scroll <i class="icon ion-arrow-left-c"></i> 
                                 <i class="icon ion-arrow-right-c"></i>-->
-                                
-                                    <button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-outline">
-                                        <span translate="kType"></span>:{{typeOfFrames}}
-                                    </button>
-                                </p>
-                                
-                                
-                                <ion-scroll direction="x" overflow-scroll="false">
-                                  
-                                        <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames">
+                        <button ng-click="toggleTypeOfAlarms()" class="button button-small button-assertive button-outline">
+                            <span translate="kType"></span>:{{typeOfFrames}}
+                        </button>
+                    </p>
+                    <ion-scroll direction="x" overflow-scroll="false">
+                        <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames">
                                                  
                                             <figure  class = "animated slideInLeft" style="display:inline-block">
                                                 <!--{{event.Event.baseURL}} p:{{event.Event.imageMode}}-->
-                                                <figcaption class="smallnote"><span translate="kFrame"></span>:{{alarm.frameid}},<span translate="kScore"></span>:{{alarm.score}}, <span translate="kTime"></span>: {{prettifyTimeSec(alarm.time)}}</figcaption>       
-                                                  <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)"  />
-                                                
-                                                <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}"    style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)"  />
-                                                
-                                               
-                                                  
-                                                
-                                                </figure>
-                                          
-                                        </span>
-                                    
-                               </ion-scroll>
-                            </div>
-                        </div>
-                        <div ng-if="groupType=='scrub'">    
-                            <div ng-if="event.Event.DefaultVideo=='' || loginData.enableh264==false">
-
-
-                                <br/>
-                                <br/>
-                                <br/>
-                                <div style="width:90%">
-                                    <input ng-model="ionRange.index" type="text" id="mySlider1" slider options="slider_options" />
-                                </div>
-
-                                <br/>
-
-
-
-                                <p>{{mycarousel.index+1}}/{{event.Event.Frames}} <span translate="kType"></span>: {{FrameArray[mycarousel.index].Type}}</p>
-
-                                <div style="height:190px">
-
-
-                                    <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{event.Event.Length/event.Event.Frames}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}">
-                                        <li ng-repeat="slide in slides">
-                                            
-                                             
-                                            <img ng-if="event.Event.imageMode=='path'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
-                                            
-                                            <img ng-if="event.Event.imageMode=='fid'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{slide.id}}" image-spinner-loader="lines" height="190px" ;/>
-                                            
-                                            
-                                            
-                                            <br/>
-
-
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <!-- no DefaultVideo -->
-
-
-                            <div ng-if="event.Event.DefaultVideo!='' && loginData.enableh264 == true">
-
-                                <br/>
-                                <br/>
+                                                <figcaption class="smallnote"><span translate="kFrame"></span>:{{alarm.frameid}},<span translate="kScore"></span>:{{alarm.score}}, <span translate="kTime"></span>: {{prettifyTimeSec(alarm.time)}}</figcaption>
+                        <img ng-if="event.Event.imageMode=='path'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{alarm.fname}}&height=380" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
+                        <img ng-if="event.Event.imageMode=='fid'" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{alarm.id}}" style="width: auto; height: auto;max-width: 100%;max-height: 170px" on-tap="showImage(event.Event.baseURL,event.Event.relativePath,alarm.fname, alarm.frameid, event.Event.Id, event.Event.imageMode, alarm.id, alarm_images, $index)" />
+                        </figure>
+                        </span>
+                    </ion-scroll>
+                </div>
+            </div>
+            <div ng-if="groupType=='scrub'">
+                <div ng-if="event.Event.DefaultVideo=='' || loginData.enableh264==false">
+                    <br/>
+                    <br/>
+                    <br/>
+                    <div style="width:90%">
+                        <input ng-model="ionRange.index" type="text" id="mySlider1" slider options="slider_options" />
+                    </div>
+                    <br/>
+                    <p>{{mycarousel.index+1}}/{{event.Event.Frames}} <span translate="kType"></span>: {{FrameArray[mycarousel.index].Type}}</p>
+                    <div style="height:190px">
+                        <ul rn-carousel rn-carousel-buffered rn-carousel-transition="none" rn-swipe-disabled="true" rn-carousel-index="mycarousel.index" rn-carousel-auto-slide="{{event.Event.Length/event.Event.Frames}}" rn-carousel-pause-on-hover rn-platform="{{$root.platformOS}}">
+                            <li ng-repeat="slide in slides">
+                                <img ng-if="event.Event.imageMode=='path'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&path={{event.Event.relativePath}}{{slide.img}}&height=380" image-spinner-loader="lines" height="190px" ;/>
+                                <img ng-if="event.Event.imageMode=='fid'" imageonload="finishedLoadingImage($index)" image-spinner-src="{{event.Event.baseURL}}/index.php?view=image&fid={{slide.id}}" image-spinner-loader="lines" height="190px" ;/>
                                 <br/>
-
-
-                                <div class="videogular-container">
-                                    <videogular vg-theme="event.Event.video.config.theme" 
-                                                vg-plays-inline="'true'" vg-auto-play="'true'" vg-responsive="true">
-                                        <vg-overlay-play></vg-overlay-play>
-                                        <vg-controls>
-                                            <vg-play-pause-button></vg-play-pause-button>
-                                            <vg-scrub-bar>
-                                                <vg-scrub-bar-current-time></vg-scrub-bar-current-time>
-                                            </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>
-
-                                        <vg-media vg-src="event.Event.video.config.sources" vg-native-controls="false">
-                                        </vg-media>
-                                        
-                                       
-                                    </videogular>
-                                </div>
-
-                            </div>
-                            <!-- DefaultVideo -->
-                        </div> <!-- type = scrub -->
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <!-- no DefaultVideo -->
+                <div ng-if="event.Event.DefaultVideo!='' && loginData.enableh264 == true">
+                    <br/>
+                    <br/>
+                    <br/>
+                    <div class="videogular-container">
+                        <videogular vg-theme="event.Event.video.config.theme" vg-plays-inline="'true'" vg-auto-play="'true'" vg-responsive="true">
+                            <vg-overlay-play></vg-overlay-play>
+                            <vg-controls>
+                                <vg-play-pause-button></vg-play-pause-button>
+                                <vg-scrub-bar>
+                                    <vg-scrub-bar-current-time></vg-scrub-bar-current-time>
+                                </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>
+                            <vg-media vg-src="event.Event.video.config.sources" vg-native-controls="false">
+                            </vg-media>
+                        </videogular>
                     </div>
-                    <!-- isGroupShown -->
-
-                    <ion-delete-button class="ion-minus-circled" ng-click="deleteEvent(event.Event.Id, $index)">
-                    </ion-delete-button>
-
-
-
-                </ion-item>
-            </ion-list>
+                </div>
+                <!-- DefaultVideo -->
+            </div>
+            <!-- type = scrub -->
+        </div>
+        <!-- isGroupShown -->
+        <ion-delete-button class="ion-minus-circled" ng-click="deleteEvent(event.Event.Id, $index)">
+        </ion-delete-button>
+        </ion-item>
+        </ion-list>
         </div>
-
         <ion-item ng-show="!events.length">
             <span translate="kNoEvents"></span>
         </ion-item>
-
         <div ng-if="!eventsBeingLoaded">
             <ion-infinite-scroll ng-if="moreDataCanBeLoaded()" icon="ion-loading-c" on-infinite="loadMore()" distance="2%">
             </ion-infinite-scroll>
         </div>
     </ion-content>
-    
-    
-    
     <div class="events-float-filter" ng-if="isEventFilterOn" on-tap="filterTapped();"><span translate="kFilterOn"></span></div>
-    
-     <div class="bwmode" ng-if="$root.runMode=='lowbw'">
-            <span translate="kLowBWDisplay"></span>
-     </div>
-    
-
+    <div class="bwmode" ng-if="$root.runMode=='lowbw'">
+        <span translate="kLowBWDisplay"></span>
+    </div>
     <ion-pull-up-footer class="zmPullup" on-expand="footerExpand()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
-
         <ion-pull-up-handle width="100" height="25" toggle="ion-chevron-up ion-chevron-down" style="border-radius: 25px 25px 0 0">
             <i class="icon ion-chevron-up"></i>
         </ion-pull-up-handle>
@@ -293,74 +192,56 @@
             <h1 class="title" ion-pull-up-trigger><span translate="kLatestEvents"></span></h1>
         </ion-pull-up-bar>
         <ion-pull-up-content scroll="true">
-
             <div class="list list-inset">
                 <div class="item item-divider"><span translate="k1HourSummary"></span></div>
                 <div ng-repeat="hour in hours|filter:{ monitor: '!'+'(Unknown)'}" id="hour-{{$index}}">
-
                     <span style="color:black">
                     <a class="item item-icon-right" href="" 
                        ng-click="showEvents('1', 'hour',hour.mid);">
                         <b>{{hour.monitor}}</b> {{hour.events}} <span translate="kEvents"></span>
-                        <i class="icon ion-android-arrow-dropright"></i>
+                    <i class="icon ion-android-arrow-dropright"></i>
                     </a>
                     </span>
-
                 </div>
             </div>
-
             <div class="list list-inset">
                 <div class="item item-divider"><span translate="k1DaySummary"></span></div>
                 <div ng-repeat="day in days|filter:{ monitor: '!'+'(Unknown)'}" id="day-{{$index}}">
-
                     <span style="color:black">
                     <a class="item item-icon-right" href="" 
                        ng-click="showEvents('1', 'day',day.mid);">
                         <b>{{day.monitor}}</b> {{day.events}} <span translate="kEvents"></span>
-                        <i class="icon ion-android-arrow-dropright"></i>
+                    <i class="icon ion-android-arrow-dropright"></i>
                     </a>
                     </span>
-
                 </div>
             </div>
-
-
             <div class="list list-inset">
                 <div class="item item-divider"><span translate="k1WeekSummary"></span></div>
                 <div ng-repeat="week in weeks|filter:{ monitor: '!'+'(Unknown)'}" id="week-{{$index}}">
-
                     <span style="color:black">
                     <a class="item item-icon-right" href="" 
                        ng-click="showEvents('1', 'week',week.mid);">
                         <b>{{week.monitor}}</b> {{week.events}} <span translate="kEvents"></span>
-                        <i class="icon ion-android-arrow-dropright"></i>
+                    <i class="icon ion-android-arrow-dropright"></i>
                     </a>
                     </span>
-
                 </div>
             </div>
-
             <div class="list list-inset">
                 <div class="item item-divider"><span translate="k1MonthSummary"></span></div>
                 <div ng-repeat="month in months|filter:{ monitor: '!'+'(Unknown)'}" id="month-{{$index}}">
-
                     <span style="color:black">
                     <a class="item item-icon-right" href="" 
                        ng-click="showEvents('1', 'months',month.mid);">
                         <b>{{month.monitor}}</b> {{month.events}} <span translate="kEvents"></span>
-                        <i class="icon ion-android-arrow-dropright"></i>
+                    <i class="icon ion-android-arrow-dropright"></i>
                     </a>
                     </span>
-
                 </div>
             </div>
-
             <br/>
             <br/>
-
-
         </ion-pull-up-content>
     </ion-pull-up-footer>
-
-
 </ion-view>
-- 
cgit v1.2.3


From 9dc36815cdf21287a597842d6653b3f652f5d85c Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 18 Nov 2016 16:33:07 -0500
Subject: Experimental and initial version - still has work to go - #379

---
 www/templates/events.html | 57 ++++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 48163d2e..fe6bfa76 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -63,7 +63,10 @@
                         <div class="col col-80">
                             <div class="item-text-wrap">
                                 <i class="ion-ios-videocam-outline"></i>
-                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}})
+                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}}) &nbsp; &nbsp;
+                                <button ng-if="gifshotSupported" class="button button-small button-outline icon ion-android-download" ng-click="downloadAsGif(event)"> 
+                            </button>
+
                             </div>
                             <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
                             <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
@@ -79,17 +82,21 @@
                         </div>
                     </div>
                     <span style="float:right">
-                                <div ng-if="event.Event.EndTime || 1">
-                                    
-                                    <button class="button button-small button-outline icon icon-left ion-stats-bars"
-                                            ng-click="closeIfOpen(event);analyzeEvent(event)" >  <span translate="kAnalyze"></span>
-                    </button>
-                    <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="toggleGroupScrub(event,$index,event.Event.Frames)"> <span translate="kScrub"></span>
-                    </button>
-                    <button ng-if="event.Event.AlarmFrames > 0" class="button button-outline button-small icon icon-left ion-ios-bell" ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)"> <span translate="kAlarms"></span>
-                    </button>
-                    <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="closeIfOpen(event);openModal(event)"> <span translate="kFootage"></span>
-                    </button>
+                        <div ng-if="event.Event.EndTime || 1">
+                             <button class="button button-small button-outline icon icon-left ion-stats-bars"
+                                            ng-click="closeIfOpen(event);analyzeEvent(event)" > 
+                                             <span translate="kAnalyze"></span>
+                            </button>
+                            <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="toggleGroupScrub(event,$index,event.Event.Frames)"> <span translate="kScrub"></span>
+                            </button>
+                            <button ng-if="event.Event.AlarmFrames > 0" class="button button-outline button-small icon icon-left ion-ios-bell" ng-click="toggleGroupAlarms(event,$index,event.Event.Frames)"> <span translate="kAlarms"></span>
+                            </button>
+                            <button class="button button-outline button-small icon icon-left ion-ios-eye" ng-click="closeIfOpen(event);openModal(event)"> <span translate="kFootage"></span>
+                            </button>
+
+                            
+
+
         </div>
         </span>
         <!-- this is the event scrub/alarm frames area -->
@@ -168,17 +175,20 @@
         </div>
         <!-- isGroupShown -->
         <ion-delete-button class="ion-minus-circled" ng-click="deleteEvent(event.Event.Id, $index)">
-        </ion-delete-button>
-        </ion-item>
-        </ion-list>
-        </div>
-        <ion-item ng-show="!events.length">
-            <span translate="kNoEvents"></span>
-        </ion-item>
-        <div ng-if="!eventsBeingLoaded">
-            <ion-infinite-scroll ng-if="moreDataCanBeLoaded()" icon="ion-loading-c" on-infinite="loadMore()" distance="2%">
-            </ion-infinite-scroll>
-        </div>
+            </ion-delete-button>
+            </ion-item>
+            </ion-list>
+            </div>
+            <!-- !eventsBeingLoaded-->
+
+
+            <ion-item ng-show="!events.length">
+                <span translate="kNoEvents"></span>
+            </ion-item>
+            <div ng-if="!eventsBeingLoaded">
+                <ion-infinite-scroll ng-if="moreDataCanBeLoaded()" icon="ion-loading-c" on-infinite="loadMore()" distance="2%">
+                </ion-infinite-scroll>
+            </div>
     </ion-content>
     <div class="events-float-filter" ng-if="isEventFilterOn" on-tap="filterTapped();"><span translate="kFilterOn"></span></div>
     <div class="bwmode" ng-if="$root.runMode=='lowbw'">
@@ -239,6 +249,7 @@
                     </a>
                     </span>
                 </div>
+
             </div>
             <br/>
             <br/>
-- 
cgit v1.2.3


From 662af8fdebb58e9129c437e17471ab3df5c3fddf Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 18 Nov 2016 20:10:25 -0500
Subject: made it work for iOS, also added percentage progress indication #379

---
 www/templates/events.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index fe6bfa76..918ab5fc 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -64,7 +64,7 @@
                             <div class="item-text-wrap">
                                 <i class="ion-ios-videocam-outline"></i>
                                 <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}}) &nbsp; &nbsp;
-                                <button ng-if="gifshotSupported" class="button button-small button-outline icon ion-android-download" ng-click="downloadAsGif(event)"> 
+                                <button ng-if="gifshotSupported" class="button button-small button-outline icon ion-android-download" ng-click="  permissionsDownload(event)"> 
                             </button>
 
                             </div>
-- 
cgit v1.2.3


From 53dba9853bd78dac6d1df70baef43f181ca810f4 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 19 Nov 2016 10:26:47 -0500
Subject: restricted gif size to max 50 images. If larger, it will keep
 deleting subsequent frames till <=50 is reached. Otherwise memory consumption
 can go nuts. #379

---
 www/templates/events.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 918ab5fc..cfb6fa0d 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -63,7 +63,7 @@
                         <div class="col col-80">
                             <div class="item-text-wrap">
                                 <i class="ion-ios-videocam-outline"></i>
-                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}}) &nbsp; &nbsp;
+                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) &nbsp; &nbsp;
                                 <button ng-if="gifshotSupported" class="button button-small button-outline icon ion-android-download" ng-click="  permissionsDownload(event)"> 
                             </button>
 
-- 
cgit v1.2.3


From d90a9534c04299c7eedefaf4388801722562ad09 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 23 Nov 2016 16:24:56 -0400
Subject: updates for #379 and #383 - you will now see both an MP4 and a GIF
 icon. MP4 will show only if you are on desktop and using 264 branch

---
 www/templates/events.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index cfb6fa0d..849d9e3e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -64,9 +64,13 @@
                             <div class="item-text-wrap">
                                 <i class="ion-ios-videocam-outline"></i>
                                 <b>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) &nbsp; &nbsp;
-                                <button ng-if="gifshotSupported" class="button button-small button-outline icon ion-android-download" ng-click="  permissionsDownload(event)"> 
+                                <button ng-if="gifshotSupported" class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)"> 
                             </button>
 
+                          
+
+                            <a ng-if="event.Event.DefaultVideo!='' && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
+
                             </div>
                             <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
                             <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
-- 
cgit v1.2.3


From c44d3a53535373087f082a48fcd2eef1f34fb572 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 23 Nov 2016 21:24:01 -0400
Subject: removed device download for now -- need to experiment

---
 www/templates/events.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 849d9e3e..6917dec8 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -71,6 +71,10 @@
 
                             <a ng-if="event.Event.DefaultVideo!='' && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
 
+                             <!--<button ng-if="event.Event.DefaultVideo!='' && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath)"> 
+                            </button>-->
+
+
                             </div>
                             <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
                             <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
-- 
cgit v1.2.3


From e664d4d5a8ef7a475773b4a9760022b4d87d27a3 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 25 Nov 2016 17:38:08 -0500
Subject: removed mp4 for non desktop #384

---
 www/templates/events.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 6917dec8..9d4f6b49 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -69,7 +69,7 @@
 
                           
 
-                            <a ng-if="event.Event.DefaultVideo!='' && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
+                            <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
 
                              <!--<button ng-if="event.Event.DefaultVideo!='' && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath)"> 
                             </button>-->
-- 
cgit v1.2.3


From 1009cd07dd8beae0eee2a7b7f677da7c03b88b43 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 26 Nov 2016 03:32:43 -0500
Subject: added support for video download on devices - need to test more. On
 devices you can actually track progress. #383

---
 www/templates/events.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 9d4f6b49..340fdab2 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -71,8 +71,8 @@
 
                             <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
 
-                             <!--<button ng-if="event.Event.DefaultVideo!='' && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath)"> 
-                            </button>-->
+                             <button ng-if="event.Event.DefaultVideo!='' && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> 
+                            </button>
 
 
                             </div>
-- 
cgit v1.2.3


From e3bbbf419adae4f391c786d94db4acd7b88a0355 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 26 Nov 2016 14:39:41 -0500
Subject: various updates to video downloads, including device compatibility
 (android) #383

---
 www/templates/events.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 340fdab2..8fe8c737 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -62,8 +62,8 @@
                         <!-- col col left-->
                         <div class="col col-80">
                             <div class="item-text-wrap">
-                                <i class="ion-ios-videocam-outline"></i>
-                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) &nbsp; &nbsp;
+                                
+                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) &nbsp;
                                 <button ng-if="gifshotSupported" class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)"> 
                             </button>
 
@@ -71,7 +71,7 @@
 
                             <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
 
-                             <button ng-if="event.Event.DefaultVideo!='' && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> 
+                             <button ng-if="event.Event.DefaultVideo!='' && event.Event.DefaultVideo!=undefined && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> 
                             </button>
 
 
-- 
cgit v1.2.3


From eb4dcce4167444cc856ed904c23d4417365dd0e8 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 30 Nov 2016 15:40:32 -0500
Subject: major rewrite of GIF creation - memory handling much better #398 -
 moved to Stream based support

---
 www/templates/events.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'www/templates/events.html')

diff --git a/www/templates/events.html b/www/templates/events.html
index 8fe8c737..5d60a46b 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -197,6 +197,7 @@
                 <ion-infinite-scroll ng-if="moreDataCanBeLoaded()" icon="ion-loading-c" on-infinite="loadMore()" distance="2%">
                 </ion-infinite-scroll>
             </div>
+            <canvas id="canvas" class="hiddengifcanvas"></canvas>
     </ion-content>
     <div class="events-float-filter" ng-if="isEventFilterOn" on-tap="filterTapped();"><span translate="kFilterOn"></span></div>
     <div class="bwmode" ng-if="$root.runMode=='lowbw'">
-- 
cgit v1.2.3