From e520aecb5b1e3c3da74383f0c91e2e2f81d003f0 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 24 Sep 2018 16:48:40 -0400
Subject: #710 allow native video downloads

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

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 598bde23..6342ab98 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -155,9 +155,9 @@
           <a href="" ng-click="toggleGapless()">
             <i class="ion-ios-loop-strong"></i>-{{loginData.gapless? ('kOn' | translate): ('kOff' | translate)}}</a>
         </li>
-        <li ng-if="defaultVideo=='' && isToggleListMenu && (!isSnapShot() || liveFeedMid) ">
+        <li ng-if="isToggleListMenu ">
           <a href="" ng-click="saveEventImageToPhoneWithPerms(false)">
-            <i class="ion-ios-camera"></i>
+            <i class="ion-android-download"></i>
           </a>
         </li>
         <li ng-if="defaultVideo=='' && isToggleListMenu">
-- 
cgit v1.2.3


From 74a4d75566708e78eb0aedae466008fb7c4e187e Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Tue, 25 Sep 2018 15:44:57 -0400
Subject: #709 #710 clean up video/image code, switch to "a download" for
 desktop

---
 www/templates/events-modal.html | 14 ++++++++++++--
 www/templates/events.html       |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 6342ab98..1f168b69 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -155,11 +155,21 @@
           <a href="" ng-click="toggleGapless()">
             <i class="ion-ios-loop-strong"></i>-{{loginData.gapless? ('kOn' | translate): ('kOff' | translate)}}</a>
         </li>
-        <li ng-if="isToggleListMenu ">
-          <a href="" ng-click="saveEventImageToPhoneWithPerms(false)">
+        <li ng-if="isToggleListMenu">
+          <a href="" ng-click="saveEventImageToPhoneWithPerms(false, 'any')">
+            <i class="ion-camera"></i>
+          </a>
+        </li>
+
+        
+
+        <li ng-if="isToggleListMenu && defaultVideo !='' && defaultVideo != undefined">
+          <a href="" ng-click="saveEventVideoToPhoneWithPerms()">
             <i class="ion-android-download"></i>
           </a>
         </li>
+
+
         <li ng-if="defaultVideo=='' && isToggleListMenu">
           <a href="" ng-click="saveEventImageToPhoneWithPerms(true)">
             <i class="ion-android-notifications"></i>
diff --git a/www/templates/events.html b/www/templates/events.html
index c517966f..291762a4 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -78,12 +78,17 @@
                 {{humanize(event.Event.Length)}}
               </span>
               <br/>
+
+              <!-- No longer needed - direct video download supported now
+                
               <button ng-if="gifshotSupported && loginData.enableGIFMP4 " class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)">
               </button>
 
               <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' && loginData.enableGIFMP4 "
                 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!='' && event.Event.DefaultVideo!=undefined && $root.platformOS!='desktop' && loginData.enableGIFMP4 "
                 class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)">
-- 
cgit v1.2.3


From ebe04f8fc791413131c37425998be5be4a2ef538 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Fri, 28 Sep 2018 14:29:43 -0400
Subject: #709 dont escape urls in caller, incorporate cordova http ssl and
 basic auth checks

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

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 291762a4..66291c55 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -100,8 +100,11 @@
 
             <div align="right" class="col col-40" ng-if="loginData.enableThumbs" >
               
-                <img  ng-image-appear no-loader transition-duration="0.3s" animation="fillIn" bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}"
-                  on-tap="closeIfOpen(event);openModalWithSnapshot(event)"  width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" />
+
+              <img  ng-image-appear no-loader transition-duration="0.3s" animation="fillIn" bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}"
+              on-tap="closeIfOpen(event);openModalWithSnapshot(event)"  width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" />
+
+            
                 <!--<p>{{event.Event.thumbWidth}}px*{{event.Event.thumbHeight}}px</p>-->
             
 
-- 
cgit v1.2.3


From 57920cc5d5e96780e13a29c04a577d4c67496aba Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 29 Sep 2018 11:50:53 -0400
Subject: #709 encorce AUTH_HASH_LOGIN for mobile

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

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 66291c55..79c0ef8f 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -101,9 +101,12 @@
             <div align="right" class="col col-40" ng-if="loginData.enableThumbs" >
               
 
+              <img  bg-color="#6C7A89" src="{{constructThumbnail(event)}}"
+              on-tap="closeIfOpen(event);openModalWithSnapshot(event)"  width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" />
+              <!--
               <img  ng-image-appear no-loader transition-duration="0.3s" animation="fillIn" bg-color="#6C7A89" ng-src="{{constructThumbnail(event)}}"
               on-tap="closeIfOpen(event);openModalWithSnapshot(event)"  width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" />
-
+              -->
             
                 <!--<p>{{event.Event.thumbWidth}}px*{{event.Event.thumbHeight}}px</p>-->
             
-- 
cgit v1.2.3


From 4c934b2a119d8696b91ce2c21c74d05bbf4036d3 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 30 Sep 2018 17:39:31 -0400
Subject: generalize alarm name

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

(limited to 'www/templates')

diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 980e2384..0b6ec69c 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -148,12 +148,12 @@
         </a>
       </li>
       <li ng-if="isToggleListMenu">
-        <a href="" ng-click="enableAlarm(monitorId,true)">
+        <a href="" ng-click="triggerAlarm(monitorId,'on')">
           <i class="icon  ion-flash"></i>
         </a>
       </li>
       <li ng-if="isToggleListMenu">
-        <a href="" ng-click="enableAlarm(monitorId,false)">
+        <a href="" ng-click="triggerAlarm(monitorId,'off')">
           <i class="icon  ion-flash-off"></i>
         </a>
       </li>
-- 
cgit v1.2.3