clean up ES stuff, and add basic auth warning in wizard

4 files changed, 7 insertions, 11 deletions

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index f8fda110..3d1a211c 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -36,13 +36,7 @@ angular.module('zmApp.controllers')
     $rootScope.$on("auth-success", function () {
          NVRDataModel.debug("Montage Re-auth handler; stopping network...");
         //console.log ("RETAUTH");
-        NVRDataModel.stopNetwork();
-
-        if (NVRDataModel.getLogin().isUseEventServer) {
-            NVRDataModel.debug ("Restablishing event server connection...");
-            EventServer.disconnect();
-            EventServer.init();
-        }
+       // NVRDataModel.stopNetwork();
         
     });
 
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 75448ceb..4161c5b9 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -246,7 +246,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     return;
                                 }*/
                                 // coming here means continue
-                                EventServer.refresh();
+                                //EventServer.init();
 
                                 var statetoGo = $rootScope.lastState ? $rootScope.lastState : 'app.montage';
                                 //NVRDataModel.debug ("logging state transition");
@@ -466,7 +466,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
                                     
                                     NVRDataModel.getKeyConfigParams(1);
                                     NVRDataModel.getTimeZone();
-                                    EventServer.refresh();
+                                    EventServer.init();
 
                                     // if push broadcast happens BEFORE this, then no 
                                     // state change will occur here which is good
diff --git a/www/js/app.js b/www/js/app.js
index 487a0d0e..3bd875c6 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1774,7 +1774,7 @@ angular.module('zmApp', [
           // now do SSL check
           //setSSLCerts();
 
-          EventServer.init();
+          //EventServer.init();
           zmCheckUpdates.start();
           NVRDataModel.log("Setting up POST LOGIN timer");
           zmAutoLogin.start();
diff --git a/www/templates/wizard.html b/www/templates/wizard.html
index 60d1e1ef..70f17b6e 100644
--- a/www/templates/wizard.html
+++ b/www/templates/wizard.html
@@ -41,13 +41,15 @@
                         <!--<p >{{'kWizPasswdNote' | translate}}</p>-->
                     </label>
                 </div>
-                <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usebasicauth" ng-checked="wizard.usebasicauth" toggle-class="toggle-calm">{{'kWizBasicAuth' | translate}}</ion-toggle>
+                <ion-toggle ng-show="wizard.useauth" ng-model="wizard.usebasicauth" ng-checked="wizard.usebasicauth" toggle-class="toggle-calm">{{'kWizBasicAuth' | translate}}<p ng-show="wizard.usebasicauth">{{'kWarningBasicAuth'|translate}}</p></ion-toggle>
+                
                 <label class="item item-input item-floating-label" ng-show="wizard.usebasicauth">
                     <span class="input-label">{{'kUserName' | translate}}</span>
                     <input autocorrect="off" autocapitalize="none" autocomplete="off" type="text" ng-model="wizard.basicuser" placeholder="{{'kPlaceHolderBasicAuthUser'|translate}}">
                 </label>
                 <label class="item item-input item-text-wrap item-floating-label" ng-show="wizard.usebasicauth">
                     <span class="input-label">{{'kPassword' | translate}}</span>
+                    
                     <input type="password" ng-model="wizard.basicpassword" placeholder="{{'kPlaceHolderBasicAuthPass'|translate}}">
                     <p>{{'kWizPasswdNote' | translate}}</p>
                 </label>