From 9b96991f06a11513b524e45d06dab0ebbbd26ea7 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Sun, 17 Apr 2016 08:37:07 -0400
Subject: allow for forcedresumeDelay to wait for network stack, switch to
 native scrolling (should improve android perf)

Former-commit-id: 4bcb4fa02be69677fd75a2acf84357d8dbfe201c
---
 www/templates/devoptions.html |  9 +++++++++
 www/templates/events.html     | 18 +++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'www/templates')

diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 0996b6d3..f592f268 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -81,6 +81,15 @@
                 </label>
             </div>
             
+            <div class="item item-input-inset">
+                 resume delay(ms)&nbsp;
+                <label class="item-input-wrapper">
+                    <input type="tel" placeholder="" ng-model="loginData.resumeDelay">
+                
+                </label>
+                
+            </div>
+            
             <div class="item item-input-inset">
                  Event Montage image scale(%)&nbsp;
                 <label class="item-input-wrapper">
diff --git a/www/templates/events.html b/www/templates/events.html
index bd1ee03a..a0170112 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -41,9 +41,9 @@
                 <ion-item collection-repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}"  >
                     
                     
-                    <span style="float:right;margin-top:-18px;background-color:#6d0909;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}</span>
+                    <span style="float:right;margin-top:-18px;background-color:#6d0909;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{::prettifyTime(event.Event.StartTime)}}</span>
 
-                    <span style="float:left;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}}</span>
+                    <span style="float:left;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{::prettifyDate(event.Event.StartTime)}}</span>
 
 
                     <div class="row">
@@ -80,27 +80,27 @@
 
                             <br/>
                             <span style="font-size:80%; color:rgb(110,110,110)">
-                                {{event.Event.Length}}s
+                                {{::event.Event.Length}}s
                             </span>
                         </div>
                         <!-- col col left-->
                         <div class="col col-80">
                             <div class="item-text-wrap">
                                 <i class="ion-monitor"></i>
-                                <b>{{event.Event.MonitorName}}</b> ({{event.Event.Name}})
+                                <b>{{::event.Event.MonitorName}}</b> ({{::event.Event.Name}})
                             </div>
 
-                            <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
-                            <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
-                            <i class="ion-arrow-graph-up-right"></i> {{event.Event.TotScore}}
+                            <i class="ion-images"></i> {{::event.Event.Frames}} &nbsp;
+                            <i class="ion-ios-bell-outline"></i> {{::event.Event.AlarmFrames}} &nbsp;
+                            <i class="ion-arrow-graph-up-right"></i> {{::event.Event.TotScore}}
                         </div>
                     </div>
                     <!--row-->
 
                     <div class="row" style="font-size:80%; color:rgb(110,110,110)">
-                        <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp; {{prettify(event.Event.StartTime)}}
+                        <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp; {{::prettify(event.Event.StartTime)}}
                             <br/>
-                            <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
+                            <i class="ion-clipboard"></i>&nbsp; {{::event.Event.Notes}}
                             <!-- <br/> Default video:{{event.Event.relativePath}}{{event.Event.DefaultVideo}}-->
                         </div>
                     </div>
-- 
cgit v1.2.3