summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2017-12-25 09:07:18 -0500
committerPliable Pixels <pliablepixels@gmail.com>2017-12-25 09:07:18 -0500
commite1afdd098de4c002c73019b79bd301271f8efc4f (patch)
treebc113fcfe841353411ce6a856a8f5e7e2870816f /www/templates
parentebbfe5336e5b0b1046f88c3cb941d2e56ac1b837 (diff)
fixed timeline click not working and also fixed toggle menu state display
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/timeline-popover.html3
-rw-r--r--www/templates/timeline.html2
2 files changed, 4 insertions, 1 deletions
diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html
index beeb482d..373ea09e 100644
--- a/www/templates/timeline-popover.html
+++ b/www/templates/timeline-popover.html
@@ -1,6 +1,9 @@
<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.enableAlarmCount">{{'kShowAllEvents' | translate}}</a>
<a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> {{'kShowAlarmedEvents' | translate}}</a>
<a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">{{'kMonth' | translate}}</a>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index eb15aca3..28bd3904 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -32,7 +32,7 @@
</center>
</div>
<div style="padding-left:15px; padding-right:15px;">
- <div id="visualization">
+ <div id="visualization" data-tap-disabled="true">
</div>
</div>
<br/>