diff options
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events.html | 15 | ||||
| -rw-r--r-- | www/templates/image-modal.html | 10 |
2 files changed, 16 insertions, 9 deletions
diff --git a/www/templates/events.html b/www/templates/events.html index 8157d0f6..999c8c88 100644 --- a/www/templates/events.html +++ b/www/templates/events.html @@ -25,7 +25,7 @@ <!-- 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 | eventListFilter + <ion-item force-refresh-images="true" collection-repeat="event in events| filter:search.text | eventListFilter " item-height="event.Event.height" id="item-{{$index}}" on-swipe-left="checkSwipe($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;"> <i class="ion-calendar"></i> {{prettifyTime(event.Event.StartTime)}} {{tzAbbr}} </span> <span style="float:left;margin-top:-18px;background-color:#fff;color:#888;font-size:11px;opacity:1;"> <i class="ion-arrow-right-b"></i> {{event.Event.humanizeTime}} <span ng-if="!event.Event.EndTime">(<span translate="kRecordingProgress"></span>)</span> @@ -64,7 +64,7 @@ <div class="col"> <div class="item-text-wrap"> - <b><i ng-if="event.Event.Archived=='1'" class="ion-ios-flag" style="color:red"> </i>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) + <b><i ng-if="event.Event.Archived=='1'" class="ion-ios-flag" style="color:red"> </i>{{event.Event.MonitorName}}</b> <span ng-if"!loginData.enableThumbs || !event.Event.MaxScore">({{event.Event.Id}})</span> <button ng-if="gifshotSupported && loginData.enableGIFMP4 " class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)"> </button> @@ -72,7 +72,7 @@ <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)"> + <button ng-if="event.Event.DefaultVideo!='' && event.Event.DefaultVideo!=undefined && $root.platformOS!='desktop' && lpoginData.enableGIFMP4 " class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> </button> </div> @@ -80,15 +80,18 @@ <i class="ion-images"></i> {{event.Event.Frames}} <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} - <i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}} + <!--<i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}}--> </div> - <div ng-if="loginData.enableThumbs" class = "col col-left"> + <div ng-if="loginData.enableThumbs && event.Event.MaxScore" class = "col col-left"> <!-- thumbnail --> - <img style="max-width:150px; max-height:200px;" ng-src="{{event.Event.baseURL}}/index.php?view=image&fid={{event.Event.MaxScoreFrameId}}" on-tap="showThumbnail(event.Event.baseURL,event.Event.MaxScoreFrameId)" /> + <!-- ng-image-appear transition-duration="0.5s" animation="fillIn" bg-color="#50a4e2" --> + <img ng-image-appear transition-duration="0.3s" animation="fillIn" bg-color="#50a4e2" width="{{event.Event.thumbWidth}}px" height="{{event.Event.thumbHeight}}px" ng-src="{{event.Event.baseURL}}/index.php?view=image&fid={{event.Event.MaxScoreFrameId}}&width={{event.Event.thumbWidth*2}}&height={{event.Event.thumbHeight*2}}" on-tap="showThumbnail(event.Event.baseURL,event.Event.MaxScoreFrameId)" /> + <!--<p>{{event.Event.thumbWidth}}px*{{event.Event.thumbHeight}}px</p>--> + </div> </div> diff --git a/www/templates/image-modal.html b/www/templates/image-modal.html index 2ed126c6..7195bae7 100644 --- a/www/templates/image-modal.html +++ b/www/templates/image-modal.html @@ -1,5 +1,9 @@ <ion-modal-view cache-view="false" style="background-color:#444444"> -<ion-content> - <img on-double-tap="closeModal();" src="{{thumbnailLarge}}" style="display:block; width:100%"/> -</ion-content> + <ion-content> + <ion-scroll direction="xy" scrollbar-x="false" scrollbar-y="false" overflow-scroll="false" zooming="true"> + <img on-double-tap="closeModal();" src="{{thumbnailLarge}}" style="display:block; width:100%" /> + + </ion-scroll> + + </ion-content> </ion-modal-view> |