release 5.0.2

sipcapture · Jan 6, 2016 · c72e712 · c72e712
1 parent 78c137e
commit c72e712
Show file tree

Hide file tree

Showing 53 changed files with 3,208 additions and 516 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT(homer-ui,5.0.1,[email protected],,http://www.sipcapture.org)
+AC_INIT(homer-ui,5.0.2,[email protected],,http://www.sipcapture.org)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(foreign tar-ustar)
 m4_include([config/projectlib2.m4])

diff --git a/css/custom.css b/css/custom.css
@@ -661,3 +661,29 @@ svg.nvd3-svg {
 .form-group {
     margin-bottom: 10px;
 }
+
+
+/*
+ modal dialog in fullscreen
+*/
+.dashboard-modal.widget-fullscreen .modal-dialog {
+  width: 98%;
+}
+
+.modal-big {
+	width:100%
+}
+
+.modal-sm {
+	width:900px
+}
+
+.center-modal {
+    position: fixed;
+    top: 22%;
+    left: 18.5%;
+    z-index: 1050;
+    width: 80%;
+    height: 80%;
+    margin-left: -10%;
+}
diff --git a/css/homer.css b/css/homer.css
@@ -100,7 +100,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     margin-top: 5px;
 }
 img {
-    max-width: 100%important;
+    max-width: 100% !important;
 }
 .sort-highlight {
     background: #f4f4f4;

diff --git a/css/homer.min.css b/css/homer.min.css
diff --git a/css/homerModal.min.css b/css/homerModal.min.css
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
 <head lang="en">
     <meta charset="UTF-8">
-    <title>HOMER 5.0.1</title>
+    <title>HOMER 5.0.2</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
@@ -15,7 +15,6 @@
     <link rel="stylesheet" href="css/themes/base/jquery-ui.min.css" />
     <link rel="stylesheet" href="css/app.min.css" />
     <link rel="stylesheet" href="css/angular-dashboard-framework.min.css" />
-    <link rel="stylesheet" href="css/homerModal.min.css" />    
     <link rel="stylesheet" href="css/angular-chart.min.css" />    
     <link rel="stylesheet" href="css/sweetalert.min.css" />    
 
@@ -64,10 +63,11 @@
 <script type="application/javascript" src="lib/angular-third/angular-ui-router.min.js"></script>
 <script type="application/javascript" src="lib/angular-third/angular-file-upload.min.js"></script>
 <script type="application/javascript" src="lib/angular-third/dialog-service.min.js"></script>
+<script type="application/javascript" src="lib/angular-third/angular-local-storage.js"></script>
 <script type="application/javascript" src="lib/sortable/Sortable.min.js"></script>
 <script type="application/javascript" src="lib/angular-ui-sortable/sortable.min.js"></script>
-<script type="application/javascript" src="lib/bootstrap/ui-bootstrap-0.12.0.min.js"></script>
-<script type="application/javascript" src="lib/bootstrap/ui-bootstrap-tpls-0.12.0.min.js"></script>
+<script type="application/javascript" src="lib/bootstrap/ui-bootstrap-0.14.3.min.js"></script>
+<script type="application/javascript" src="lib/bootstrap/ui-bootstrap-tpls-0.14.3.min.js"></script>
 <script type="application/javascript" src="lib/ui-grid/ui-grid.min.js"></script>
 <script type="application/javascript" src="lib/angular-third/dialogs-default-translations.min.js"></script>
 <script type="application/javascript" src="lib/angular-third/dialogs.min.js"></script>
@@ -165,6 +165,9 @@
 <script type="application/javascript" src="js/widgets/markdown/btford.markdown.js"></script>
 <script type="application/javascript" src="js/widgets/markdown/markdown.js"></script>
 
+<!-- Geo Chart -->
+<script type="application/javascript" src="lib/angular-third/ng-google-chart.js"></script>
+<script type="application/javascript" src="js/widgets/geochart/geochart.js"></script>
 
 <!-- unstable -->
 <!-- <script type="application/javascript" src="js/widgets/ripesearch/ripesearch.js"></script> -->

diff --git a/js/app.js b/js/app.js
@@ -36,9 +36,16 @@
         'ui.grid.autoResize',
         'ui.grid.pagination',
         'ui.grid.selection',
+        'ui.grid.saveState',
+        'ui.grid.cellNav', 
+        'ui.grid.resizeColumns', 
+        'ui.grid.moveColumns', 
+        'ui.grid.pinning', 
+        'ui.grid.grouping',
         'oitozero.ngSweetAlert',
         'ngAnimate',
         'ngCookies',
+        'LocalStorageModule',
         'ngSanitize',
         'dialogs.main',
         'angularFileUpload',
@@ -63,6 +70,7 @@
         'homer.widgets.alarmlist',
         'homer.widgets.sipcapture', 
         'homer.widgets.querycap', 
+        'homer.widgets.geochart', 
      //   'homer.widgets.elasticap', 
         'homer.widgets.elasticaggs', 
         'homer.widgets.randommsg'              

diff --git a/js/controller.js b/js/controller.js
@@ -2,7 +2,7 @@
     "use strict";
     defineHomerAngularModule(homer.modules.app.name).controller("homerAppController", [ "$scope", "$rootScope", "eventbus", "$state", homer.modules.auth.services.authentication, "$location", "dialogs", homer.modules.core.services.profile, function($scope, $rootScope, eventbus, $state, authentication, $location, $dialogs, userProfile) {
         $rootScope.homerApp = "HOMER";
-        $rootScope.homerVersion = "5.0.1 Release";
+        $rootScope.homerVersion = "5.0.2 Release";
         console.log("HOMER INIT:", $rootScope.homerVersion);
         $scope.header = "templates/empty.html";
         $scope.menu = "templates/empty.html";
@@ -100,6 +100,27 @@
             console.log(userProfile);
             $location.path(homer.modules.auth.routes.logout);
         };
+
+        $scope.doSaveGridState = function() {
+            $scope.showLeftMenu = false;
+            $scope.dropDownUserMenuClass = "";
+            eventbus.broadcast(homer.modules.pages.events.saveGridState, "1");
+        };
+
+        $scope.doRestoreGridState = function() {
+            $scope.showLeftMenu = false;
+            $scope.dropDownUserMenuClass = "";
+            eventbus.broadcast(homer.modules.pages.events.restoreGridState, "1");
+        };
+
+        $scope.doResetGridState = function() {
+            $scope.showLeftMenu = false;
+            $scope.dropDownUserMenuClass = "";
+            eventbus.broadcast(homer.modules.pages.events.resetGridState, "1");
+            $location.path(homer.modules.pages.routes.home);
+        };
+
+
         eventbus.subscribe(homer.modules.auth.events.userLoggedIn, function(event, args) {
             if (!$scope.templateSet) {
                 $scope.showLeftMenu = true;
@@ -303,7 +324,7 @@
             userProfile.setProfile("timerange", $scope.timerange);
             updateTimeRange(true);                        
         });
-    }).controller("timerangeDialogCtrl", function($log, $scope, $modalInstance, data) {
+    }).controller("timerangeDialogCtrl", function($log, $scope, $uibModalInstance, data) {
         $scope.timerange = data;
         $scope.options = {
             hstep: [ 1, 2, 3 ],
@@ -319,19 +340,19 @@
         };
         $scope.setDate();
         $scope.done = function() {
-            $modalInstance.close($scope.timerange);
+            $uibModalInstance.close($scope.timerange);
         };
     }).config(function(dialogsProvider) {
         dialogsProvider.useBackdrop(true);
         dialogsProvider.useEscClose(true);
         dialogsProvider.useCopy(false);
         dialogsProvider.setSize("sm");
-    }).controller("newDashboardCtrl", function($scope, $modalInstance, data, FileUploader) {
+    }).controller("newDashboardCtrl", function($scope, $uibModalInstance, data, FileUploader) {
         $scope.dashboard = {
             name: ""
         };
         $scope.cancel = function() {
-            $modalInstance.dismiss("canceled");
+            $uibModalInstance.dismiss("canceled");
         };
         $scope.hitEnter = function(evt) {
             if (angular.equals(evt.keyCode, 13) && !(angular.equals($scope.dashboard, null) || angular.equals($scope.dashboard, ""))) $scope.save();
@@ -343,7 +364,7 @@
             if ($scope.uploader.queue.length > 0) {
                 uploader.uploadAll();
             } else {
-                if ($scope.nameDialog.$valid) $modalInstance.close($scope.dashboard.name);
+                if ($scope.nameDialog.$valid) $uibModalInstance.close($scope.dashboard.name);
             }
         };
         uploader.filters.push({
@@ -354,7 +375,7 @@
         });
         uploader.onCompleteAll = function() {
             console.info("onCompleteAll");
-            $modalInstance.close("upload");
+            $uibModalInstance.close("upload");
         };
     });
-})(angular, homer);
+})(angular, homer);
diff --git a/js/modules/auth/controllers/loginCtrl.js b/js/modules/auth/controllers/loginCtrl.js
@@ -14,10 +14,10 @@
         '$rootScope',
         '$scope',
         '$location',
