Merge pull request #806 from nclsHart/webui-ip-shortcut

[Web UI] add missing show/hide IP module shortcut
This commit is contained in:
Nicolas Hennion 2016-03-09 22:03:19 +01:00
commit edc3331b20
3 changed files with 13 additions and 9 deletions

View File

@ -20,35 +20,35 @@
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.sort_user}}</div>
<div class="col-sm-12 col-lg-6">{{help.enable_disable_docker}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_ip}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.sort_proc}}</div>
<div class="col-sm-12 col-lg-6">{{help.view_network_io_combination}}</div>
<div class="col-sm-12 col-lg-6">{{help.enable_disable_docker}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.sort_io}}</div>
<div class="col-sm-12 col-lg-6">{{help.view_cumulative_network}}</div>
<div class="col-sm-12 col-lg-6">{{help.view_network_io_combination}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.sort_cpu_times}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_filesytem_freespace}}</div>
<div class="col-sm-12 col-lg-6">{{help.view_cumulative_network}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.show_hide_diskio}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_help}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_filesytem_freespace}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.show_hide_filesystem}}</div>
<div class="col-sm-12 col-lg-6">{{help.diskio_iops}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_help}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.show_hide_network}}</div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_top_menu}}</div>
<div class="col-sm-12 col-lg-6">{{help.diskio_iops}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.show_hide_sensors}}</div>
<div class="col-sm-12 col-lg-6"></div>
<div class="col-sm-12 col-lg-6">{{help.show_hide_top_menu}}</div>
</div>
<div class="row">
<div class="col-sm-12 col-lg-6">{{help.show_hide_left_sidebar}}</div>

View File

@ -12,7 +12,7 @@
<section id="system" class="plugin" ng-include src="'plugins/system.html'"></section>
</div>
<div class="pull-left">
<section id="ip" class="plugin" ng-if="statsIp.address != undefined" ng-include src="'plugins/ip.html'"></section>
<section id="ip" class="plugin" ng-if="statsIp.address != undefined && !arguments.disable_ip" ng-include src="'plugins/ip.html'"></section>
</div>
<div class="pull-right">
<section id="uptime" class="plugin" ng-include src="'plugins/uptime.html'"></section>

View File

@ -168,6 +168,10 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval
$scope.arguments.disable_swap = !$scope.arguments.disable_swap;
$scope.arguments.disable_load = !$scope.arguments.disable_load;
break;
case $event.shiftKey && $event.keyCode == keycodes.i:
// I => Show/hide IP module
$scope.arguments.disable_ip = !$scope.arguments.disable_ip;
break;
}
};
});