From 904840cd79bd8f1dfd355eda11c820bdef557bf7 Mon Sep 17 00:00:00 2001
From: Floran Brutel <f.brutel@hexanet.fr>
Date: Mon, 25 May 2015 11:42:06 +0200
Subject: [PATCH] Improve display of per cpu plugin

---
 glances/outputs/static/html/plugins/cpu.html  | 24 +------------------
 .../outputs/static/html/plugins/per_cpu.html  | 22 +++++++++++++++++
 glances/outputs/static/html/stats.html        |  7 ++++--
 3 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 glances/outputs/static/html/plugins/per_cpu.html

diff --git a/glances/outputs/static/html/plugins/cpu.html b/glances/outputs/static/html/plugins/cpu.html
index 84d5f2d0..e574c8ef 100644
--- a/glances/outputs/static/html/plugins/cpu.html
+++ b/glances/outputs/static/html/plugins/cpu.html
@@ -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>
diff --git a/glances/outputs/static/html/plugins/per_cpu.html b/glances/outputs/static/html/plugins/per_cpu.html
new file mode 100644
index 00000000..68b0ae44
--- /dev/null
+++ b/glances/outputs/static/html/plugins/per_cpu.html
@@ -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>
diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html
index 6f5598d5..a1ff6300 100644
--- a/glances/outputs/static/html/stats.html
+++ b/glances/outputs/static/html/stats.html
@@ -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>