From ea186feb188ed5995178c5e390b6dc15be34529b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 28 Sep 2016 10:02:00 -0400
Subject: initial experiments

Former-commit-id: 811ab2e0e405a95529493afd49a43581576fc169
---
 www/templates/events.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 485cdc0d..254f1bf7 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -1,5 +1,6 @@
 
 <ion-view cache-view="false">
+    
     <ion-nav-title>{{scrollPosition();}}</ion-nav-title>
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()">
@@ -16,7 +17,7 @@
         <a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
     </ion-nav-buttons>
 
-    <div ng-if="showSearch">
+    <!--<div ng-if="showSearch">
         <ion-header-bar class="bar bar-subheader item-input-inset">
 
             <label class="item-input-wrapper">
@@ -24,11 +25,11 @@
                 <input type="search" placeholder="{{'kSearch'|translate}}" ng-model="search.text" autocorrect="off" autocomplete="off">
             </label>
         </ion-header-bar>
-    </div>
-
+    </div>-->
 
 
-    <ion-content ng-cloak on-tap="tapped();" delegate-handle="mainScroll"  has-subheader="true" overflow-scroll="false" mouse-wheel-scroll>
+   
+    <ion-content header-shrink ng-cloak on-tap="tapped();" delegate-handle="mainScroll"   overflow-scroll="false" mouse-wheel-scroll>
 
 
         <!-- lets make sure the events list is not empty as collection repeat needs height -->
-- 
cgit v1.2.3


From ea222419d043e9aab3e6243c39c8487df681c2ae Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 28 Sep 2016 10:29:11 -0400
Subject: remove content spacing

Former-commit-id: a8db14bc743d51a6138091c3ce1c94c9fd3da4f6
---
 www/templates/events.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 254f1bf7..09efb7b4 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -17,7 +17,7 @@
         <a style="" class="button button-icon icon ion-search" ng-href="" ng-click="searchClicked();"> </a>
     </ion-nav-buttons>
 
-    <!--<div ng-if="showSearch">
+    <div ng-if="showSearch">
         <ion-header-bar class="bar bar-subheader item-input-inset">
 
             <label class="item-input-wrapper">
@@ -25,11 +25,11 @@
                 <input type="search" placeholder="{{'kSearch'|translate}}" ng-model="search.text" autocorrect="off" autocomplete="off">
             </label>
         </ion-header-bar>
-    </div>-->
+    </div>
 
 
    
-    <ion-content header-shrink ng-cloak on-tap="tapped();" delegate-handle="mainScroll"   overflow-scroll="false" mouse-wheel-scroll>
+    <ion-content style="top:0 !important;" header-shrink ng-cloak on-tap="tapped();" delegate-handle="mainScroll"   overflow-scroll="false" mouse-wheel-scroll>
 
 
         <!-- lets make sure the events list is not empty as collection repeat needs height -->
-- 
cgit v1.2.3


From b6fcb769f2df2c188c465d805a90375321e53e02 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 28 Sep 2016 10:33:57 -0400
Subject: added space so first item is not overlayed

Former-commit-id: e682657f9d5d47000dcaae592881db6007bfa01e
---
 www/templates/events.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index 09efb7b4..a564f955 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -29,9 +29,9 @@
 
 
    
-    <ion-content style="top:0 !important;" header-shrink ng-cloak on-tap="tapped();" delegate-handle="mainScroll"   overflow-scroll="false" mouse-wheel-scroll>
-
-
+    <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>
+        <!-- needed for header-shrink so first item doesn't go below header-->
+        <div style="height: 50px;"></div>
         <!-- lets make sure the events list is not empty as collection repeat needs height -->
       
         <div ng-if="!eventsBeingLoaded">
-- 
cgit v1.2.3


From d78c434d088d1fee3f9d805347a2c5a5a88d19e3 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 28 Sep 2016 10:37:23 -0400
Subject: made spacer 64 - 50 seems to cut off

Former-commit-id: 89d9b8ee47485ac1efa6e26e9231bc93b63b9d22
---
 www/templates/events.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'www/templates')

