diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-30 03:30:57 +0100 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-30 03:30:57 +0100 |
| commit | 8812d6fd22b1710e019ba53e94723c76b97af6b7 (patch) | |
| tree | e5e2a74d56715f20d3604cab15943dfa4f9f54f6 /www/templates | |
| parent | af2a626dedb251670b573356b6993c5d7197f0ec (diff) | |
#108 - minAlarmCount is now part of each serverProfile and will persist
Former-commit-id: 89ecf51624e78a95474630b48c05d9fa921164c0
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-popover.html | 4 | ||||
| -rw-r--r-- | www/templates/timeline-popover.html | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html index 88d9c189..f189478e 100644 --- a/www/templates/events-popover.html +++ b/www/templates/events-popover.html @@ -10,8 +10,8 @@ Refresh </a> - <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='1'">Show all events</a> - <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="minAlarmCount=='0'"> Show alarmed events</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a> </div> </ion-content> </ion-popover-view> diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html index e6f17359..42fbc508 100644 --- a/www/templates/timeline-popover.html +++ b/www/templates/timeline-popover.html @@ -1,6 +1,11 @@ <ion-popover-view class="fit"> <ion-content> <div class="list" ng-click="popover.hide()"> + + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a> + <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a> + + <a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">Month</a> <a class="item" ng-href="" ng-click=" popover.hide();buttonClicked(1);" > @@ -14,6 +19,7 @@ Custom Range </a> + </div> </ion-content> </ion-popover-view> |