diff --git a/glances/outputs/bottle/index.html b/glances/outputs/bottle/index.html index c6c26902..0a3a320d 100644 --- a/glances/outputs/bottle/index.html +++ b/glances/outputs/bottle/index.html @@ -23,10 +23,12 @@
- Refresh time 
@@ -38,7 +40,7 @@
-
+
@@ -64,8 +66,65 @@
-
-
+
+
+
+
+
nice:
+
+ {{result["cpu"].nice}}% +
+
+
+
irq:
+
+ {{result["cpu"].irq}}% +
+
+
+
iowait:
+
+ {{result["cpu"].iowait}}% +
+
+
+
steal:
+
+ {{result["cpu"].steal}}% +
+
+
+
+
+
+
+
+
+
LOAD
+
{{result["load"].cpucore}}-core
+
+
+
1 min:
+
+ {{result["load"].min1}} +
+
+
+
5 min:
+
+ {{result["load"].min5}} +
+
+
+
15 min:
+
+ {{result["load"].min15}} +
+
+
+
+
+
@@ -89,7 +148,29 @@
-
+
+
+
+
+
active:
+
{{result["mem"].active | bytes:2}}
+
+
+
inactive:
+
{{result["mem"].inactive | bytes:2}}
+
+
+
buffers:
+
{{result["mem"].buffers | bytes:2}}
+
+
+
cached:
+
{{result["mem"].cached | bytes:2}}
+
+
+
+
+
@@ -115,7 +196,7 @@
-
+
@@ -177,6 +258,9 @@
+
+ CONTAINERS 1 (served by Docker 1.2.0) +
@@ -231,4 +315,4 @@
- \ No newline at end of file + diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 4f17ad61..7360a184 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -154,14 +154,8 @@ class GlancesBottle(object): path = "D:\\glances\\" filepath = path + "debug.json" - if os.path.exists(filepath): - logger.debug("File exists : {0}.".format(filepath)) - - f = open(path + "debug.json") - return f.read() - - logger.warn("File does not exist : {0}.".format(filepath)) - return "" + f = open("/home/sylvain/glances/debug.json") + return f.read() def _api(self, plugin): """ @@ -264,4 +258,4 @@ class GlancesBottle(object): path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bottle", "index.html") f = open(path) - return f.read() \ No newline at end of file + return f.read() diff --git a/glances/outputs/static/js/controllers.js b/glances/outputs/static/js/controllers.js index db84e6ef..fb3777db 100644 --- a/glances/outputs/static/js/controllers.js +++ b/glances/outputs/static/js/controllers.js @@ -253,7 +253,7 @@ glancesApp.controller('bodyController', [ '$scope', '$http', '$interval', '$q', $scope.showHide('network') } else if ($event.keyCode == keycodes.s) {//s Show/hide sensors stats $scope.showHide('sensors') - } else if ($event.keyCode == keycodes.TWO) {//2 Show/hide left sidebar + } else if ($event.keyCode == keycodes.TWO && $event.shiftKey) {//2 Show/hide left sidebar $scope.showHide('sidebar') } else if ($event.keyCode == keycodes.z) {//z Enable/disable processes stats //$scope.enableDisable('processStats') @@ -289,4 +289,4 @@ glancesApp.controller('bodyController', [ '$scope', '$http', '$interval', '$q', //$scope.sortBy('') } } -} ]); \ No newline at end of file +} ]); diff --git a/glances/outputs/static/js/variables.js b/glances/outputs/static/js/variables.js index de4513cd..91f7ce22 100644 --- a/glances/outputs/static/js/variables.js +++ b/glances/outputs/static/js/variables.js @@ -9,7 +9,7 @@ var keycodes = { 'f' : '70', 'n' : '78', 's' : '83', - 'TWO' : '98', + 'TWO' : '50', 'z' : '90', 'e' : '69', 'SLASH' : '191', @@ -26,4 +26,4 @@ var keycodes = { 'g' : '', 'r' : '', 'q' : '' -} \ No newline at end of file +}