-        '$modal',
+        '$uibModal',
         homer.modules.auth.services.authentication,
         homer.modules.core.services.profile,
-        function ($rootScope, $scope, $location, $modal, authentication, userProfile) {
+        function ($rootScope, $scope, $location, $uibModal, authentication, userProfile) {
             $scope.loginModel = {};
             $scope.isBusy = false;
             $scope.invalidLogin = false;

diff --git a/js/modules/pages/controllers/dialogCtrl.js b/js/modules/pages/controllers/dialogCtrl.js
@@ -11,16 +11,16 @@
     'use strict';
 
     angular.module(homer.modules.pages.name)
-        .controller('drawCtrl',function($scope, $modalInstance){
+        .controller('drawCtrl',function($scope, $uibModalInstance){
 
 		console.log("OPEN DATA");
 
 		$scope.ok = function () {
-    			$modalInstance.close("11");
+    			$uibModalInstance.close("11");
 		};
 
 		$scope.close = function () {
-		    $modalInstance.dismiss('cancel');
+		    $uibModalInstance.dismiss('cancel');
 		};        
         })
         .controller('messageCtrl', [

diff --git a/js/modules/pages/controllers/resultCtrl.js b/js/modules/pages/controllers/resultCtrl.js
@@ -22,7 +22,8 @@
 	    '$window',
 	    '$homerModal',
 	    homer.modules.core.services.profile,
-	    function ($scope,$rootScope, eventbus, $http, $location, search, $timeout, $window, $homerModal, userProfile) {
+	    'localStorageService',
+	    function ($scope,$rootScope, eventbus, $http, $location, search, $timeout, $window, $homerModal, userProfile, localStorageService) {
 
 		//$rootScope.loggedIn = false;
 		$scope.expandme = true;
@@ -142,6 +143,7 @@
 		search.searchByMethod(data).then(
 		function (sdata) {
 		    if (sdata) {
+		        $scope.restoreState();
 			$scope.count = sdata.length;
 			$scope.gridOpts.data = sdata;
 			$timeout(function () {
@@ -173,9 +175,11 @@
 
 	    $scope.hashCode = function(str) { // java String#hashCode
 		var hash = 0;
-		for (var i = 0; i < str.length; i++) {
-			hash = str.charCodeAt(i) + ((hash << 5) - hash);
-		}
+		if(str) {
+        		for (var i = 0; i < str.length; i++) {
+	        		hash = str.charCodeAt(i) + ((hash << 5) - hash);
+                        }
+                }
 		return hash;
 	    }; 
 
@@ -310,6 +314,13 @@
 			+'</div>';
 
 	    $scope.gridOpts = {
+	        saveWidths: true,
+	        saveOrder: true,
+	        saveVisible: true,
+	        saveFocus: false,
+	        saveScroll: true,
+	        saveGrouping: false,
+	        saveGroupingExpandedStates: true,
 		enableColumnResizing: true,
 		enableSorting: true,
 		enableRowSelection: true, 
@@ -383,6 +394,37 @@
 		]
 	    };
 
+	    $scope.state = localStorageService.get('localStorageGrid');	        
+
+	    //$scope.state = {};
+
+	    $scope.saveState = function() {	        
+        	$scope.state = $scope.gridApi.saveState.save();
+        	localStorageService.set('localStorageGrid',$scope.state);                              	
+	    };
+
+      	    $scope.restoreState = function() {
+      	        $scope.state = localStorageService.get('localStorageGrid');
+      	        if($scope.state) $scope.gridApi.saveState.restore( $scope, $scope.state );
+      	    };
+
+      	    $scope.resetState = function() {
+        	$scope.state = {};
+        	$scope.gridApi.saveState.restore( $scope, $scope.state);
+        	localStorageService.set('localStorageGrid',$scope.state);                              	
+      	    };
+
+      	    eventbus.subscribe(homer.modules.pages.events.saveGridState, function(event, args) {
+      	        $scope.saveState();
+            });
+
+            eventbus.subscribe(homer.modules.pages.events.restoreGridState, function(event, args) {
+      	        $scope.restoreState();
+            });
+
+            eventbus.subscribe(homer.modules.pages.events.resetGridState, function(event, args) {
+      	        $scope.resetState();
+            });        
 
 	    $scope.gridOpts.rowIdentity = function(row) {
 		return row.id;

diff --git a/js/modules/pages/html/result.tmpl.html b/js/modules/pages/html/result.tmpl.html
@@ -17,7 +17,8 @@ <h1>
 	</div>
 	<div class="row" ng-show="showtable">
 		<div class="box-homer-results">
-                	<div id="grid1" ui-grid="gridOpts" class="gridStyle" ui-grid-auto-resize ui-grid-selection ui-grid-pagination resize></div>
+                	<div id="grid1" ui-grid="gridOpts" class="gridStyle" ui-grid-auto-resize resize ui-grid-selection ui-grid-pagination ui-grid-resize-columns ui-grid-save-state  ui-grid-move-columns ui-grid-pinning ui-grid-grouping></div>
 		</div><!-- /.box-body external-scopes="gridHandlers" -->
+
 	</div>
 </div>
diff --git a/js/modules/pages/module.pages.js b/js/modules/pages/module.pages.js
@@ -35,7 +35,10 @@
 	    resultSearchSubmit: 'resultSearchSubmit',
 	    hideLeftMenu: 'hideLeftMenu',
 	    destroyRefresh: 'destroyRefresh',
-	    setTimeRange: 'setTimeRange'	    
+	    setTimeRange: 'setTimeRange',
+	    saveGridState: 'saveGridState',	    
+	    restoreGridState: 'restoreGridState',
+	    resetGridState: 'resetGridState'
         },
         state: {
             home: 'home',

diff --git a/js/widgets/adminalias/adminalias.html b/js/widgets/adminalias/adminalias.html
@@ -1,18 +1,18 @@
 <div access="admins" class="row" ng-show="showtable" style="width:101%;float:right;">
       <div class="box-homer-admin">
-	<tabset>
-	<tab active="activeMainTab" disabled="activeTab === false" select="tabShown = !tabShown" deselect="tabShown = !tabShown">
-	<tab-heading><i class="fa fa-users"> Local Aliases</i></tab-heading>
+	<uib-tabset>
+	<uib-tab active="activeMainTab" disable="activeTab === false" select="tabShown = !tabShown" deselect="tabShown = !tabShown">
+	<uib-tab-heading><i class="fa fa-users"> Local Aliases</i></uib-tab-heading>
                <div style="margin-top:8px;">
 		 <div id="grid1" ng-if="activeMainTab" ui-grid="gridOptions" class="gridWidgetsStyle" ui-grid-edit ui-grid-row-edit ui-grid-cellNav ui-grid-auto-resize resize ></div>
                </div>
-	</tab>
-	<tab ng-if="activeMainTab === true" active="disabled" deselect="activeMainTab">
-            <tab-heading ng-click="newAlias()"><a ng-click="newAlias()" href=''> <i class="fa fa-plus"> Add Alias</i></a></tab-heading>
-        </tab>
+	</uib-tab>
+	<uib-tab ng-if="activeMainTab === true" active="disabled" deselect="activeMainTab">
+            <uib-tab-heading ng-click="newAlias()"><a ng-click="newAlias()" href=''> <i class="fa fa-plus"> Add Alias</i></a></uib-tab-heading>
+        </uib-tab>
 
-	<tab ng-if="newTab" active="activeNewTab" >
-	<tab-heading><i class="fa fa-user"> New Alias</i>  &nbsp; <a ng-click="removeAliasTab()" href=''><i class="fa fa-times"></i></a></tab-heading>
+	<uib-tab ng-if="newTab" active="activeNewTab" >
+	<uib-tab-heading><i class="fa fa-user"> New Alias</i>  &nbsp; <a ng-click="removeAliasTab()" href=''><i class="fa fa-times"></i></a></uib-tab-heading>
 		<div style="padding:15px;">
 	 	<div role="alert">
 		      <span class="error" ng-show="errorNewAliasShow">{{errorNewAliasForm}}</span>
@@ -53,10 +53,10 @@
                 	        <button class="btn btn-success" ng-click="addNewAlias()" ng-disabled="newAliasForm.$invalid">Create Alias</button>
                 	</div>
                 </div>
-	</tab>
+	</uib-tab>
 
-	<tab ng-if="editTab === true" active="editTab ? true : false">
-	<tab-heading><i class="fa fa-edit"> Edit Alias</i>  &nbsp; <a ng-click="removeAliasTab()" href=''><i class="fa fa-times"></i></a></tab-heading>
+	<uib-tab ng-if="editTab === true" active="editTab ? true : false">
+	<uib-tab-heading><i class="fa fa-edit"> Edit Alias</i>  &nbsp; <a ng-click="removeAliasTab()" href=''><i class="fa fa-times"></i></a></uib-tab-heading>
 		<div style="padding:15px;">
                 <div role="alert">
                       <span class="help-block error" ng-show="errorEditAliasShow">{{errorEditAliasForm}}</span>
@@ -100,10 +100,10 @@
                 </div>
 
 
-	<tab>
+	<uib-tab>
 
 
-	</tabset>
+	</uib-tabset>
 
       </div><!-- /.box-body external-scopes="gridHandlers" -->
 </div>