#709 #710 clean up video/image code, switch to "a download" for desktop

2 files changed, 17 insertions, 2 deletions

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)">