Android Users Rejoice! Major updates: Android port works like a charm now. Integrated Crosswalk for good performance for Android phones, reworked Montage view to step around Chrome's problem of getting stuck in pending state for HTTP requests that don't close soon and more.

3 files changed, 44 insertions, 51 deletions

diff --git a/www/templates/events.html b/www/templates/events.html
index e33a3568..f4cb2571 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -13,64 +13,64 @@
 
         <ion-refresher pulling-text="Pull to reload Events..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
         <!--<ion-list>-->
-           <!-- <div ng-repeat="event in events">-->
+        <!-- <div ng-repeat="event in events">-->
 
-                <ion-item collection-repeat="event in events" >
+        <ion-item collection-repeat="event in events">
 
-                    <div class="row"  >
-                        <div class="col col-left">
-                            <!-- this ngswitch displays different icons
+            <div class="row">
+                <div class="col col-left">
+                    <!-- this ngswitch displays different icons
                                 depending on the cause of the event -->
-                            <div ng-switch on="event.Event.Cause">
-                                <div ng-switch-when="Motion">
-                                    <i class="ion-android-walk" style="float:left; font-size:200%;"></i>
-                                    <br/>
-                                </div>
-                                <div ng-switch-when="Signal">
-                                    <i class="ion-wifi" style="float:left; font-size:200%;"></i>
-                                    <br/>
-                                </div>
-                                <div ng-switch-default>
-                                    <i class="ion-ionic" style="float:left; font-size:200%;"></i>
-                                    <br/>
-                                </div>
-                            </div>
-                            <!-- ng switch -->
-                            <!-- {{event.Event.Cause}} -->
-
-                            <br/> <span style="font-size:80%; color:rgb(110,110,110)">{{event.Event.Length}}s</span>
+                    <div ng-switch on="event.Event.Cause">
+                        <div ng-switch-when="Motion">
+                            <i class="ion-android-walk" style="float:left; font-size:200%;"></i>
+                            <br/>
+                        </div>
+                        <div ng-switch-when="Signal">
+                            <i class="ion-wifi" style="float:left; font-size:200%;"></i>
+                            <br/>
                         </div>
-                        <!-- col col left-->
+                        <div ng-switch-default>
+                            <i class="ion-ionic" style="float:left; font-size:200%;"></i>
+                            <br/>
+                        </div>
+                    </div>
+                    <!-- ng switch -->
+                    <!-- {{event.Event.Cause}} -->
+
+                    <br/> <span style="font-size:80%; color:rgb(110,110,110)">{{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}})</div>
+                <div class="col col-80">
+                    <div class="item-text-wrap"><i class="ion-monitor"></i> <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}}
 
-                            <span style="float:right">
+                    <span style="float:right">
                                 <button class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(event.Event.Id, event.Event.Name, event.Event.Length)" >View Footage</button></span>
 
-                        </div>
+                </div>
 
-                        <!--<div class="col">
+                <!--<div class="col">
                                 <img ng-src="{{event.image}}" style="float:right; height:40px;" />
                             </div> -->
 
-                    </div>
+            </div>
 
-                    <div class="row" style="font-size:80%; color:rgb(110,110,110)">
-                        <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;{{event.Event.StartTime}}
-                            <br/>
-                            <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
-                            <br/>
-                        </div>
-                    </div>
+            <div class="row" style="font-size:80%; color:rgb(110,110,110)">
+                <div class="item-text-wrap"><i class="ion-calendar"></i>&nbsp;{{event.Event.StartTime}}
+                    <br/>
+                    <i class="ion-clipboard"></i>&nbsp; {{event.Event.Notes}}
+                    <br/>
+                </div>
+            </div>
 
-                </ion-item>
+        </ion-item>
 
-            <!--</div> -->
+        <!--</div> -->
         <!--</ion-list>-->
 
     </ion-content>
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 47da2917..c974ec25 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -16,7 +16,7 @@
 
         <div ng-if="!isSimulated()">
             <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; ">
-                <img  imageonload="finishedLoadingImage()" ng-src="{{LoginData.url}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%"  />
+                <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.url}}/cgi-bin/zms?mode=jpeg&amp;monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" />
             </ion-scroll>
         </div>
 
diff --git a/www/templates/montage.html b/www/templates/montage.html
index f2ba8c78..d8c6ac53 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -26,9 +26,7 @@
                  FIXME: I should probably not pass username and password here - instead go the http interceptor
                  and auth token mode -->
                 <div ng-if="!isSimulated()">
-
-                <img  ng-src="{{LoginData.url}}/cgi-bin/nph-zms?mode=jpeg&amp;monitor={{monitor.Monitor.Id}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />
-
+                    <img  ng-src="{{LoginData.url}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps=3&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />
 
                    </div>
 
@@ -37,11 +35,6 @@
                        <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;">
 
                    </div>
-
-                   <!-- <img  ng-src="img/demo.gif?rand={{rand}}" width="{{((devWidth-30)/(7-slider.monsize))}}px;"   />-->
-
-                    <!-- <br/><i class="ion-monitor"></i> Hello -->
-     
                 </article>
                <span style="font-size:10px;">
                <footer class="footer">