diff --git a/www/templates/events.html b/www/templates/events.html
index a564f955..b4b7f39e 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -31,7 +31,7 @@
    
     <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>
         <!-- needed for header-shrink so first item doesn't go below header-->
-        <div style="height: 50px;"></div>
+        <div style="height: 64px;"></div>
         <!-- lets make sure the events list is not empty as collection repeat needs height -->
       
         <div ng-if="!eventsBeingLoaded">
-- 
cgit v1.2.3


From 0d9a9353e756b7cdcabae85b4d4a4840910ed3df Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 28 Sep 2016 20:25:25 -0400
Subject: switched to "scroll-sista" for sqeezing headers

Former-commit-id: 55992626fea99156d7d1531efaa830c11186d8ca
---
 www/templates/devoptions.html              | 2 +-
 www/templates/events-date-time-filter.html | 2 +-
 www/templates/events.html                  | 6 ++++--
 www/templates/eventserversettings.html     | 2 +-
 www/templates/help.html                    | 4 ++--
 www/templates/log.html                     | 2 +-
 www/templates/login.html                   | 2 +-
 www/templates/monitors.html                | 4 +++-
 www/templates/montage-history.html         | 2 +-
 www/templates/montage.html                 | 2 +-
 www/templates/news.html                    | 2 +-
 www/templates/state.html                   | 2 +-
 www/templates/timeline.html                | 2 +-
 www/templates/wizard.html                  | 1 +
 14 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'www/templates')

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>
-- 
cgit v1.2.3


From 231c8f14a84b5493eed9b221c095a72e996e0366 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 29 Sep 2016 08:47:33 -0400
Subject: applied scroll sista patch for native, moved it to external

Former-commit-id: 36e79c5df09980a6ad9a8751a19cea7f463a85fc
---
 www/templates/devoptions.html              | 2 +-
 www/templates/events-date-time-filter.html | 2 +-
 www/templates/eventserversettings.html     | 2 +-
 www/templates/help.html                    | 2 +-
 www/templates/log.html                     | 2 +-
 www/templates/login.html                   | 2 +-
 www/templates/monitors.html                | 2 +-
 www/templates/montage-history.html         | 2 +-
 www/templates/montage.html                 | 2 +-
 www/templates/news.html                    | 2 +-
 www/templates/state.html                   | 2 +-
 www/templates/timeline.html                | 2 +-
 www/templates/wizard.html                  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index b206a559..4e0b6f6b 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -11,7 +11,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 af97ad60..15a6585a 100644
--- a/www/templates/events-date-time-filter.html
+++ b/www/templates/events-date-time-filter.html
@@ -2,7 +2,7 @@
 
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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/eventserversettings.html b/www/templates/eventserversettings.html
index e6ec4614..d982fc05 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 scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
         
          <div class="list list-inset">
         {{'kEventServerConfig1' | translate }}
diff --git a/www/templates/help.html b/www/templates/help.html
index e0dea368..ebe61931 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -8,7 +8,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content  scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content  class="padding" scroll-sista delegate-handle="none"  overflow-scroll="true"  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 e53f00aa..42e308e5 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -22,7 +22,7 @@
         </div>
     </ion-nav-buttons>
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 738c1c46..aa61a900 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 scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 a9168c09..07d34cab 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -9,7 +9,7 @@
     </ion-nav-buttons>
     
 
-    <ion-content scroll-sista  delegate-handle="none" overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista  delegate-handle="none" overflow-scroll="true"  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 a49622b2..7f54f2c8 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
 
 
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index b442f998..76534b7d 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,7 +33,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false" >
+    <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="true" >
     
         
         
diff --git a/www/templates/news.html b/www/templates/news.html
index f4a87e4f..d560b053 100644
--- a/www/templates/news.html
+++ b/www/templates/news.html
@@ -8,7 +8,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll >
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 bf0cda4a..af50e9c5 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 scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 e443e705..71e2e41c 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 scroll-sista delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  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 3d20c522..0ee3f319 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -5,7 +5,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content class="padding" overflow-scroll="false">
+    <ion-content class="padding" overflow-scroll="true">
   
     <wizard on-finish="finishedWizard()"> 
         
-- 
cgit v1.2.3


