greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'nclsHart-fix-issue-556' into develop 

[Web UI] Do not display additional data for cpu and mem plugins on small devices
pull/588/merge
Alessio Sergi 2015-05-09 14:10:29 +02:00
parent 727e3d708d 39fc371d0c
commit c0f473df13
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glances/outputs/static/html/plugins/system.html
View File

@ -1,5 +1,3 @@
<span class="title">
{{ result["system"].hostname }}
</span>
<span class="title">{{ result["system"].hostname }}</span>
<span ng-if="is_linux" class="hidden-xs hidden-sm">({{ result["system"].hr_name }} / {{ result["system"].os_name }} {{ result["system"].os_version }})</span>
<span ng-if="!is_linux" class="hidden-xs hidden-sm">({{ result["system"].os_name }} {{ result["system"].os_version }} {{ result["system"].platform }})</span>

16
glances/outputs/static/html/stats.html
View File

@ -20,22 +20,22 @@
</div>
</div>
<div class="row">
<div class="col-sm-3 col-lg-2">
<div class="col-sm-3 col-md-2">
<section id="cpu" class="plugin" ng-include src="'plugins/cpu.html'"></section>
</div>
<div class="col-sm-3 col-lg-2">
<section id="cpu_more" class="plugin" ng-show="result['cpu'].nice != undefined" ng-include src="'plugins/cpu_more.html'"></section>
<div class="hidden-xs hidden-sm col-md-2">
<section id="cpu_more" class="plugin" ng-if="result['cpu'].nice != undefined" ng-include src="'plugins/cpu_more.html'"></section>
</div>
<div class="col-sm-3 col-lg-2">
<section id="load" class="plugin" ng-show="result['load'].cpucore != undefined" ng-include src="'plugins/load.html'"></section>
<div class="col-sm-3 col-md-2">
<section id="load" class="plugin" ng-if="result['load'].cpucore != undefined" ng-include src="'plugins/load.html'"></section>
</div>
<div class="col-sm-3 col-lg-2">
<div class="col-sm-3 col-md-2">
<section id="mem" class="plugin" ng-include src="'plugins/mem.html'"></section>
</div>
<div class="col-sm-3 col-lg-2">
<div class="hidden-xs hidden-sm col-md-2">
<section id="mem_more" class="plugin" ng-include src="'plugins/mem_more.html'"></section>
</div>
<div class="col-sm-3 col-lg-2">
<div class="col-sm-3 col-md-2">
<section id="memswap" class="plugin" ng-include src="'plugins/memswap.html'"></section>
</div>
</div>