#830 hide server switch, and some bug fixes

4 files changed, 10 insertions, 7 deletions

diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index ba782bb2..55d384e2 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -402,10 +402,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
   $scope.kioskPinConfig = function () {
 
-    $scope.data = {};     
+    var ld = NVR.getLogin();
+    $scope.data = {p1:ld.kioskPassword};     
     // An elaborate, custom popup
     var myPopup = $ionicPopup.show({
-      template: '<small>'+$translate.instant('kKioskPassword')+'</small><input type="password" ng-model="data.p1"><br/><small>'+$translate.instant('kKioskPasswordConfirm')+'</small><input type="password" ng-model="data.p2">',
+      template: '<small>'+$translate.instant('kKioskPassword')+'</small><input type="password" ng-model="data.p1"><br/><small>'+$translate.instant('kKioskPasswordConfirm')+'</small><input type="password"  ng-model="data.p2">',
       title: $translate.instant('kPassword'),
       scope: $scope,
       buttons: [
diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 511ba030..7b117342 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVR', '$rootScope', '$ionicPopup', '$translate', '$timeout', '$location', 'EventServer', 'zmAutoLogin', '$http', 'SecuredPopups', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVR, $rootScope, $ionicPopup, $translate, $timeout, $location, EventServer, zmAutoLogin, $http, SecuredPopups) {
+angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVR', '$rootScope', '$ionicPopup', '$translate', '$timeout', '$location', 'EventServer', 'zmAutoLogin', '$http', 'SecuredPopups', '$ionicLoading', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVR, $rootScope, $ionicPopup, $translate, $timeout, $location, EventServer, zmAutoLogin, $http, SecuredPopups, $ionicLoading) {
   $scope.openMenu = function () {
     $ionicSideMenuDelegate.toggleLeft();
   };
@@ -56,7 +56,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
         { text: $translate.instant('kButtonCancel'),
             type: 'button-assertive',
             onTap: function (e) {
-               
+              $ionicSideMenuDelegate.toggleLeft();
             }
         },
         {
diff --git a/www/js/app.js b/www/js/app.js
index 08331872..89944da6 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1584,11 +1584,13 @@ angular.module('zmApp', [
         }
 
         if (requireLogin) {
+      
+          NVR.displayBanner('error', [$translate.instant('kCredentialsBody')]);
 
-          $ionicPopup.alert({
+        /*  $ionicPopup.alert({
             title: $translate.instant('kCredentialsTitle'),
             template: $translate.instant('kCredentialsBody')
-          });
+          });*/
           // for whatever reason, .go was resulting in digest loops.
           // if you don't prevent, states will stack
           event.preventDefault();
diff --git a/www/templates/menu.html b/www/templates/menu.html
index ead3c729..1a630b98 100644
--- a/www/templates/menu.html
+++ b/www/templates/menu.html
@@ -10,7 +10,7 @@
     </ion-side-menu-content>
     <ion-side-menu>
       <ion-header-bar class="bar bar-header bar-stable">
-        <button ng-if="!root.LoginData.isKiosk" class="button icon ion-person-stalker" ng-click="switchProfiles()"></button>
+        <button ng-if="!$root.LoginData.isKiosk" class="button icon ion-person-stalker" ng-click="switchProfiles()"></button>
         <h1 class="title">{{'kMenuOptions'|translate}}</h1>
         </button>
       </ion-header-bar>