From 254be998caa4c9efbd3fa3f7deb7461f263685b2 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 1 Oct 2016 08:59:31 -0400
Subject: nits

Former-commit-id: 0ed7d481b05dd46cc907c561354151cef8f7f9b0
---
 www/templates/devoptions.html              | 2 +-
 www/templates/events-date-time-filter.html | 2 +-
 www/templates/eventserversettings.html     | 2 +-
 www/templates/help.html                    | 2 +-
 www/templates/log.html                     | 2 +-
 www/templates/login.html                   | 2 +-
 www/templates/monitors.html                | 2 +-
 www/templates/montage-history.html         | 2 +-
 www/templates/montage.html                 | 2 +-
 www/templates/news.html                    | 2 +-
 www/templates/state.html                   | 2 +-
 www/templates/timeline.html                | 2 +-
 www/templates/wizard.html                  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 4e0b6f6b..b206a559 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -11,7 +11,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
+    <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 15a6585a..af97ad60 100644
--- a/www/templates/events-date-time-filter.html
+++ b/www/templates/events-date-time-filter.html
@@ -2,7 +2,7 @@
 
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
+    <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/eventserversettings.html b/www/templates/eventserversettings.html
index d982fc05..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 scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
+    <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 ebe61931..fffdf2d1 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -8,7 +8,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content  class="padding" scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
+    <ion-content  class="padding" 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 42e308e5..e53f00aa 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -22,7 +22,7 @@
         </div>
     </ion-nav-buttons>
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
+    <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 aa61a900..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 scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
+    <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 07d34cab..a9168c09 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -9,7 +9,7 @@
     </ion-nav-buttons>
     
 
-    <ion-content scroll-sista  delegate-handle="none" overflow-scroll="true"  mouse-wheel-scroll >
+    <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 7f54f2c8..a49622b2 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
+    <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 76534b7d..b442f998 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -33,7 +33,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="true" >
+    <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 d560b053..f4a87e4f 100644
--- a/www/templates/news.html
+++ b/www/templates/news.html
@@ -8,7 +8,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll >
+    <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 af50e9c5..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 scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
+    <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 71e2e41c..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 scroll-sista delegate-handle="none"  overflow-scroll="true"  mouse-wheel-scroll>
+    <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 0ee3f319..3d20c522 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -5,7 +5,7 @@
     </ion-nav-buttons>
 
 
-    <ion-content class="padding" overflow-scroll="true">
+    <ion-content class="padding" overflow-scroll="false">
   
     <wizard on-finish="finishedWizard()"> 
         
-- 
cgit v1.2.3


From 8e0730aabe1dd728f531f63114ae556023a6616f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 2 Oct 2016 17:53:37 -0400
Subject: #201 - initial framework - still buggy

Former-commit-id: 06b81da17f62a04219cba920d3997c3040e76d94
---
 www/templates/montage-history.html  |   2 +-
 www/templates/montage-history2.html | 230 ++++++++++++++++++++++++++++++++++++
 2 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 www/templates/montage-history2.html

(limited to 'www/templates')

diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index a49622b2..eb751105 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -21,7 +21,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none"  overflow-scroll="false"  mouse-wheel-scroll>
+    <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate"  overflow-scroll="false"  mouse-wheel-scroll>
 
 
 
