initial commits for this feature - doesn't work yet

Former-commit-id: ae5140218a556288ac8e9a33e29ca01c43619126

5 files changed, 41 insertions, 6 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index b62af980..f948e38b 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -24,7 +24,8 @@ angular.module('zmApp.controllers')
     var monitors = [];
     var oldevents = [];
      
-    
+     var serverGroupList={};
+     
      var loginData = {
         'username': '',
         'password': '',
@@ -105,7 +106,12 @@ angular.module('zmApp.controllers')
             zmLog("Saving all parameters to storage");
             zmDebug ("DataModel/setLogin: writing " + JSON.stringify(newLogin));
             
-            $localstorage.setObject('defaultServer', loginData);
+            $localstorage.setObject($rootScope.currentServerGroup, loginData);
+            serverGroupList[$rootScope.currentServerGroup]=loginData;
+            console.log (JSON.stringify(serverGroupList));
+            $localstorage.setObject("serverlist", serverGroupList);
+           
+         
      }
     
     // separate out a debug so we don't do this if comparison for normal logs
@@ -175,7 +181,7 @@ angular.module('zmApp.controllers')
 
             zmLog("ZMData init: checking for stored variables & setting up log file");
             
-            var loadedData = $localstorage.getObject('defaultServer');
+            var loadedData = $localstorage.getObject($rootScope.currentServerGroup);
             if (!isEmpty(loadedData))
             {  
                 loginData =  loadedData;
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 6c9234c4..1199d78a 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', function ($scope, $rootScope, zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state) {
+angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', function ($scope, $rootScope, zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -31,6 +31,30 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
     $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false;
 
 
+    $scope.serverActionSheet = function () {
+        var hideSheet = $ionicActionSheet.show({
+            buttons: [
+                {
+                    text: 'New Group...'
+                },
+                
+                {
+                    text: 'Rename'
+                },
+                
+                
+            ],
+            destructiveText: 'Delete',
+            titleText: 'Manage Server Groups',
+            cancelText: 'Cancel',
+            cancel: function () {
+                // add cancel code..
+            },
+            buttonClicked: function (index) {
+                return true;
+            }
+        });
+    };
     
 
     //----------------------------------------------------------------
diff --git a/www/js/app.js b/www/js/app.js
index b51578a0..f52f3bab 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -545,6 +545,7 @@ angular.module('zmApp', [
          //var eventsToDisplay=[];
         $rootScope.alarmCount="0";
         $rootScope.platformOS="desktop";
+        $rootScope.currentServerGroup = "defaultServer";
        
 
         // This is a global exception interceptor
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index dfefa7d2..45140428 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -14,7 +14,7 @@
     <ion-content class="padding">
         <div class="list list-inset">
             <span style="color:rgb(100,100,100)">
-                <i class="ion-android-settings" style="font-size:150%"></i> Developer Options
+                <i class="ion-android-settings" style="font-size:150%"></i> Developer Options for {{$root.currentServerGroup}}
             </span>
 
              <div class="item item-input-inset">
diff --git a/www/templates/login.html b/www/templates/login.html
index 99f06b8c..ab7891df 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -2,6 +2,10 @@
 
     <ion-nav-buttons side="left">
         <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+        <button class="button button-icon button-clear ion-arrow-down-b" ng-click="serverActionSheet()"></button>
+        
+        
+        
                 <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
     </ion-nav-buttons>
     
@@ -13,7 +17,7 @@
         <div class="list list-inset">
             <span style="color:rgb(100,100,100)">
                 <i class="ion-android-home" style="font-size:150%"></i>
-                ZoneMinder Settings
+                ZoneMinder Settings for {{$root.currentServerGroup}}
             </span>
             
             <div class="item">