diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-12-31 10:28:15 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-12-31 10:28:15 -0500 |
| commit | 276b314e4827055f732178bc12add634d47db0d2 (patch) | |
| tree | 500110b71eabeb1c8ae44506b7c37562ca1847bb /www/templates | |
| parent | 3cb22d5117d9c7dd4e3192494b25a6e52be39d2b (diff) | |
crappy hackery #388
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/www/templates/events.html b/www/templates/events.html index 67971f7a..3c48f576 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" 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}}" 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> </span> @@ -128,7 +128,7 @@ </p> - <ion-scroll direction="x" overflow-scroll="false" on-swipe-left="alarmSwipe($event)"> + <ion-scroll direction="x" overflow-scroll="false" > <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames"> <figure class = "animated slideInLeft" style="display:inline-block"> @@ -196,10 +196,11 @@ <ion-delete-button class="ion-minus-circled" ng-click="deleteEvent(event.Event.Id, $index)"> </ion-delete-button> - <ion-option-button ng-if="event.Event.Archived == 1 && !event.Event.ShowScrub" class="button-balanced" ng-click= "archiveUnarchiveEvent($index,event.Event.Id)">{{'kUnflag' | translate}}</ion-option-button> + + <ion-option-button ng-if="event.Event.Archived == 1" class="button-balanced" ng-click= "archiveUnarchiveEvent($index,event.Event.Id)">{{'kUnflag' | translate}}</ion-option-button> - <ion-option-button ng-if="event.Event.Archived == 0 && !event.Event.ShowScrub" class="button-assertive" ng-click="archiveUnarchiveEvent($index, event.Event.Id)" >{{'kFlag' | translate}}</ion-option-button> - + <ion-option-button ng-if="event.Event.Archived == 0" class="button-assertive" ng-click="archiveUnarchiveEvent($index, event.Event.Id)" >{{'kFlag' | translate}}</ion-option-button> + <!-- hack to make sure swipe left displays well if there is no content and our list height is set |