diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 16 | ||||
| -rw-r--r-- | www/templates/events.html | 15 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 4 |
3 files changed, 28 insertions, 7 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 598bde23..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="defaultVideo=='' && isToggleListMenu && (!isSnapShot() || liveFeedMid) "> - <a href="" ng-click="saveEventImageToPhoneWithPerms(false)"> - <i class="ion-ios-camera"></i> + <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..79c0ef8f 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)"> @@ -95,8 +100,14 @@ <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 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>--> 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> |