This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 7b9d4f33a22b0b76e2e184df5c42ee95233376c7 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Mon Feb 23 18:03:54 2015 +0100 routing is now managed with angularjs (index.html is main template) --- bower.json | 3 +- static/js/controllers/mainCtrl.js | 431 +++++++++++++++++++++++++++++++++ static/js/controllers/settings_ctrl.js | 8 - static/js/controllers/table_ctrl.js | 306 ----------------------- views/dashboard.html | 77 ------ views/groups.html | 72 +----- views/hostpage.html | 72 +----- views/index.html | 93 ++++--- views/notifications.html | 67 ----- views/profile.html | 69 ------ views/scan.html | 69 ------ views/settings.html | 69 ------ views/stats.html | 70 ------ views/users.html | 71 ------ 14 files changed, 499 insertions(+), 978 deletions(-) diff --git a/bower.json b/bower.json index 477f28e..d0d8be9 100644 --- a/bower.json +++ b/bower.json @@ -5,6 +5,7 @@ "bootstrap": "~3.2.0", "angular-latest": "~1.3.9", "angular": "~1.3.13", - "angular-toastr": "~0.5.2" + "angular-toastr": "~0.5.2", + "angular-route": "~1.3.13" } } diff --git a/static/js/controllers/mainCtrl.js b/static/js/controllers/mainCtrl.js new file mode 100644 index 0000000..9ca081e --- /dev/null +++ b/static/js/controllers/mainCtrl.js @@ -0,0 +1,431 @@ +var mumApp = angular.module('mumApp', ['ngRoute']); + +mumApp.config(function($routeProvider){ + $routeProvider + .when('/',{ + templateUrl : 'dashboard.html', + controller : 'mainController' + }) + .when('/dashboard',{ + templateUrl : 'dashboard.html', + controller : 'mainController' + }) + .when('/groups',{ + templateUrl : 'groups.html', + controller : 'mainController' + }) + .when('/hostpage',{ + templateUrl : 'hostpage.html', + controller : 'mainController' + }) + .when('/notifications',{ + templateUrl : 'notifications.html', + controller : 'mainController' + }) + .when('/profile',{ + templateUrl : 'profile.html', + controller : 'mainController' + }) + .when('/scan',{ + templateUrl : 'scan.html', + controller : 'DetectController' + }) + .when('/settings',{ + templateUrl : 'settings.html', + controller : 'mainController' + }) + .when('/signin',{ + templateUrl : 'signin.html', + controller : 'mainController' + }) + .when('/stats',{ + templateUrl : 'stats.html', + controller : 'mainController' + }) + .when('/users',{ + templateUrl : 'users.html', + controller : 'mainController' + }) +}); + +mumApp.controller('mainController', function ($scope, $filter) { + + // init + $scope.sort = { + sortingOrder : 'id', + reverse : false + }; + + $scope.gap = 5; + + $scope.filteredItems = []; + $scope.groupedItems = []; + $scope.itemsPerPage = 25; + $scope.pagedItems = []; + $scope.currentPage = 0; + + $scope.addr_filter = ''; + $scope.name_filter = ''; + $scope.status_filter = ''; + $scope.group_filter = ''; + + $scope.items = []; + + $scope.status = ''; + + $scope.grp = "all"; + + var ws = new WebSocket("ws://0.0.0.0:1337/websocket"); + + ws.onopen = function() { + var request = '{"14" : ""}'; + ws.send(request); + }; + + // actions effectuees lors de la reception d'un message via la websocket + ws.onmessage = function (evt) { + JSON.parse(evt.data, function (key, value) { + switch(parseInt(key)){ + case 20: // Success of a module execution + toastr.success(value, "Success on module execution"); + case 21: // Informations concerning one host + break; + case 22: // List of hosts under monitoring + $scope.$apply(function(){ + $scope.items = JSON.parse(value); + }); + break; + case 30: + $scope.$apply(function(){ + $scope.status = value; + }); + toastr.info(value, "Current status is :"); + /* + $scope.$apply(function(){ + $scope.state = value + });*/ + break; + case 31: + params = value.split(','); + if(params[0]=='success'){ + $scope.pop_success("Success on " + params[1], params[2]); + } + else if(params[0] == 'warning'){ + $scope.pop_warning("Warning on " + params[1], params[2]); + } + else if(params[0] == 'danger'){ + $scope.pop_danger("Danger on "+ params[1], params[2]); + } + break; + case 40: + toastr.error(value, "Server error"); + break; + default: + break; + } + }); + + }; + + $scope.pop_success = function(title, msg){ + toastr.success(msg, title); + }; + + $scope.pop_warning = function(title, msg){ + toastr.success(msg, title); + }; + + $scope.pop_danger = function(title, msg){ + toastr.error(msg, title); + }; + + var searchMatch = function (haystack, needle) { + if (!needle) { + return true; + } + return haystack.toLowerCase().indexOf(needle.toLowerCase()) !== -1; + }; + + // init the filtered items + $scope.search = function () { + $scope.filteredItems = $filter('filter')($scope.items, function (item) { + for(var attr in item) { + if (searchMatch(item[attr], $scope.query)) + return true; + } + return false; + }); + // take care of the sorting order + if ($scope.sort.sortingOrder !== '') { + $scope.filteredItems = $filter('orderBy')($scope.filteredItems, $scope.sort.sortingOrder, $scope.sort.reverse); + } + $scope.currentPage = 0; + // now group by pages + $scope.groupToPages(); + }; + + + // calculate page in place + $scope.groupToPages = function () { + $scope.pagedItems = []; + + for (var i = 0; i < $scope.filteredItems.length; i++) { + if (i % $scope.itemsPerPage === 0) { + $scope.pagedItems[Math.floor(i / $scope.itemsPerPage)] = [ $scope.filteredItems[i] ]; + } else { + $scope.pagedItems[Math.floor(i / $scope.itemsPerPage)].push($scope.filteredItems[i]); + } + } + }; + + $scope.range = function (size,start, end) { + var ret = []; + console.log(size,start, end); + + if (size < end) { + end = size; + start = size-$scope.gap; + } + for (var i = start; i < end; i++) { + ret.push(i); + } + console.log(ret); + return ret; + }; + + $scope.prevPage = function () { + if ($scope.currentPage > 0) { + $scope.currentPage--; + } + }; + + $scope.nextPage = function () { + if ($scope.currentPage < $scope.pagedItems.length - 1) { + $scope.currentPage++; + } + }; + + $scope.setPage = function () { + $scope.currentPage = this.n; + }; + + // functions have been describe process the data for display + $scope.search(); + + // $scope.groupsByAddr = {} + + $scope.getGroupsByAddr = function(addr) { + res = "" + for(var i = 0; i<$scope.items.length; i++){ + if($scope.items[i].addr === addr){ + for(var j = 0; j<$scope.items[i].group.length; j++){ + res += $scope.items[i].group[j].name + " "; + } + } + } + return res; + }; + + $scope.allGroups = function(){ + var res = [] + for(var i = 0; i<$scope.items.length; i++){ + for(var j = 0; j<$scope.items[i].group.length; j++){ + res.push($scope.items[i].group[j].name); + } + } + return res; + }; + + /* + * Return a vector with the number of hosts with a status of : success, warning, danger + */ + $scope.stateNumber = function(){ + var res = [0,0,0]; + for(var i = 0; i<$scope.items.length; i++){ + if($scope.items[i].status === "success"){ + res[0]++; + } + if($scope.items[i].status === "warning"){ + res[1]++; + } + if($scope.items[i].status === "danger"){ + res[2]++; + } + } + return res; + }; + + $scope.checkAll = function(){ + if($scope.selectedAll){ + $scope.selectedAll = true; + } + else{ + $scope.selectedAll = false; + } + angular.forEach($scope.items, function(item){ + item.Selected = $scope.selectedAll; + }); + }; +}); + +mumApp.controller('DetectController', ['$scope', 'toastr', '$interval', function($scope, toastr, $interval) { + $scope.master = {}; + $scope.ip_range = "198.116.0.1-10" // la plage d'ip entree dans le champ + $scope.state = ""; // l'etat general du scan en cours + $scope.validated = false; // pour afficher ou non certaines parties de la page + $scope.scan_is_over = false; // pour afficher ou non certaines parties de la page + $scope.ip_scanned = {}; + var ws = new WebSocket("ws://0.0.0.0:1337/websocket"); + + /*ws.onopen = function() { + ws.send("Hello, world"); + };*/ + + // actions effectuees lors de la reception d'un message via la websocket + ws.onmessage = function (evt) { + JSON.parse(evt.data, function (key, value) { + switch(parseInt(key)){ + case 20: // Success of a module execution + $scope.$apply(function(){ + $scope.state = "Success!"; + $scope.ip_scanned = value; + }); + toastr.success(value, "Success on module execution"); + case 21: // Informations concerning one host + break; + case 22: // List of hosts under monitoring + break; + case 30: + $scope.$apply(function(){ + $scope.state = value; + }); + toastr.info(value, "Current status is :"); + /* + $scope.$apply(function(){ + $scope.state = value + });*/ + break; + case 31: + params = value.split(','); + if(params[0]=='success'){ + $scope.pop_success("Success on " + params[1], params[2]); + } + else if(params[0] == 'warning'){ + $scope.pop_warning("Warning on " + params[1], params[2]); + } + else if(params[0] == 'danger'){ + $scope.pop_danger("Danger on "+ params[1], params[2]); + } + break; + case 40: + toastr.error(value, "Server error"); + break; + default: + break; + } + }); + + }; + + $scope.pop_success = function(title, msg){ + toastr.success(msg, title); + }; + + $scope.pop_warning = function(title, msg){ + toastr.success(msg, title); + }; + + $scope.pop_danger = function(title, msg){ + toastr.error(msg, title); + }; + + //lace la detection apres remplissage du champ et validation du formulaire + $scope.post_val = function(){ + var request = '{"10" : "' + $scope.ip_range + '"}'; + ws.send(request); + } +}]); + + +mumApp.$inject = ['$scope', '$filter']; + +mumApp.directive("customSort", function() { +return { +restrict: 'A', +transclude: true, +scope: { + order: '=', + sort: '=' +}, +template : + ' <a ng-click="sort_by(order)" style="color: #555555;">'+ + ' <span ng-transclude></span>'+ + ' <i ng-class="selectedCls(order)"></i>'+ + '</a>', +link: function(scope) { + +// change sorting order +scope.sort_by = function(newSortingOrder) { + var sort = scope.sort; + + if (sort.sortingOrder == newSortingOrder){ + sort.reverse = !sort.reverse; + } + + sort.sortingOrder = newSortingOrder; +}; + + +scope.selectedCls = function(column) { + if(column == scope.sort.sortingOrder){ + return ('icon-chevron-' + ((scope.sort.reverse) ? 'down' : 'up')); + } + else{ + return'icon-sort' + } +}; +}// end link +} + + +}); + +// https://github.com/angular-ui/angular-ui-OLDREPO/blob/master/modules/filters... (MIT licence) +mumApp.filter('unique', function () { + +return function (items, filterOn) { + + if (filterOn === false) { + return items; + } + + if ((filterOn || angular.isUndefined(filterOn)) && angular.isArray(items)) { + var hashCheck = {}, newItems = []; + + var extractValueToCompare = function (item) { + if (angular.isObject(item) && angular.isString(filterOn)) { + return item[filterOn]; + } else { + return item; + } + }; + + angular.forEach(items, function (item) { + var valueToCheck, isDuplicate = false; + + for (var i = 0; i < newItems.length; i++) { + if (angular.equals(extractValueToCompare(newItems[i]), extractValueToCompare(item))) { + isDuplicate = true; + break; + } + } + if (!isDuplicate) { + newItems.push(item); + } + + }); + items = newItems; + } + return items; +}; +}); \ No newline at end of file diff --git a/static/js/controllers/settings_ctrl.js b/static/js/controllers/settings_ctrl.js deleted file mode 100644 index 3b9b5f0..0000000 --- a/static/js/controllers/settings_ctrl.js +++ /dev/null @@ -1,8 +0,0 @@ -var settingsModule = angular.module('appSettings', []); - -settingsModule.controller('ctrlSettings', function ($scope) { - $scope.cpu_warn=90; - $scope.cpu_danger=100; - $scope.drive_warn=90; - $scope.drive_danger=100; -}); \ No newline at end of file diff --git a/static/js/controllers/table_ctrl.js b/static/js/controllers/table_ctrl.js deleted file mode 100644 index d08b2c7..0000000 --- a/static/js/controllers/table_ctrl.js +++ /dev/null @@ -1,306 +0,0 @@ -var tablemodule = angular.module('myModule', []); - - -tablemodule.controller('ctrlRead', function ($scope, $filter) { - - // init - $scope.sort = { - sortingOrder : 'id', - reverse : false - }; - - $scope.gap = 5; - - $scope.filteredItems = []; - $scope.groupedItems = []; - $scope.itemsPerPage = 25; - $scope.pagedItems = []; - $scope.currentPage = 0; - - $scope.addr_filter = ''; - $scope.name_filter = ''; - $scope.status_filter = ''; - $scope.group_filter = ''; - - $scope.items = []; - - $scope.status = ''; - - $scope.grp = "all"; - - var ws = new WebSocket("ws://0.0.0.0:1337/websocket"); - - ws.onopen = function() { - var request = '{"14" : ""}'; - ws.send(request); - }; - - // actions effectuees lors de la reception d'un message via la websocket - ws.onmessage = function (evt) { - JSON.parse(evt.data, function (key, value) { - switch(parseInt(key)){ - case 20: // Success of a module execution - toastr.success(value, "Success on module execution"); - case 21: // Informations concerning one host - break; - case 22: // List of hosts under monitoring - $scope.$apply(function(){ - $scope.items = JSON.parse(value); - }); - break; - case 30: - $scope.$apply(function(){ - $scope.status = value; - }); - toastr.info(value, "Current status is :"); - /* - $scope.$apply(function(){ - $scope.state = value - });*/ - break; - case 31: - params = value.split(','); - if(params[0]=='success'){ - $scope.pop_success("Success on " + params[1], params[2]); - } - else if(params[0] == 'warning'){ - $scope.pop_warning("Warning on " + params[1], params[2]); - } - else if(params[0] == 'danger'){ - $scope.pop_danger("Danger on "+ params[1], params[2]); - } - break; - case 40: - toastr.error(value, "Server error"); - break; - default: - break; - } - }); - - }; - - $scope.pop_success = function(title, msg){ - toastr.success(msg, title); - }; - - $scope.pop_warning = function(title, msg){ - toastr.success(msg, title); - }; - - $scope.pop_danger = function(title, msg){ - toastr.error(msg, title); - }; - - var searchMatch = function (haystack, needle) { - if (!needle) { - return true; - } - return haystack.toLowerCase().indexOf(needle.toLowerCase()) !== -1; - }; - - // init the filtered items - $scope.search = function () { - $scope.filteredItems = $filter('filter')($scope.items, function (item) { - for(var attr in item) { - if (searchMatch(item[attr], $scope.query)) - return true; - } - return false; - }); - // take care of the sorting order - if ($scope.sort.sortingOrder !== '') { - $scope.filteredItems = $filter('orderBy')($scope.filteredItems, $scope.sort.sortingOrder, $scope.sort.reverse); - } - $scope.currentPage = 0; - // now group by pages - $scope.groupToPages(); - }; - - - // calculate page in place - $scope.groupToPages = function () { - $scope.pagedItems = []; - - for (var i = 0; i < $scope.filteredItems.length; i++) { - if (i % $scope.itemsPerPage === 0) { - $scope.pagedItems[Math.floor(i / $scope.itemsPerPage)] = [ $scope.filteredItems[i] ]; - } else { - $scope.pagedItems[Math.floor(i / $scope.itemsPerPage)].push($scope.filteredItems[i]); - } - } - }; - - $scope.range = function (size,start, end) { - var ret = []; - console.log(size,start, end); - - if (size < end) { - end = size; - start = size-$scope.gap; - } - for (var i = start; i < end; i++) { - ret.push(i); - } - console.log(ret); - return ret; - }; - - $scope.prevPage = function () { - if ($scope.currentPage > 0) { - $scope.currentPage--; - } - }; - - $scope.nextPage = function () { - if ($scope.currentPage < $scope.pagedItems.length - 1) { - $scope.currentPage++; - } - }; - - $scope.setPage = function () { - $scope.currentPage = this.n; - }; - - // functions have been describe process the data for display - $scope.search(); - - // $scope.groupsByAddr = {} - - $scope.getGroupsByAddr = function(addr) { - res = "" - for(var i = 0; i<$scope.items.length; i++){ - if($scope.items[i].addr === addr){ - for(var j = 0; j<$scope.items[i].group.length; j++){ - res += $scope.items[i].group[j].name + " "; - } - } - } - return res; - }; - - $scope.allGroups = function(){ - var res = [] - for(var i = 0; i<$scope.items.length; i++){ - for(var j = 0; j<$scope.items[i].group.length; j++){ - res.push($scope.items[i].group[j].name); - } - } - return res; - }; - - /* - * Return a vector with the number of hosts with a status of : success, warning, danger - */ - $scope.stateNumber = function(){ - var res = [0,0,0]; - for(var i = 0; i<$scope.items.length; i++){ - if($scope.items[i].status === "success"){ - res[0]++; - } - if($scope.items[i].status === "warning"){ - res[1]++; - } - if($scope.items[i].status === "danger"){ - res[2]++; - } - } - return res; - }; - - $scope.checkAll = function(){ - if($scope.selectedAll){ - $scope.selectedAll = true; - } - else{ - $scope.selectedAll = false; - } - angular.forEach($scope.items, function(item){ - item.Selected = $scope.selectedAll; - }); - }; -}); - - -tablemodule.$inject = ['$scope', '$filter']; - -tablemodule.directive("customSort", function() { -return { - restrict: 'A', - transclude: true, - scope: { - order: '=', - sort: '=' - }, - template : - ' <a ng-click="sort_by(order)" style="color: #555555;">'+ - ' <span ng-transclude></span>'+ - ' <i ng-class="selectedCls(order)"></i>'+ - '</a>', - link: function(scope) { - - // change sorting order - scope.sort_by = function(newSortingOrder) { - var sort = scope.sort; - - if (sort.sortingOrder == newSortingOrder){ - sort.reverse = !sort.reverse; - } - - sort.sortingOrder = newSortingOrder; - }; - - - scope.selectedCls = function(column) { - if(column == scope.sort.sortingOrder){ - return ('icon-chevron-' + ((scope.sort.reverse) ? 'down' : 'up')); - } - else{ - return'icon-sort' - } - }; - }// end link -} - - -}); - -// https://github.com/angular-ui/angular-ui-OLDREPO/blob/master/modules/filters... (MIT licence) -tablemodule.filter('unique', function () { - - return function (items, filterOn) { - - if (filterOn === false) { - return items; - } - - if ((filterOn || angular.isUndefined(filterOn)) && angular.isArray(items)) { - var hashCheck = {}, newItems = []; - - var extractValueToCompare = function (item) { - if (angular.isObject(item) && angular.isString(filterOn)) { - return item[filterOn]; - } else { - return item; - } - }; - - angular.forEach(items, function (item) { - var valueToCheck, isDuplicate = false; - - for (var i = 0; i < newItems.length; i++) { - if (angular.equals(extractValueToCompare(newItems[i]), extractValueToCompare(item))) { - isDuplicate = true; - break; - } - } - if (!isDuplicate) { - newItems.push(item); - } - - }); - items = newItems; - } - return items; - }; -}); \ No newline at end of file diff --git a/views/dashboard.html b/views/dashboard.html index 60f6a14..d8fafa9 100644 --- a/views/dashboard.html +++ b/views/dashboard.html @@ -1,70 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=2"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Dashboard</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> - - <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> - <!--[if lt IE 9]><!-- - <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> - <![endif]--> - </head> - - <body ng-app="myModule" ng-controller="ctrlRead"> - - <nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : {{stateNumber()[0]}}</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : {{stateNumber()[1]}}</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : {{stateNumber()[2]}}</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> - </nav> - - <div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar sidebar-fixed-left"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Dashboard</h1> <h2 class="sub-header">Hosts currently on monitoring</h2> @@ -149,14 +83,3 @@ </div> </div> - </div> - </div> - - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> - </body> -</html> - diff --git a/views/groups.html b/views/groups.html index 62be2a4..70aa2cd 100644 --- a/views/groups.html +++ b/views/groups.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Group manager</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> -</head> - -<body ng-app="myModule" ng-controller="ctrlRead"> - -<nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> -</nav> - -<div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Group manager</h1> <div class="row"> @@ -101,7 +41,7 @@ <button ng-show="grp != 'all' || ''" type="button" class="btn btn-danger">Remove selected from {{grp}}</button> </div> </div> -</div> + <div class="modal fade" id="modal_add" tabindex="-1" role="dialog" aria-labelledby="modal_add_label" aria-hidden="true"> <div class="modal-dialog"> @@ -130,13 +70,3 @@ </div> </div> </div> -</div> - - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> -</body> -</html> - diff --git a/views/hostpage.html b/views/hostpage.html index b08b2fe..060f678 100644 --- a/views/hostpage.html +++ b/views/hostpage.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Host details</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> - </head> - - <body> - - <nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> - </nav> - - <div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Current state of 192.168.74.1 <small>www.example.com</small></h1> <button type="button" class="btn btn-primary btn-xs" data-toggle="modal" data-target="#modal_block">Activate/Deactivate</button> @@ -256,8 +196,7 @@ </div> </div> - </div> - </div> + <div class="modal fade" id="modal_conf" tabindex="-1" role="dialog" aria-labelledby="modal_conf_label" aria-hidden="true"> <div class="modal-dialog"> @@ -513,12 +452,3 @@ </div> </div> </div> - - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> - </body> -</html> - diff --git a/views/index.html b/views/index.html index 619e2f9..eab9323 100644 --- a/views/index.html +++ b/views/index.html @@ -1,44 +1,79 @@ <!DOCTYPE html> -<html lang="fr"> +<html lang="en" ng-app="mumApp"> <head> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=2"> <meta name="description" content=""> <meta name="author" content=""> + <link rel="icon" href="favicon.ico"> - <title>Mum (Machines under monitoring)</title> + <title>Mum : Dashboard</title> - <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/angular/angular.min.js"></script> - <script src="bower_components/angular-toastr/dist/angular-toastr.min.js"></script> - <script src="static/js/controllers/detectCtrl.js"></script> + <!-- Bootstrap core CSS --> + <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - <link href="bower_components/angular-toastr/dist/angular-toastr.min.css" rel="stylesheet"/> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" media="screen"/> - <link href="static/css/main.css" rel="stylesheet" media="screen"/> + <!-- Custom styles for this template --> + <link href="static/css/dashboard.css" rel="stylesheet"> + <script src="bower_components/angular/angular.min.js"></script> + <script src="bower_components/angular-route/angular-route.min.js"></script> + <script src="static/js/controllers/mainCtrl.js"></script> + + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> + <!--[if lt IE 9]><!-- + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <![endif]--> </head> -<body ng-app="detectModule"> -<div ng-controller="DetectController"> - <form ng_submit="post_val()"> - <div ng-show="validated == false" class="ng-hide"> - Plage d'IP à scanner (exemple : 198.116.0.1-10) : <input name="ip_range" ng-model="ip_range" /> - <input value="Valider" type="submit" ng-click="validated = true"/> - </div> - <!-- - <div ng-show="scan_is_over == true"> - <p> - Voici les résultats obtenus : - </p> - <ul> - <li ng-repeat="addr_ip in ip_scanned">{{addr_ip.ip}}</li> - </ul> + +<body ng-controller="mainController"> + + <nav class="navbar navbar-inverse navbar-fixed-top"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="dashboard.html">Mum</a> + <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : {{stateNumber()[0]}}</a></p> + <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : {{stateNumber()[1]}}</a></p> + <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : {{stateNumber()[2]}}</a></p> + </div> + <div id="navbar" class="navbar-collapse collapse"> + <ul class="nav navbar-nav navbar-right"> + <li><a href="profile.html">Profile</a></li> + <li><a href="signin.html">Logout</a></li> + </ul> + </div> </div> - --> - </form> + </nav> + <div class="container-fluid"> + <div class="row"> + <div class="col-sm-3 col-md-2 sidebar"> + <ul class="nav nav-sidebar sidebar-fixed-left"> + <li><a href="#dashboard">Dashboard</a></li> + <li><a href="#scan">Scan for new machines</a></li> + <li><a href="#groups">Manage your groups</a></li> + <li><a href="#settings">Check the default settings</a></li> + <li><a href="#users">Users</a></li> + <li><a href="#notifications">Notification parameters</a></li> + <li><a href="#stats">See the statistics</a></li> + </ul> + </div> + -</div> + <div id="main"> + <div ng-view></div> + </div> + <!-- Bootstrap core JavaScript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="bower_components/jquery/dist/jquery.min.js"></script> + <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> </body> </html> + diff --git a/views/notifications.html b/views/notifications.html index 0cc69dd..6b25851 100644 --- a/views/notifications.html +++ b/views/notifications.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Notifications manager</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> -</head> - -<body> - -<nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> -</nav> - -<div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Who to notify?</h1> <!--<h2 class="sub-header">They will be applied on each new host you will add.</h2>--> @@ -237,11 +177,4 @@ </div> </div> </div> -<!-- Bootstrap core JavaScript -================================================== --> -<!-- Placed at the end of the document so the pages load faster --> -<script src="bower_components/jquery/dist/jquery.min.js"></script> -<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> -</body> -</html> diff --git a/views/profile.html b/views/profile.html index 32e370d..cf30c2a 100644 --- a/views/profile.html +++ b/views/profile.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Settings</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> -</head> - -<body> - -<nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> -</nav> - -<div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Your account</h1> <!--<h2 class="sub-header">They will be applied on each new host you will add.</h2>--> @@ -176,12 +116,3 @@ </div> </div> </div> - -<!-- Bootstrap core JavaScript -================================================== --> -<!-- Placed at the end of the document so the pages load faster --> -<script src="bower_components/jquery/dist/jquery.min.js"></script> -<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> -</body> -</html> - diff --git a/views/scan.html b/views/scan.html index 2ee59af..5c9ecdc 100644 --- a/views/scan.html +++ b/views/scan.html @@ -1,65 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : New scan</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - <link href="bower_components/angular-toastr/dist/angular-toastr.min.css" rel="stylesheet"/> - - <script src="bower_components/angular/angular.min.js"></script> - <script src="bower_components/angular-toastr/dist/angular-toastr.min.js"></script> - <script src="static/js/controllers/detectCtrl.js"></script> - </head> - - <body ng-app="detectModule" ng-controller="DetectController"> - - <nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> - </nav> - - <div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Scan for new machines</h1> <div ng-show="validated == false" class="ng-hide"> @@ -77,11 +16,3 @@ </div> </div> - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> - </body> -</html> - diff --git a/views/settings.html b/views/settings.html index 7e86be7..6ab4301 100644 --- a/views/settings.html +++ b/views/settings.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Settings</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/settings_ctrl.js"></script> - </head> - - <body ng-app="appSettings" ng-controller="ctrlSettings"> - - <nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> - </nav> - - <div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Configure the default settings</h1> <!--<h2 class="sub-header">They will be applied on each new host you will add.</h2>--> @@ -205,12 +145,3 @@ </div> </div> </div> - - <!-- Bootstrap core JavaScript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="bower_components/jquery/dist/jquery.min.js"></script> - <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> - </body> -</html> - diff --git a/views/stats.html b/views/stats.html index c93db8e..276f7df 100644 --- a/views/stats.html +++ b/views/stats.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Statistics</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> -</head> - -<body> - -<nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> -</nav> - -<div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"> <h1 class="page-header">Statistics</h1> @@ -85,13 +25,3 @@ </div> </div> </div> - </div> -</div> - -<!-- Bootstrap core JavaScript -================================================== --> -<!-- Placed at the end of the document so the pages load faster --> -<script src="bower_components/jquery/dist/jquery.min.js"></script> -<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> -</body> -</html> diff --git a/views/users.html b/views/users.html index aa17df7..10d7d23 100644 --- a/views/users.html +++ b/views/users.html @@ -1,64 +1,4 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content=""> - <meta name="author" content=""> - <link rel="icon" href="favicon.ico"> - <title>Mum : Users</title> - - <!-- Bootstrap core CSS --> - <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> - - <!-- Custom styles for this template --> - <link href="static/css/dashboard.css" rel="stylesheet"> - - <script src="bower_components/angular/angular.min.js"></script> - - <script src="static/js/controllers/table_ctrl.js"></script> -</head> - -<body> - -<nav class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="dashboard.html">Mum</a> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:green">OK : 4</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:orange">Warning : 2</a></p> - <p class="navbar-text navbar-left"><a href="dashboard.html" style="color:red">KO : 2</a></p> - </div> - <div id="navbar" class="navbar-collapse collapse"> - <ul class="nav navbar-nav navbar-right"> - <li><a href="profile.html">Profile</a></li> - <li><a href="signin.html">Logout</a></li> - </ul> - </div> - </div> -</nav> - -<div class="container-fluid"> - <div class="row"> - <div class="col-sm-3 col-md-2 sidebar"> - <ul class="nav nav-sidebar"> - <li><a href="dashboard.html">Dashboard</a></li> - <li><a href="scan.html">Scan for new machines</a></li> - <li><a href="groups.html">Manage your groups</a></li> - <li><a href="settings.html">Check the default settings</a></li> - <li><a href="users.html">Users</a></li> - <li><a href="notifications.html">Notification parameters</a></li> - <li><a href="stats.html">See the statistics</a></li> - </ul> - </div> <div class="col-md-offset-2 main"> <h1 class="page-header">Users</h1> <div class="row"> @@ -81,14 +21,3 @@ </div> </div> </div> - </div> -</div> - -<!-- Bootstrap core JavaScript -================================================== --> -<!-- Placed at the end of the document so the pages load faster --> -<script src="bower_components/jquery/dist/jquery.min.js"></script> -<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> -</body> -</html> - -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.