Improve display of per cpu plugin

This commit is contained in:
Floran Brutel
2015-05-25 11:42:06 +02:00
parent 31de5b3b1c
commit 904840cd79
3 changed files with 28 additions and 25 deletions

View File

@@ -1,4 +1,4 @@
<div class="table" ng-show="!show.per_cpu">
<div class="table">
<div class="table-row">
<div class="table-cell text-left title">CPU</div>
<div class="table-cell">{{result["cpu"].total}}%</div>
@@ -20,25 +20,3 @@
<div class="table-cell">{{result["cpu"].idle}}%</div>
</div>
</div>
<div class="table" ng-show="show.per_cpu">
<div class="table-row">
<div class="table-cell text-left title">PER CPU</div>
<div class="table-cell" ng-repeat="percpu in result.percpu">{{percpu.total}}%</div>
</div>
<div class="table-row">
<div class="table-cell text-left">user:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_user_', percpu.user)">
{{percpu.user}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">system:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_system_', percpu.system)">
{{percpu.system}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">idle:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu">{{percpu.idle}}%</div>
</div>
</div>

View File

@@ -0,0 +1,22 @@
<div class="table">
<div class="table-row">
<div class="table-cell text-left title">PER CPU</div>
<div class="table-cell" ng-repeat="percpu in result.percpu">{{percpu.total}}%</div>
</div>
<div class="table-row">
<div class="table-cell text-left">user:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_user_', percpu.user)">
{{percpu.user}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">system:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu" ng-class="getAlert('percpu', 'percpu_system_', percpu.system)">
{{percpu.system}}%
</div>
</div>
<div class="table-row">
<div class="table-cell text-left">idle:</div>
<div class="table-cell" ng-repeat="percpu in result.percpu">{{percpu.idle}}%</div>
</div>
</div>

View File

@@ -20,12 +20,15 @@
</div>
</div>
<div class="row">
<div class="col-sm-3 col-md-2">
<div class="col-sm-3 col-md-2" ng-show="!show.per_cpu">
<section id="cpu" class="plugin" ng-include src="'plugins/cpu.html'"></section>
</div>
<div class="hidden-xs hidden-sm col-md-2">
<div class="hidden-xs hidden-sm col-md-2" ng-show="!show.per_cpu">
<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-6 col-md-4" ng-show="show.per_cpu">
<section id="per_cpu" class="plugin" ng-include src="'plugins/per_cpu.html'"></section>
</div>
<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>