diff --git a/glances/outputs/static/js/app.js b/glances/outputs/static/js/app.js index fec5b431..1a41542b 100644 --- a/glances/outputs/static/js/app.js +++ b/glances/outputs/static/js/app.js @@ -1,22 +1,8 @@ var glancesApp = angular.module('glancesApp', ['ngRoute', 'glances.config', 'fps.hotkeys']) -.config(function($routeProvider, $locationProvider) { - $routeProvider.when('/', { - template : '', - controller : 'StatsController', - resolve: { - help: function(GlancesStats) { - return GlancesStats.getHelp(); - }, - config: function(GlancesStats) { - return GlancesStats.getConfig(); - }, - arguments: function(GlancesStats) { - return GlancesStats.getArguments(); - } - } - }); -}) +.value('CONFIG', {}) +.value('ARGUMENTS', {}) + .run(function($rootScope) { $rootScope.title = "Glances"; }); diff --git a/glances/outputs/static/js/components/glances/component.js b/glances/outputs/static/js/components/glances/component.js index b34cbbb8..0fd23c76 100644 --- a/glances/outputs/static/js/components/glances/component.js +++ b/glances/outputs/static/js/components/glances/component.js @@ -2,9 +2,6 @@ glancesApp.component('glances', { controller: GlancesController, - bindings: { - arguments: '<' - }, controllerAs: 'vm', templateUrl: 'components/glances/view.html' }); diff --git a/glances/outputs/static/js/components/glances/controller.js b/glances/outputs/static/js/components/glances/controller.js index 02405ea1..1ca7964e 100644 --- a/glances/outputs/static/js/components/glances/controller.js +++ b/glances/outputs/static/js/components/glances/controller.js @@ -1,29 +1,20 @@ 'use strict'; -function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys) { +function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys, ARGUMENTS) { var vm = this; - vm.dataLoaded = false; - - var refreshDataSuccess = function (data) { - data.isBsd = data.stats['system']['os_name'] === 'FreeBSD'; - data.isLinux = data.stats['system']['os_name'] === 'Linux'; - data.isMac = data.stats['system']['os_name'] === 'Darwin'; - data.isWindows = data.stats['system']['os_name'] === 'Windows'; - - $scope.$broadcast('data_refreshed', data); - vm.dataLoaded = true; - - nextLoad(); - }; - - var refreshDataError = function() { - $scope.$broadcast('is_disconnected'); - nextLoad(); - }; + vm.arguments = ARGUMENTS; vm.refreshData = function () { - GlancesStats.getData().then(refreshDataSuccess, refreshDataError); + GlancesStats.getData().then(function (data) { + $scope.$broadcast('data_refreshed', data); + vm.dataLoaded = true; + + nextLoad(); + }, function() { + $scope.$broadcast('is_disconnected'); + nextLoad(); + }); }; var loadPromise; diff --git a/glances/outputs/static/js/components/glances/view.html b/glances/outputs/static/js/components/glances/view.html index 7c05c9a5..6e48987f 100644 --- a/glances/outputs/static/js/components/glances/view.html +++ b/glances/outputs/static/js/components/glances/view.html @@ -14,7 +14,7 @@
- +
@@ -32,7 +32,7 @@
@@ -60,21 +60,21 @@
- + - - - - - - + + + + + +
- + - +
diff --git a/glances/outputs/static/js/components/help/component.js b/glances/outputs/static/js/components/help/component.js index 99efb39c..e773c38f 100644 --- a/glances/outputs/static/js/components/help/component.js +++ b/glances/outputs/static/js/components/help/component.js @@ -3,7 +3,5 @@ glancesApp.component('glancesHelp', { controller: GlancesHelpController, controllerAs: 'vm', - bindings: { - }, templateUrl: 'components/help/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-diskio/component.js b/glances/outputs/static/js/components/plugin-diskio/component.js index 512afd43..c6321545 100644 --- a/glances/outputs/static/js/components/plugin-diskio/component.js +++ b/glances/outputs/static/js/components/plugin-diskio/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginDiskio', { controller: GlancesPluginDiskioController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-diskio/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-diskio/controller.js b/glances/outputs/static/js/components/plugin-diskio/controller.js index aac714bb..948fe884 100644 --- a/glances/outputs/static/js/components/plugin-diskio/controller.js +++ b/glances/outputs/static/js/components/plugin-diskio/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginDiskioController($scope, $filter) { +function GlancesPluginDiskioController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.disks = []; diff --git a/glances/outputs/static/js/components/plugin-fs/component.js b/glances/outputs/static/js/components/plugin-fs/component.js index b6f50226..424ffe1d 100644 --- a/glances/outputs/static/js/components/plugin-fs/component.js +++ b/glances/outputs/static/js/components/plugin-fs/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginFs', { controller: GlancesPluginFsController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-fs/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-fs/controller.js b/glances/outputs/static/js/components/plugin-fs/controller.js index a36833da..e4b26b3c 100644 --- a/glances/outputs/static/js/components/plugin-fs/controller.js +++ b/glances/outputs/static/js/components/plugin-fs/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginFsController($scope, $filter) { +function GlancesPluginFsController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; var _view = {}; vm.fileSystems = []; diff --git a/glances/outputs/static/js/components/plugin-ip/component.js b/glances/outputs/static/js/components/plugin-ip/component.js index cf32d641..552c9461 100644 --- a/glances/outputs/static/js/components/plugin-ip/component.js +++ b/glances/outputs/static/js/components/plugin-ip/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginIp', { controller: GlancesPluginIpController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-ip/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-ip/controller.js b/glances/outputs/static/js/components/plugin-ip/controller.js index a6a72ec2..3e03e3ea 100644 --- a/glances/outputs/static/js/components/plugin-ip/controller.js +++ b/glances/outputs/static/js/components/plugin-ip/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginIpController($scope) { +function GlancesPluginIpController($scope, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.address = null; vm.gateway = null; diff --git a/glances/outputs/static/js/components/plugin-network/component.js b/glances/outputs/static/js/components/plugin-network/component.js index f4935efb..7eb87184 100644 --- a/glances/outputs/static/js/components/plugin-network/component.js +++ b/glances/outputs/static/js/components/plugin-network/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginNetwork', { controller: GlancesPluginNetworkController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-network/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-network/controller.js b/glances/outputs/static/js/components/plugin-network/controller.js index 5f1e164a..6ce597dd 100644 --- a/glances/outputs/static/js/components/plugin-network/controller.js +++ b/glances/outputs/static/js/components/plugin-network/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginNetworkController($scope, $filter) { +function GlancesPluginNetworkController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.networks = []; diff --git a/glances/outputs/static/js/components/plugin-process/component.js b/glances/outputs/static/js/components/plugin-process/component.js index df8c73d1..90606d70 100644 --- a/glances/outputs/static/js/components/plugin-process/component.js +++ b/glances/outputs/static/js/components/plugin-process/component.js @@ -3,9 +3,5 @@ glancesApp.component('glancesPluginProcess', { controller: GlancesPluginProcessController, controllerAs: 'vm', - bindings: { - stats: '<', - arguments: '<' - }, templateUrl: 'components/plugin-process/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-process/controller.js b/glances/outputs/static/js/components/plugin-process/controller.js index 34f83625..b04b1d90 100644 --- a/glances/outputs/static/js/components/plugin-process/controller.js +++ b/glances/outputs/static/js/components/plugin-process/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginProcessController() { +function GlancesPluginProcessController(ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.sorter = { column: "cpu_percent", diff --git a/glances/outputs/static/js/components/plugin-process/view.html b/glances/outputs/static/js/components/plugin-process/view.html index 4f4a99a4..f5d82cc3 100644 --- a/glances/outputs/static/js/components/plugin-process/view.html +++ b/glances/outputs/static/js/components/plugin-process/view.html @@ -1,6 +1,6 @@
- - + +
PROCESSES DISABLED (press 'z' to display)
diff --git a/glances/outputs/static/js/components/plugin-processlist/component.js b/glances/outputs/static/js/components/plugin-processlist/component.js index 0992ff5e..e633659f 100644 --- a/glances/outputs/static/js/components/plugin-processlist/component.js +++ b/glances/outputs/static/js/components/plugin-processlist/component.js @@ -4,7 +4,6 @@ glancesApp.component('glancesPluginProcesslist', { controller: GlancesPluginProcesslistController, controllerAs: 'vm', bindings: { - arguments: '<', sorter: '<' }, templateUrl: 'components/plugin-processlist/view.html' diff --git a/glances/outputs/static/js/components/plugin-processlist/controller.js b/glances/outputs/static/js/components/plugin-processlist/controller.js index b0f31ca5..262ca108 100644 --- a/glances/outputs/static/js/components/plugin-processlist/controller.js +++ b/glances/outputs/static/js/components/plugin-processlist/controller.js @@ -1,16 +1,12 @@ 'use strict'; -function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter, GlancesStats) { +function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter, CONFIG, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; - var _maxProcessesToDisplay = undefined; vm.processes = []; vm.ioReadWritePresent = false; - GlancesStats.getConfig().then(function(config) { - _maxProcessesToDisplay = config.outputs !== undefined ? config.outputs.max_processes_display : undefined; - }); - $scope.$on('data_refreshed', function(event, data) { var processlistStats = data.stats['processlist']; @@ -63,6 +59,6 @@ function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter }; vm.getLimit = function() { - return _maxProcessesToDisplay; + return CONFIG.outputs !== undefined ? CONFIG.outputs.max_processes_display : undefined; }; } diff --git a/glances/outputs/static/js/components/plugin-quicklook/component.js b/glances/outputs/static/js/components/plugin-quicklook/component.js index e1d029f8..7962a959 100644 --- a/glances/outputs/static/js/components/plugin-quicklook/component.js +++ b/glances/outputs/static/js/components/plugin-quicklook/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginQuicklook', { controller: GlancesPluginQuicklookController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-quicklook/view.html' }); diff --git a/glances/outputs/static/js/components/plugin-quicklook/controller.js b/glances/outputs/static/js/components/plugin-quicklook/controller.js index 73dfa2fd..6c94b349 100644 --- a/glances/outputs/static/js/components/plugin-quicklook/controller.js +++ b/glances/outputs/static/js/components/plugin-quicklook/controller.js @@ -1,7 +1,8 @@ 'use strict'; -function GlancesPluginQuicklookController($scope) { +function GlancesPluginQuicklookController($scope, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; var _view = {}; vm.mem = null; diff --git a/glances/outputs/static/js/components/plugin-system/component.js b/glances/outputs/static/js/components/plugin-system/component.js index 20abf551..75209120 100644 --- a/glances/outputs/static/js/components/plugin-system/component.js +++ b/glances/outputs/static/js/components/plugin-system/component.js @@ -3,8 +3,5 @@ glancesApp.component('glancesPluginSystem', { controller: GlancesPluginSystemController, controllerAs: 'vm', - bindings: { - isDisconnected: '<' - }, templateUrl: 'components/plugin-system/view.html' }); diff --git a/glances/outputs/static/js/controllers.js b/glances/outputs/static/js/controllers.js deleted file mode 100644 index 79a9c2df..00000000 --- a/glances/outputs/static/js/controllers.js +++ /dev/null @@ -1,5 +0,0 @@ -glancesApp.controller('StatsController', function ($scope, help, config, arguments) { - $scope.help = help; - $scope.config = config; - $scope.arguments = arguments; -}); diff --git a/glances/outputs/static/js/services/stats.js b/glances/outputs/static/js/services/stats.js index 31a354a8..0227909a 100644 --- a/glances/outputs/static/js/services/stats.js +++ b/glances/outputs/static/js/services/stats.js @@ -1,6 +1,4 @@ -glancesApp.service('GlancesStats', function($http, $q, GlancesPluginHelper) { - - var _config; +glancesApp.service('GlancesStats', function($http, $q, GlancesPluginHelper, CONFIG, ARGUMENTS) { this.getData = function() { return $q.all([ @@ -9,7 +7,11 @@ glancesApp.service('GlancesStats', function($http, $q, GlancesPluginHelper) { ]).then(function(results) { return { 'stats': results[0], - 'view': results[1] + 'view': results[1], + 'isBsd': results[0]['system']['os_name'] === 'FreeBSD', + 'isLinux': results[0]['system']['os_name'] === 'Linux', + 'isMac': results[0]['system']['os_name'] === 'Darwin', + 'isWindows': results[0]['system']['os_name'] === 'Windows' }; }); }; @@ -20,12 +22,6 @@ glancesApp.service('GlancesStats', function($http, $q, GlancesPluginHelper) { }); }; - this.getAllLimits = function() { - return $http.get('api/2/all/limits').then(function (response) { - return response.data; - }); - }; - this.getAllViews = function() { return $http.get('api/2/all/views').then(function (response) { return response.data; @@ -38,30 +34,15 @@ glancesApp.service('GlancesStats', function($http, $q, GlancesPluginHelper) { }); }; - this.getConfig = function() { - if (!_config) { - return $http.get('api/2/config').then(function (response) { - _config = response.data; - - return response.data; - }); - } - - var deferrer = $q.defer(); - deferrer.resolve(_config); - - return deferrer.promise; - }; - - this.getArguments = function() { - return $http.get('api/2/args').then(function (response) { - return response.data; - }); - }; - // load limits to init GlancePlugin helper - this.getAllLimits().then(function(limits) { - GlancesPluginHelper.setLimits(limits); + $http.get('api/2/all/limits').then(function (response) { + GlancesPluginHelper.setLimits(response.data); + }); + $http.get('api/2/config').then(function (response) { + angular.extend(CONFIG, response.data); + }); + $http.get('api/2/args').then(function (response) { + angular.extend(ARGUMENTS, response.data); }); -}); \ No newline at end of file +}); diff --git a/glances/outputs/static/public/js/main.min.js b/glances/outputs/static/public/js/main.min.js index e749be28..01aede4d 100644 --- a/glances/outputs/static/public/js/main.min.js +++ b/glances/outputs/static/public/js/main.min.js @@ -1,32 +1,12 @@ var glancesApp = angular.module('glancesApp', ['ngRoute', 'glances.config', 'fps.hotkeys']) -.config(["$routeProvider", "$locationProvider", function($routeProvider, $locationProvider) { - $routeProvider.when('/', { - template : '', - controller : 'StatsController', - resolve: { - help: ["GlancesStats", function(GlancesStats) { - return GlancesStats.getHelp(); - }], - config: ["GlancesStats", function(GlancesStats) { - return GlancesStats.getConfig(); - }], - arguments: ["GlancesStats", function(GlancesStats) { - return GlancesStats.getArguments(); - }] - } - }); -}]) +.value('CONFIG', {}) +.value('ARGUMENTS', {}) + .run(["$rootScope", function($rootScope) { $rootScope.title = "Glances"; }]); -glancesApp.controller('StatsController', ["$scope", "help", "config", "arguments", function ($scope, help, config, arguments) { - $scope.help = help; - $scope.config = config; - $scope.arguments = arguments; -}]); - glancesApp.directive("sortableTh", function() { return { restrict: 'A', @@ -235,9 +215,7 @@ glancesApp.service('GlancesPluginHelper', function () { return plugin; }); -glancesApp.service('GlancesStats', ["$http", "$q", "GlancesPluginHelper", function($http, $q, GlancesPluginHelper) { - - var _config; +glancesApp.service('GlancesStats', ["$http", "$q", "GlancesPluginHelper", "CONFIG", "ARGUMENTS", function($http, $q, GlancesPluginHelper, CONFIG, ARGUMENTS) { this.getData = function() { return $q.all([ @@ -246,7 +224,11 @@ glancesApp.service('GlancesStats', ["$http", "$q", "GlancesPluginHelper", functi ]).then(function(results) { return { 'stats': results[0], - 'view': results[1] + 'view': results[1], + 'isBsd': results[0]['system']['os_name'] === 'FreeBSD', + 'isLinux': results[0]['system']['os_name'] === 'Linux', + 'isMac': results[0]['system']['os_name'] === 'Darwin', + 'isWindows': results[0]['system']['os_name'] === 'Windows' }; }); }; @@ -257,12 +239,6 @@ glancesApp.service('GlancesStats', ["$http", "$q", "GlancesPluginHelper", functi }); }; - this.getAllLimits = function() { - return $http.get('api/2/all/limits').then(function (response) { - return response.data; - }); - }; - this.getAllViews = function() { return $http.get('api/2/all/views').then(function (response) { return response.data; @@ -275,70 +251,44 @@ glancesApp.service('GlancesStats', ["$http", "$q", "GlancesPluginHelper", functi }); }; - this.getConfig = function() { - if (!_config) { - return $http.get('api/2/config').then(function (response) { - _config = response.data; - - return response.data; - }); - } - - var deferrer = $q.defer(); - deferrer.resolve(_config); - - return deferrer.promise; - }; - - this.getArguments = function() { - return $http.get('api/2/args').then(function (response) { - return response.data; - }); - }; - // load limits to init GlancePlugin helper - this.getAllLimits().then(function(limits) { - GlancesPluginHelper.setLimits(limits); + $http.get('api/2/all/limits').then(function (response) { + GlancesPluginHelper.setLimits(response.data); + }); + $http.get('api/2/config').then(function (response) { + angular.extend(CONFIG, response.data); + }); + $http.get('api/2/args').then(function (response) { + angular.extend(ARGUMENTS, response.data); }); }]); + 'use strict'; glancesApp.component('glances', { controller: GlancesController, - bindings: { - arguments: '<' - }, controllerAs: 'vm', templateUrl: 'components/glances/view.html' }); 'use strict'; -function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys) { +function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys, ARGUMENTS) { var vm = this; - vm.dataLoaded = false; - - var refreshDataSuccess = function (data) { - data.isBsd = data.stats['system']['os_name'] === 'FreeBSD'; - data.isLinux = data.stats['system']['os_name'] === 'Linux'; - data.isMac = data.stats['system']['os_name'] === 'Darwin'; - data.isWindows = data.stats['system']['os_name'] === 'Windows'; - - $scope.$broadcast('data_refreshed', data); - vm.dataLoaded = true; - - nextLoad(); - }; - - var refreshDataError = function() { - $scope.$broadcast('is_disconnected'); - nextLoad(); - }; + vm.arguments = ARGUMENTS; vm.refreshData = function () { - GlancesStats.getData().then(refreshDataSuccess, refreshDataError); + GlancesStats.getData().then(function (data) { + $scope.$broadcast('data_refreshed', data); + vm.dataLoaded = true; + + nextLoad(); + }, function() { + $scope.$broadcast('is_disconnected'); + nextLoad(); + }); }; var loadPromise; @@ -366,8 +316,6 @@ function GlancesController($scope, $timeout, GlancesStats, REFRESH_TIME, Hotkeys glancesApp.component('glancesHelp', { controller: GlancesHelpController, controllerAs: 'vm', - bindings: { - }, templateUrl: 'components/help/view.html' }); @@ -553,16 +501,14 @@ function GlancesPluginCpuController($scope) { glancesApp.component('glancesPluginDiskio', { controller: GlancesPluginDiskioController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-diskio/view.html' }); 'use strict'; -function GlancesPluginDiskioController($scope, $filter) { +function GlancesPluginDiskioController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.disks = []; @@ -596,16 +542,14 @@ function GlancesPluginDiskioController($scope, $filter) { glancesApp.component('glancesPluginFs', { controller: GlancesPluginFsController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-fs/view.html' }); 'use strict'; -function GlancesPluginFsController($scope, $filter) { +function GlancesPluginFsController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; var _view = {}; vm.fileSystems = []; @@ -648,6 +592,37 @@ function GlancesPluginFsController($scope, $filter) { 'use strict'; +glancesApp.component('glancesPluginIp', { + controller: GlancesPluginIpController, + controllerAs: 'vm', + templateUrl: 'components/plugin-ip/view.html' +}); + +'use strict'; + +function GlancesPluginIpController($scope, ARGUMENTS) { + var vm = this; + vm.arguments = ARGUMENTS; + + vm.address = null; + vm.gateway = null; + vm.mask = null; + vm.maskCidr = null; + vm.publicAddress = null; + + $scope.$on('data_refreshed', function(event, data) { + var ipStats = data.stats['ip']; + + vm.address = ipStats.address; + vm.gateway = ipStats.gateway; + vm.mask = ipStats.mask; + vm.maskCidr = ipStats.mask_cidr; + vm.publicAddress = ipStats.public_address + }); +} + +'use strict'; + glancesApp.component('glancesPluginLoad', { controller: GlancesPluginLoadController, controllerAs: 'vm', @@ -724,39 +699,6 @@ function GlancesPluginMemController($scope) { 'use strict'; -glancesApp.component('glancesPluginIp', { - controller: GlancesPluginIpController, - controllerAs: 'vm', - bindings: { - arguments: '<' - }, - templateUrl: 'components/plugin-ip/view.html' -}); - -'use strict'; - -function GlancesPluginIpController($scope) { - var vm = this; - - vm.address = null; - vm.gateway = null; - vm.mask = null; - vm.maskCidr = null; - vm.publicAddress = null; - - $scope.$on('data_refreshed', function(event, data) { - var ipStats = data.stats['ip']; - - vm.address = ipStats.address; - vm.gateway = ipStats.gateway; - vm.mask = ipStats.mask; - vm.maskCidr = ipStats.mask_cidr; - vm.publicAddress = ipStats.public_address - }); -} - -'use strict'; - glancesApp.component('glancesPluginMemMore', { controller: GlancesPluginMemMoreController, controllerAs: 'vm', @@ -785,19 +727,55 @@ function GlancesPluginMemMoreController($scope) { 'use strict'; +glancesApp.component('glancesPluginMemswap', { + controller: GlancesPluginMemswapController, + controllerAs: 'vm', + templateUrl: 'components/plugin-memswap/view.html' +}); + +'use strict'; + +function GlancesPluginMemswapController($scope) { + var vm = this; + var _view = {}; + + vm.percent = null; + vm.total = null; + vm.used = null; + vm.free = null; + + $scope.$on('data_refreshed', function(event, data) { + var stats = data.stats['memswap']; + _view = data.view['memswap']; + + vm.percent = stats['percent']; + vm.total = stats['total']; + vm.used = stats['used']; + vm.free = stats['free']; + }); + + this.getDecoration = function (value) { + if (_view[value] === undefined) { + return; + } + + return _view[value].decoration.toLowerCase(); + }; +} + +'use strict'; + glancesApp.component('glancesPluginNetwork', { controller: GlancesPluginNetworkController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-network/view.html' }); 'use strict'; -function GlancesPluginNetworkController($scope, $filter) { +function GlancesPluginNetworkController($scope, $filter, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.networks = []; @@ -914,17 +892,14 @@ function GlancesPluginPortsController($scope) { glancesApp.component('glancesPluginProcess', { controller: GlancesPluginProcessController, controllerAs: 'vm', - bindings: { - stats: '<', - arguments: '<' - }, templateUrl: 'components/plugin-process/view.html' }); 'use strict'; -function GlancesPluginProcessController() { +function GlancesPluginProcessController(ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; vm.sorter = { column: "cpu_percent", @@ -981,7 +956,6 @@ glancesApp.component('glancesPluginProcesslist', { controller: GlancesPluginProcesslistController, controllerAs: 'vm', bindings: { - arguments: '<', sorter: '<' }, templateUrl: 'components/plugin-processlist/view.html' @@ -989,17 +963,13 @@ glancesApp.component('glancesPluginProcesslist', { 'use strict'; -function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter, GlancesStats) { +function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter, CONFIG, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; - var _maxProcessesToDisplay = undefined; vm.processes = []; vm.ioReadWritePresent = false; - GlancesStats.getConfig().then(function(config) { - _maxProcessesToDisplay = config.outputs !== undefined ? config.outputs.max_processes_display : undefined; - }); - $scope.$on('data_refreshed', function(event, data) { var processlistStats = data.stats['processlist']; @@ -1052,7 +1022,7 @@ function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter }; vm.getLimit = function() { - return _maxProcessesToDisplay; + return CONFIG.outputs !== undefined ? CONFIG.outputs.max_processes_display : undefined; }; } @@ -1061,16 +1031,14 @@ function GlancesPluginProcesslistController($scope, GlancesPluginHelper, $filter glancesApp.component('glancesPluginQuicklook', { controller: GlancesPluginQuicklookController, controllerAs: 'vm', - bindings: { - arguments: '<' - }, templateUrl: 'components/plugin-quicklook/view.html' }); 'use strict'; -function GlancesPluginQuicklookController($scope) { +function GlancesPluginQuicklookController($scope, ARGUMENTS) { var vm = this; + vm.arguments = ARGUMENTS; var _view = {}; vm.mem = null; @@ -1115,9 +1083,6 @@ function GlancesPluginQuicklookController($scope) { glancesApp.component('glancesPluginSystem', { controller: GlancesPluginSystemController, controllerAs: 'vm', - bindings: { - isDisconnected: '<' - }, templateUrl: 'components/plugin-system/view.html' }); @@ -1152,6 +1117,25 @@ function GlancesPluginSystemController($scope) { 'use strict'; +glancesApp.component('glancesPluginUptime', { + controller: GlancesPluginUptimeController, + controllerAs: 'vm', + templateUrl: 'components/plugin-uptime/view.html' +}); + +'use strict'; + +function GlancesPluginUptimeController($scope) { + var vm = this; + vm.value = null; + + $scope.$on('data_refreshed', function(event, data) { + vm.value = data.stats['uptime']; + }); +} + +'use strict'; + glancesApp.component('glancesPluginWifi', { controller: GlancesPluginWifiController, controllerAs: 'vm', @@ -1197,60 +1181,3 @@ function GlancesPluginWifiController($scope, $filter) { return _view[hotpost.ssid][field].decoration.toLowerCase(); }; } - -'use strict'; - -glancesApp.component('glancesPluginUptime', { - controller: GlancesPluginUptimeController, - controllerAs: 'vm', - templateUrl: 'components/plugin-uptime/view.html' -}); - -'use strict'; - -function GlancesPluginUptimeController($scope) { - var vm = this; - vm.value = null; - - $scope.$on('data_refreshed', function(event, data) { - vm.value = data.stats['uptime']; - }); -} - -'use strict'; - -glancesApp.component('glancesPluginMemswap', { - controller: GlancesPluginMemswapController, - controllerAs: 'vm', - templateUrl: 'components/plugin-memswap/view.html' -}); - -'use strict'; - -function GlancesPluginMemswapController($scope) { - var vm = this; - var _view = {}; - - vm.percent = null; - vm.total = null; - vm.used = null; - vm.free = null; - - $scope.$on('data_refreshed', function(event, data) { - var stats = data.stats['memswap']; - _view = data.view['memswap']; - - vm.percent = stats['percent']; - vm.total = stats['total']; - vm.used = stats['used']; - vm.free = stats['free']; - }); - - this.getDecoration = function (value) { - if (_view[value] === undefined) { - return; - } - - return _view[value].decoration.toLowerCase(); - }; -} diff --git a/glances/outputs/static/public/js/templates.min.js b/glances/outputs/static/public/js/templates.min.js index 11022c5b..2f36b3b6 100644 --- a/glances/outputs/static/public/js/templates.min.js +++ b/glances/outputs/static/public/js/templates.min.js @@ -1,22 +1,22 @@ -angular.module('glancesApp').run(['$templateCache', function($templateCache) {$templateCache.put('components/glances/view.html','
\n
\n \n
Loading...
\n
\n\n \n\n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n\n
\n \n
\n \n
\n
\n \n
\n \n
\n \n
\n \n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n \n \n \n \n \n \n \n \n
\n
\n
\n \n \n \n
\n
\n
\n
\n
\n'); +angular.module('glancesApp').run(['$templateCache', function($templateCache) {$templateCache.put('components/glances/view.html','
\n
\n \n
Loading...
\n
\n\n \n\n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n\n
\n \n
\n \n
\n
\n \n
\n \n
\n \n
\n \n
\n \n
\n
\n \n
\n
\n
\n
\n
\n \n \n \n \n \n \n \n \n \n
\n
\n
\n \n \n \n
\n
\n
\n
\n
\n'); $templateCache.put('components/help/view.html','
\n
\n
{{vm.help.version}} {{vm.help.psutil_version}}
\n
\n
 
\n
\n
{{vm.help.configuration_file}}
\n
\n
 
\n
\n
{{vm.help.sort_auto}}
\n
{{vm.help.sort_network}}
\n
\n
\n
{{vm.help.sort_cpu}}
\n
{{vm.help.show_hide_alert}}
\n
\n
\n
{{vm.help.sort_mem}}
\n
{{vm.help.percpu}}
\n
\n
\n
{{vm.help.sort_user}}
\n
{{vm.help.show_hide_ip}}
\n
\n
\n
{{vm.help.sort_proc}}
\n
{{vm.help.enable_disable_docker}}
\n
\n
\n
{{vm.help.sort_io}}
\n
{{vm.help.view_network_io_combination}}
\n
\n
\n
{{vm.help.sort_cpu_times}}
\n
{{vm.help.view_cumulative_network}}
\n
\n
\n
{{vm.help.show_hide_diskio}}
\n
{{vm.help.show_hide_filesytem_freespace}}
\n
\n
\n
{{vm.help.show_hide_filesystem}}
\n
{{vm.help.show_hide_vm.help}}
\n
\n
\n
{{vm.help.show_hide_network}}
\n
{{vm.help.diskio_iops}}
\n
\n
\n
{{vm.help.show_hide_sensors}}
\n
{{vm.help.show_hide_top_menu}}
\n
\n
\n
{{vm.help.show_hide_left_sidebar}}
\n
{{vm.help.show_hide_amp}}
\n
\n
\n
{{vm.help.enable_disable_process_stats}}
\n
{{vm.help.show_hide_irq}}
\n
\n
\n
{{vm.help.enable_disable_gpu}}
\n
{{vm.help.enable_disable_mean_gpu}}
\n
\n
\n
{{vm.help.enable_disable_quick_look}}
\n
\n
\n
\n
{{vm.help.enable_disable_short_processname}}
\n
\n
\n
\n
{{vm.help.enable_disable_ports}}
\n
\n
\n\n
\n'); $templateCache.put('components/plugin-alert/view.html','
\n No warning or critical alert detected\n Warning or critical alerts (lasts {{vm.count()}} entries)\n
\n
\n
\n
\n
\n {{alert.begin | date : \'yyyy-MM-dd H:mm:ss\'}} ({{ alert.ongoing ? \'ongoing\' : alert.duration }}) - {{alert.level}} on {{alert.name}} ({{alert.max}})\n
\n
\n
\n
\n'); $templateCache.put('components/plugin-cloud/view.html','
\n {{ vm.provider }} {{ vm.instance }}\n
\n'); $templateCache.put('components/plugin-cpu/view.html','
\n
\n
\n
\n
\n
CPU
\n
{{ vm.total }}%
\n
\n
\n
user:
\n
\n {{ vm.user }}%\n
\n
\n
\n
system:
\n
\n {{ vm.system }}%\n
\n
\n
\n
idle:
\n
{{ vm.idle }}%
\n
\n
\n
\n \n \n
\n
\n'); $templateCache.put('components/plugin-diskio/view.html','
\n
DISK I/O
\n
R/s
\n
W/s
\n\n
IOR/s
\n
IOW/s
\n
\n
\n
{{(disk.alias ? disk.alias : disk.name) | min_size}}
\n
{{disk.bitrate.txps }}
\n
{{disk.bitrate.rxps }}
\n\n
{{disk.count.txps }}
\n
{{disk.count.rxps }}
\n
\n'); $templateCache.put('components/plugin-fs/view.html','
\n
FILE SYS
\n
\n Used\n Free\n
\n
Total
\n
\n
\n
{{ fs.shortMountPoint }} ({{ fs.name }})
\n
\n {{ fs.used | bytes }}\n {{ fs.free | bytes }}\n
\n
{{ fs.size | bytes }}
\n
\n'); +$templateCache.put('components/plugin-ip/view.html','
\n  - IP {{ vm.address }}/{{ vm.maskCidr }} Pub {{ vm.publicAddress }}\n
\n'); $templateCache.put('components/plugin-load/view.html','
\n
\n
\n
LOAD
\n
{{ vm.cpucore }}-core
\n
\n
\n
1 min:
\n
\n {{ vm.min1 | number : 2}}\n
\n
\n
\n
5 min:
\n
\n {{ vm.min5 | number : 2}}\n
\n
\n
\n
15 min:
\n
\n {{ vm.min15 | number : 2}}\n
\n
\n
\n
\n'); $templateCache.put('components/plugin-mem/view.html','
\n
\n
\n
MEM
\n
{{ vm.percent }}%
\n
\n
\n
total:
\n
{{ vm.total | bytes }}
\n
\n
\n
used:
\n
\n {{ vm.used | bytes:2 }}\n
\n
\n
\n
free:
\n
{{ vm.free | bytes }}
\n
\n
\n
\n'); -$templateCache.put('components/plugin-ip/view.html','
\n  - IP {{ vm.address }}/{{ vm.maskCidr }} Pub {{ vm.publicAddress }}\n
\n'); $templateCache.put('components/plugin-mem-more/view.html','
\n
\n
\n
active:
\n
{{ vm.active | bytes }}
\n
\n
\n
inactive:
\n
{{ vm.inactive | bytes }}
\n
\n
\n
buffers:
\n
{{ vm.buffers | bytes }}
\n
\n
\n
cached:
\n
{{ vm.cached | bytes }}
\n
\n
\n
\n'); +$templateCache.put('components/plugin-memswap/view.html','
\n
\n
\n
SWAP
\n
{{ vm.percent }}%
\n
\n
\n
total:
\n
{{ vm.total | bytes }}
\n
\n
\n
used:
\n
\n {{ vm.used | bytes }}\n
\n
\n
\n
free:
\n
{{ vm.free | bytes }}
\n
\n
\n
\n'); $templateCache.put('components/plugin-network/view.html','
\n
NETWORK
\n
Rx/s
\n
Tx/s
\n\n
\n
Rx+Tx/s
\n\n
Rx
\n
Tx
\n\n
\n
Rx+Tx
\n
\n
\n
{{ network.interfaceName | min_size }}
\n
{{ vm.arguments.byte ? (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}
\n
{{ vm.arguments.byte ? (network.tx / network.time_since_update | bytes) : (network.tx / network.time_since_update | bits) }}
\n\n
\n
{{ vm.arguments.byte ? (network.cx / network.time_since_update | bytes) : (network.cx / network.time_since_update | bits) }}
\n\n
{{ vm.arguments.byte ? (network.cumulativeRx | bytes) : (network.cumulativeRx | bits) }}
\n
{{ vm.arguments.byte ? (network.cumulativeTx | bytes) : (network.cumulativeTx | bits) }}
\n\n
\n
{{ vm.arguments.byte ? (network.cumulativeCx | bytes) : (network.cumulativeCx | bits) }}
\n
\n'); $templateCache.put('components/plugin-percpu/view.html','
\n
\n
\n
PER CPU
\n
{{ percpu.total }}%
\n
\n
\n
user:
\n
\n {{ percpu.user }}%\n
\n
\n
\n
system:
\n
\n {{ percpu.system }}%\n
\n
\n
\n
idle:
\n
{{ percpu.idle }}%
\n
\n
\n
iowait:
\n
\n {{ percpu.iowait }}%\n
\n
\n
\n
steal:
\n
\n {{ percpu.steal }}%\n
\n
\n
\n
\n'); $templateCache.put('components/plugin-ports/view.html','
\n
{{(port.description ? port.description : port.host + \' \' + port.port) | min_size: 20}}
\n
\n
\n Scanning\n Timeout\n Open\n {{port.status * 1000.0 | number:0}}ms\n
\n
'); -$templateCache.put('components/plugin-process/view.html','
\n \n \n \n
\n
PROCESSES DISABLED (press \'z\' to display)
\n'); +$templateCache.put('components/plugin-process/view.html','
\n \n \n \n
\n
PROCESSES DISABLED (press \'z\' to display)
\n'); $templateCache.put('components/plugin-processcount/view.html','
\n TASKS\n {{ vm.total }} ({{ vm.thread }} thr),\n {{ vm.running }} run,\n {{ vm.sleeping }} slp,\n {{ vm.stopped }} oth\n sorted {{ vm.sorter.auto ? \'automatically\' : \'\' }} by {{ vm.sorter.getColumnLabel(vm.sorter.column) }}, flat view\n
'); $templateCache.put('components/plugin-processlist/view.html','
\n
\n
\n
CPU%
\n
MEM%
\n \n \n
PID
\n
USER
\n
NI
\n
S
\n \n \n \n
Command
\n
\n
\n
{{process.cpu_percent | number:1}}
\n
{{process.memory_percent | number:1}}
\n \n \n
{{process.pid}}
\n
{{process.username}}
\n
{{process.nice | exclamation}}
\n
{{process.status}}
\n \n \n \n
{{process.name}}
\n
{{process.cmdline}}
\n
\n
\n
\n'); $templateCache.put('components/plugin-quicklook/view.html','
\n
\n {{ vm.cpu_name }}\n
\n
\n
\n
CPU
\n
\n
\n
\n  \n
\n
\n
\n
\n {{ vm.cpu }}%\n
\n
\n
\n
CPU{{ percpu.number }}
\n
\n
\n
\n  \n
\n
\n
\n
\n {{ percpu.total }}%\n
\n
\n
\n
MEM
\n
\n
\n
\n  \n
\n
\n
\n
\n {{ vm.mem }}%\n
\n
\n
\n
SWAP
\n
\n
\n
\n  \n
\n
\n
\n
\n {{ vm.swap }}%\n
\n
\n
\n
\n'); $templateCache.put('components/plugin-system/view.html','
\n Disconnected from\n {{ vm.hostname }}\n \n \n
\n'); -$templateCache.put('components/plugin-wifi/view.html','
\n
\n
WIFI
\n
\n
dBm
\n
\n
\n
{{ hotspot.ssid|limitTo:20 }} {{ hotspot.encryption_type }}
\n
\n
{{ hotspot.signal }}
\n
\n
\n'); $templateCache.put('components/plugin-uptime/view.html','
\n Uptime: {{ vm.value }}\n
\n'); -$templateCache.put('components/plugin-memswap/view.html','
\n
\n
\n
SWAP
\n
{{ vm.percent }}%
\n
\n
\n
total:
\n
{{ vm.total | bytes }}
\n
\n
\n
used:
\n
\n {{ vm.used | bytes }}\n
\n
\n
\n
free:
\n
{{ vm.free | bytes }}
\n
\n
\n
\n');}]); \ No newline at end of file +$templateCache.put('components/plugin-wifi/view.html','
\n
\n
WIFI
\n
\n
dBm
\n
\n
\n
{{ hotspot.ssid|limitTo:20 }} {{ hotspot.encryption_type }}
\n
\n
{{ hotspot.signal }}
\n
\n
\n');}]); \ No newline at end of file diff --git a/glances/outputs/static/templates/index.html.tpl b/glances/outputs/static/templates/index.html.tpl index c3e46390..06c11a18 100644 --- a/glances/outputs/static/templates/index.html.tpl +++ b/glances/outputs/static/templates/index.html.tpl @@ -21,7 +21,7 @@ - - + +