diff options
| author | Nicolas Hennion <nicolashennion@gmail.com> | 2015-09-08 22:48:38 +0200 |
|---|---|---|
| committer | Nicolas Hennion <nicolashennion@gmail.com> | 2015-09-08 22:48:38 +0200 |
| commit | 9c80e05f3c4085620ec290db346abafb3978d85a (patch) | |
| tree | a8d248b3195330a6e5f64499b13b1ce5872cde88 | |
| parent | dd7911f0b022bafb7399f8998bac887c9a910bdf (diff) | |
| parent | 04033e1c001d14c869f5cf7a062847ecf03b85e0 (diff) | |
Merge pull request #669 from notFloran/webui-disable-quick-look-and-process-message
[WebUI] disable quick look and message when processes stats is disable
| -rw-r--r-- | glances/outputs/static/html/help.html | 4 | ||||
| -rw-r--r-- | glances/outputs/static/html/stats.html | 3 | ||||
| -rw-r--r-- | glances/outputs/static/js/stats_controller.js | 5 | ||||
| -rw-r--r-- | glances/outputs/static/js/variables.js | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/glances/outputs/static/html/help.html b/glances/outputs/static/html/help.html index 0f76911e..5919ba16 100644 --- a/glances/outputs/static/html/help.html +++ b/glances/outputs/static/html/help.html @@ -59,6 +59,10 @@ <div class="col-sm-12 col-lg-6"></div> </div> <div class="row"> + <div class="col-sm-12 col-lg-6">{{help.enable_disable_quick_look}}</div> + <div class="col-sm-12 col-lg-6"></div> +</div> +<div class="row"> <div class="col-sm-12 col-lg-6">{{help.enable_disable_short_processname}}</div> <div class="col-sm-12 col-lg-6"></div> </div> diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html index c29c602f..03c413ea 100644 --- a/glances/outputs/static/html/stats.html +++ b/glances/outputs/static/html/stats.html @@ -20,7 +20,7 @@ </div> </div> <div class="row"> - <div class="hidden-xs hidden-sm hidden-md col-lg-6"> + <div class="hidden-xs hidden-sm hidden-md col-lg-6" ng-show="show.quick_look"> <section id="quicklook" class="plugin" ng-include src="'plugins/quicklook.html'"></section> </div> <div class="col-sm-6 col-md-4 col-lg-3" ng-show="!show.per_cpu"> @@ -67,6 +67,7 @@ </div> <section id="processlist" class="plugin" ng-include src="'plugins/processlist.html'"></section> </div> + <div ng-show="!show.process_stats">PROCESSES DISABLED (press 'z' to display)</div> </div> </div> </div> diff --git a/glances/outputs/static/js/stats_controller.js b/glances/outputs/static/js/stats_controller.js index fe99d0d8..71ccdf20 100644 --- a/glances/outputs/static/js/stats_controller.js +++ b/glances/outputs/static/js/stats_controller.js @@ -27,6 +27,7 @@ glancesApp.controller('statsController', function ($scope, $interval, $routePara 'warning_alerts': true, 'warning_critical_alerts': true, 'process_stats': true, + 'quick_look': true, 'top_extended_stats': true, 'docker_stats': true, 'network_io_combination': false, @@ -216,6 +217,10 @@ glancesApp.controller('statsController', function ($scope, $interval, $routePara // F => Show filesystem free space $scope.show_hide('filesystem_free_space'); break; + case $event.shiftKey && $event.keyCode == keycodes.THREE: + // 3 => Enable/disable quick look plugin + $scope.show_hide('quick_look'); + break; } }; }); diff --git a/glances/outputs/static/js/variables.js b/glances/outputs/static/js/variables.js index 6ee1f175..807e6b03 100644 --- a/glances/outputs/static/js/variables.js +++ b/glances/outputs/static/js/variables.js @@ -20,6 +20,7 @@ var keycodes = { 'x' : '88', 'ONE': '49', 'TWO': '50', + 'THREE': '51', 'h' : '72', 'T' : '84', 'F' : '70', |