nits

5 files changed, 51 insertions, 14 deletions

diff --git a/ionic.project b/ionic.project
index 9fff8cd8..2e66403a 100644
--- a/ionic.project
+++ b/ionic.project
@@ -16,4 +16,4 @@
     "www/**/*",
     "!www/lib/**/*"
   ]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 1112ad06..e44f96af 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "phonegap-plugin-push"
   ],
   "cordovaPlatforms": [
-    "ios",
-    "android"
+    "android",
+    "ios"
   ]
-}
\ No newline at end of file
+}
diff --git a/www/css/style.css b/www/css/style.css
index 4b4beb46..29243005 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -484,11 +484,12 @@ input[type=range]::-webkit-slider-thumb {
     -webkit-animation-duration: 300ms;
 }
 
+
 .content-banner.alarm
 {
     background-color: forestgreen;
     color:white;
-    opacity:1;
+   
 }
 
 /*.mySliderClass.jslider.sliderCSS  div.jslider-pointer
diff --git a/www/index.html b/www/index.html
index e02139ec..2e3b3186 100644
--- a/www/index.html
+++ b/www/index.html
@@ -15,8 +15,12 @@
     <link rel="stylesheet" href="css/angular-carousel.css">
    <link rel="stylesheet" href="lib/angular-awesome-slider/dist/css/angular-awesome-slider.min.css">
     <link rel="stylesheet" href="lib/vis/dist/vis.min.css">
+ 
     <link rel="stylesheet" href="lib/ionic-content-banner/dist/ionic.content.banner.min.css">
+    
+    <!--<link rel="stylesheet" href="external/ionic.content.banner.css">-->
     <link rel="stylesheet" href="external/radio.css">
+    
 
 
 
@@ -69,7 +73,8 @@
     <script src="js/TimelineCtrl.js"></script>
     <script src="js/PortalLoginCtrl.js"></script>
     <script src="js/LowVersionCtrl.js"></script>
-    <script src="js/EventServer.js"></Script>
+    <script src="js/EventServer.js"></script>
+    <script src="js/EventServerSettingsCtrl.js"></script>
  
     
     <script src="external/ng-websocket.js"></script>
@@ -77,7 +82,8 @@
     
    
     <script src="lib/vis/dist/vis-dev.js"></script>
-    <script src="lib/ionic-content-banner/dist/ionic.content.banner.min.js"></script>
+    
+   <!-- <script src="external/ionic.content.banner.js"></script>-->
     <script src="external/angular-circular-navigation.js"></script>
     <script src="lib/Chart.js/Chart.min.js"></script>
     <script src="lib/tc-angular-chartjs/dist/tc-angular-chartjs.min.js"></script>
@@ -86,7 +92,7 @@
     <script src="lib/angular-touch/angular-touch.js"></script>
     <script src="external/angular-carousel.js"></script>
     <script src="external/ion-pullup.js"></script>
-    
+   <script src="lib/ionic-content-banner/dist/ionic.content.banner.min.js"></script>
 
 
 
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 440857be..3c0765c2 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -23,7 +23,9 @@ angular.module('zmApp.controllers')
     var montageSize = 3;
     var monitors = [];
     var oldevents = [];
-    var loginData = {
+     
+    
+     var loginData = {
         'username': '',
         'password': '',
         'url': '', // This is the ZM portal path
@@ -37,13 +39,19 @@ angular.module('zmApp.controllers')
         'keepAwake':true, // don't dim/dim during live view
         'isUseAuth':true, // true if user wants ZM auth
         'isUseEventServer':false, // true if you configure the websocket event server
+         'eventServerMonitors':'',
+        'eventServerInterval':0,
         'refreshSec':"2", // timer value for frame change in sec
         'enableDebug':false, // if enabled with log messages with "debug"
         'usePin':false,
         'pinCode':'',
         'canSwipeMonitors':true,
         'persistMontageOrder':false,
+        
     };
+     
+     
+     
     var configParams = {
         'ZM_EVENT_IMAGE_DIGITS':'-1',
         'ZM_PATH_ZMS':''
@@ -71,18 +79,22 @@ angular.module('zmApp.controllers')
     //--------------------------------------------------------------------------
      function displayBanner (mytype, mytext, myinterval, mytimer)
         {
-            var contentBannerInstance = $ionicContentBanner.show({
+            
+            console.log ("FACTORY DISPLAY: " + JSON.stringify(mytext));
+            console.log ("FACTTORY DISPLAY: interval:" + myinterval + " timer:" + mytimer);
+            var contentBannerInstance =
+            $ionicContentBanner.show({
               text: mytext || 'no text',
               interval: myinterval || 2000,
-              autoClose: mytimer || 6000,
+              //autoClose: mytimer || 6000,
               type: mytype || 'info',
               transition: 'vertical',
-              cancelOnStateChange: false
+              //cancelOnStateChange: false
             });
 
-            /*$timeout (function() {
+            $timeout (function() {
                 contentBannerInstance();
-            },mytimer || 6000);*/
+            },mytimer || 6000);
     }
         
 
@@ -200,6 +212,18 @@ angular.module('zmApp.controllers')
                     window.localStorage.getItem("eventServer");
 
             }
+            
+        
+            
+            if (window.localStorage.getItem("eventServerMonitors") != undefined) {
+                loginData.eventServerMonitors =
+                     window.localStorage.getItem("eventServerMonitors");
+            }
+            
+            if (window.localStorage.getItem("eventServerInterval") != undefined) {
+                loginData.eventServerInterval =
+                     window.localStorage.getItem("eventServerInterval");
+            }
 
             if (window.localStorage.getItem("apiurl") != undefined) {
                 loginData.apiurl =
@@ -367,6 +391,12 @@ angular.module('zmApp.controllers')
             window.localStorage.setItem("apiurl", loginData.apiurl);
             window.localStorage.setItem("streamingurl", loginData.streamingurl);
             window.localStorage.setItem("eventServer", loginData.eventServer);
+            window.localStorage.setItem("eventServerMonitors", loginData.eventServerMonitors);
+                window.localStorage.setItem("eventServerInterval", loginData.eventServerInterval);
+            
+            
+            
+            
             window.localStorage.setItem("useSSL", loginData.useSSL?"1":"0");
             window.localStorage.setItem("usePin", loginData.usePin?"1":"0");
             window.localStorage.setItem("canSwipeMonitors", loginData.canSwipeMonitors?"1":"0");