diff --git a/www/templates/montage-history2.html b/www/templates/montage-history2.html
new file mode 100644
index 00000000..69fb2bb6
--- /dev/null
+++ b/www/templates/montage-history2.html
@@ -0,0 +1,230 @@
+<ion-view view-title="{{'kEventMontage' | translate}}" cache-view="false" hide-nav-bar="{{minimal}}">
+    <ion-nav-buttons side="left">
+        <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+
+        <button class="button button-icon button-clear ion-arrow-move" ng-click="dragToggle();">&nbsp;
+        </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-nav-buttons side="right">
+
+        <button class="button button-icon button-clear ion-loop" ng-click="resetSizes();">&nbsp;
+        </button>
+        
+        <button class="button button-icon button-clear ion-plus-round" ng-click="sliderChanged(1);">&nbsp;
+        </button>
+        
+        <button class="button button-icon button-clear ion-minus-round" ng-click="sliderChanged(-1);">&nbsp;
+        </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 scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
+
+        
+
+        <div class="timeline_text" ion-datetime-picker title="From" am-pm={{!loginData.use24hr}} ng-model="datetimeValueFrom.value" ng-change="dateChanged()">
+            <b>{{'kFrom' | translate}} : </b>{{datetimeValueFrom.value | date: timeFormat}}
+        </div>
+
+        <div class="timeline_text" ion-datetime-picker am-pm={{!loginData.use24hr}} ng-model="datetimeValueTo.value" ng-change="dateChanged()">
+            <b>{{'kTo' | translate}}: </b>{{datetimeValueTo.value | date: timeFormat}} @ {{sliderVal.rate}}x
+            <div ng-if="$root.platformOS != 'ios'">({{'kChromeMax' | translate}})</div>
+        </div>
+
+
+
+
+        <div class="grid" id="mygrid">
+            <div class="grid-sizer grid-item-10"></div>
+
+
+
+
+            <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng- -->
+            <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit">
+                
+                
+                
+                     
+                    <div ng-if="$root.authSession!='undefined'">
+                        <div ng-if = "monitor.Monitor.eventUrl == 'img/noevent.png' && !sliderVal.hideNoEvents">
+                           
+                            <!-- make sure we don't use id here
+                            -- or we lose the handle for cleanup forever!-->
+                            <div  class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
+                                <figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
+
+                                <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}"  image-spinner-loader="lines" on-tap="!isDragabillyOn?noop():toggleSelectItem($index)" />
+
+
+                                <figcaption class="normal-figcaption" >
+
+                                        &nbsp;<i class="ion-ios-videocam"></i>
+                                       {{monitor.Monitor.Name}}&nbsp;
+
+                                </figcaption>
+
+                                 
+
+                                </figure>
+                            </div>
+                        </div>
+
+                        <div  ng-if = "monitor.Monitor.eventUrl != 'img/noevent.png' && monitor.Monitor.connKey !=''">
+
+                            <div  class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
+                                <figure height="{{Monitor.monitor.height}}" width="{{Monitor.monitor.width}}" class="{{dragBorder}}" ng-show=" monitor.Monitor.listDisplay!='noshow'">
+
+                                <img class="{{monitor.Monitor.selectStyle}}" image-spinner-src="{{monitor.Monitor.eventUrl}}{{$root.authSession}}"  image-spinner-loader="lines" on-tap="!isDragabillyOn?togglePause(monitor.Monitor.Id):toggleSelectItem($index)" />
+
+
+                                <figcaption class="normal-figcaption" >
+
+                                        &nbsp;<i class="ion-ios-videocam"></i> <span style="background-color:red;color:#fff" ng-if="monitor.Monitor.isPaused">&nbsp;<i class="ion-pause"></i>&nbsp;</span>
+                                       {{monitor.Monitor.Name}}&nbsp;
+                                    
+                                       <div  ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style="white-space:nowrap;text-overflow:ellipsis;overflow:hidden;font-size:9px" 
+                             class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">
+                            <i class="ion-clock"></i>
+                               {{prettifyDateTimeFirst(monitor.Monitor.eventUrlTime)}} ({{humanizeTime(monitor.Monitor.eventUrlTime)}})&nbsp;
+                            </div>
+
+                                </figcaption>
+
+                                
+
+                                </figure>
+                            </div>
+                            
+                            
+                            
+
+                            
+                            <!--
+                             <div  ng-if="sliderVal.showTimeline && $root.runMode!='lowbw'" style=" position:absolute; bottom:15px; right:0%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;" 
+                             class="header-event-id" id="{{monitor.Monitor.Id}}-timeline">
+                            &nbsp;<i class="ion-clock"></i>
+                               {{prettifyDate(monitor.Monitor.eventUrlTime)}}&nbsp;
+                            </div>
+                            -->
+                          
+                            
+                            <!--<div ng-if="!monitor.isPaused"
+                                style="position:absolute; bottom:35px; right:0%;white-space:nowrap;overflow:hidden;" class="header-event-id">paused
+                            </div>-->
+			  
+			  
+                        </div>
+                    </div> <!-- valid auth session &!background -->
+
+                    <div ng-if="!$root.authSession=='undefined' || isBackground()">
+                        <img  image-spinner-src="img/pausevideo.png" 
+                              />
+                    
+                    </div>
+            </span>
+        </div>
+
+        <ion-item ng-show="!MontageMonitors.length">
+            {{'kNoMonitors' | translate }}
+        </ion-item>
+
+
+
+    </ion-content>
+
+    <div class="bwmode" ng-if="$root.runMode=='lowbw'">
+        {{ 'kLowBWDisplay' | translate }}
+    </div>
+
+    <div ng-show="minimal">
+        <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click">
+
+            <button mfb-button icon="ion-arrow-expand" label="increase size" ng-click="changeSize(-1)">
+            </button>
+            <button mfb-button icon="ion-arrow-shrink" label="decrease size" ng-click="changeSize(1)">
+            </button>
+            <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView();">
+            </button>
+            <button mfb-button icon="ion-close" label="exit full screen" ng-click="switchMinimal()">
+            </button>
+        </nav>
+
+        <span class="modal-alarm-badge">
+            <a data-badge="{{$root.alarmCount}}" class="animated infinite tada button icon  ion-ios-bell notification-badge button-assertive" 
+                    ng-click="handleAlarmsWhileMinimized();" ng-if="$root.isAlarm"></a>
+        </span>
+
+    </div>
+
+    <ion-pull-up-footer class="zmPullup" on-expand="footerExpand()" on-minimize="footerCollapse()" on-collapse="footerCollapse()" initial-state="minimized" default-behavior="expand">
+        <ion-pull-up-handle width="100" height="25" toggle="ion-chevron-up ion-chevron-down" style="border-radius: 25px 25px 0 0">
+            <i class="icon ion-chevron-up"></i>
+        </ion-pull-up-handle>
+        <ion-pull-up-bar>
+            <h1 class="title" ion-pull-up-trigger>{{'kEventMontage' | translate}}</h1>
+        </ion-pull-up-bar>
+        <ion-pull-up-content scroll="true">
+
+
+            <div class="list list-inset">
+
+
+                <ion-toggle ng-model="sliderVal.hideNoEvents" ng-checked="{{sliderVal.hideNoEvents}}" toggle-class="toggle-dark"><span class="item-text-wrap">{{'kHideMonsWithoutEvents' | translate}}</span></ion-toggle>
+
+
+
+
+                <!--<div  class="item item-divider" ion-datetime-picker ng-model="datetimeValueFrom.value">
+                    Tap to change: {{datetimeValueFrom.value| date: "yyyy-MMM-dd hh:mma"}}
+                </div>-->
+
+
+
+
+
+                <div class="row">
+                    <div class="col col-75">
+                        <br/>
+                        <div style="width:90%;color:black;">
+                            <input ng-model="sliderVal.rate" type="text" id="mySlider6" slider options="slider_modal_options_rate" />
+                        </div>
+                        <br/>
+                    </div>
+                    <div class="col col-25" style="background-color:#AEA8D3;text-align:center">
+                        {{'kSpeed' | translate }}
+                    </div>
+                </div>
+
+                <div class="item item-divider">{{'kTimeline' | translate}}</div>
+
+                <ion-item>
+                    <div ion-datetime-picker title="From" am-pm={{!loginData.use24hr}} ng-model="datetimeValueFrom.value">
+                        <b>{{'kFrom' | translate }}: </b>{{datetimeValueFrom.value | date: timeFormat}}
+                    </div>
+                </ion-item>
+
+                <ion-item>
+                    <div ion-datetime-picker am-pm={{!loginData.use24hr}} ng-model="datetimeValueTo.value">
+                        <b>{{'kTo' | translate}}: </b>{{datetimeValueTo.value | date: timeFormat}}
+                    </div>
+                </ion-item>
+
+            </div>
+        </ion-pull-up-content>
+    </ion-pull-up-footer>
+
+
+
+
+
+</ion-view>
\ No newline at end of file
-- 
cgit v1.2.3