summaryrefslogtreecommitdiff
path: root/www/templates
diff options
context:
space:
mode:
Diffstat (limited to 'www/templates')
-rw-r--r--www/templates/devoptions.html2
-rw-r--r--www/templates/events-date-time-filter.html2
-rw-r--r--www/templates/events.html6
-rw-r--r--www/templates/eventserversettings.html2
-rw-r--r--www/templates/help.html4
-rw-r--r--www/templates/log.html2
-rw-r--r--www/templates/login.html2
-rw-r--r--www/templates/monitors.html4
-rw-r--r--www/templates/montage-history.html2
-rw-r--r--www/templates/montage.html2
-rw-r--r--www/templates/news.html2
-rw-r--r--www/templates/state.html2
-rw-r--r--www/templates/timeline.html2
-rw-r--r--www/templates/wizard.html1
14 files changed, 20 insertions, 15 deletions
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 98a9dcef..b206a559 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -11,7 +11,7 @@
</ion-nav-buttons>
- <ion-content class="padding">
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list list-inset">
<span style="color:rgb(100,100,100)">
<i class="ion-android-settings" style="font-size:150%"></i> {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}}
diff --git a/www/templates/events-date-time-filter.html b/www/templates/events-date-time-filter.html
index 84e39ea2..af97ad60 100644
--- a/www/templates/events-date-time-filter.html
+++ b/www/templates/events-date-time-filter.html
@@ -2,7 +2,7 @@
- <ion-content>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<label class="item item-input">
<span class="input-label">{{'kFromDate'|translate}}:</span>
<input type="date" ng-model="$root.fromDate" max={{today}}>
diff --git a/www/templates/events.html b/www/templates/events.html
index b4b7f39e..8ea421a3 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -29,9 +29,11 @@
- <ion-content clas="has-header" style="top:0 !important;" header-shrink ng-cloak on-tap="tapped();" delegate-handle="mainScroll" overflow-scroll="false" mouse-wheel-scroll>
+ <!-- collection repeat forces js scrolling, thing to remember -->
+
+ <ion-content scroll-sista ng-cloak on-tap="tapped();" delegate-handle="mainScroll" mouse-wheel-scroll>
<!-- needed for header-shrink so first item doesn't go below header-->
- <div style="height: 64px;"></div>
+ <!-- <div style="height: 64px;"></div>-->
<!-- lets make sure the events list is not empty as collection repeat needs height -->
<div ng-if="!eventsBeingLoaded">
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html
index 6a3b7d90..e6ec4614 100644
--- a/www/templates/eventserversettings.html
+++ b/www/templates/eventserversettings.html
@@ -12,7 +12,7 @@
<button class="button button-clear" ng-click="saveItems()">{{'kSave'|translate}}</button>
</ion-nav-buttons>
- <ion-content padding="true">
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list list-inset">
{{'kEventServerConfig1' | translate }}
diff --git a/www/templates/help.html b/www/templates/help.html
index 169d1abe..e0dea368 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -1,4 +1,4 @@
-<ion-view view-title="Help">
+<ion-view cache-view="false" view-title="Help">
<ion-nav-buttons side="left">
<button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
@@ -8,7 +8,7 @@
</ion-nav-buttons>
- <ion-content class="padding" overflow-scroll="false" ng-cloak>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<p><small>{{$root.appName}} v{{zmAppVersion}}</small></p>
<div class="list">
diff --git a/www/templates/log.html b/www/templates/log.html
index 7bbb022a..e53f00aa 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -22,7 +22,7 @@
</div>
</ion-nav-buttons>
- <ion-content class="padding">
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}}</b><br/>
<!-- don't indent here -- its a pre-->
<pre>{{log.logString}}</pre>
diff --git a/www/templates/login.html b/www/templates/login.html
index 054aaf49..738c1c46 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -13,7 +13,7 @@
<button class="button button-clear" ng-click="saveItems()">Save</button>
</ion-nav-buttons>
- <ion-content padding="true">
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="item item-input-inset">
{{'kServerName' | translate }}:&nbsp;
diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 6c23e6c7..a9168c09 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -1,4 +1,5 @@
<ion-view view-title="{{'kMonitors' | translate}}" cache-view="false">
+
<ion-nav-buttons side="left">
<button class="button button-icon button-clear ion-navicon" ng-click="openMenu()">
</button>
@@ -6,8 +7,9 @@
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
</ion-nav-buttons>
+
- <ion-content overflow-scroll="false">
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()">
</ion-refresher>
<div style="float:right;margin-top:3px;margin-right:8px;">
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index f0e4a4a5..a49622b2 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
</ion-nav-buttons>
- <ion-content has-bouncing="false" style="background-color:#444444">
+ <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index f79db1ef..b442f998 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,7 +33,7 @@
</ion-nav-buttons>
- <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" >
+ <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false" >
diff --git a/www/templates/news.html b/www/templates/news.html
index 3edb2a16..f4a87e4f 100644
--- a/www/templates/news.html
+++ b/www/templates/news.html
@@ -8,7 +8,7 @@
</ion-nav-buttons>
- <ion-content >
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll >
<div class="list">
<span ng-repeat = "post in newsItems">
diff --git a/www/templates/state.html b/www/templates/state.html
index 5763c284..bf0cda4a 100644
--- a/www/templates/state.html
+++ b/www/templates/state.html
@@ -4,7 +4,7 @@
<button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
</ion-nav-buttons>
- <ion-content>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<ion-refresher pulling-text="{{'kPullToReload' | translate}}..."
spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
<ion-list>
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 2f8e6481..e443e705 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -23,7 +23,7 @@
</ion-nav-buttons>
<!--<ion-content data-tap-disabled="true">-->
- <ion-content>
+ <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div style="padding-left:15px; font-size:10px; color:grey">
{{prettify(fromDate)}} - {{prettify(toDate)}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}})
diff --git a/www/templates/wizard.html b/www/templates/wizard.html
index ca2daf6a..3d20c522 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -86,6 +86,7 @@
<wz-step wz-title="3" >
+ <br/><br/>
<h4>{{'kWizResults' | translate}}</h4>
<span ng-if="wizard.portalValidText" style="color:{{wizard.portalColor}};"><i ng-class="wizard.portalColor=='#16a085' ? 'ion-checkmark-circled':'ion-close-circled'"></i>&nbsp;{{wizard.portalValidText}}<br/></span>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 21:37:18 +0000