diff --git a/glances/main.py b/glances/main.py index cb7ea5d1..ca8eeeee 100644 --- a/glances/main.py +++ b/glances/main.py @@ -247,9 +247,8 @@ Start the client browser (browser mode):\n\ if args.disable_autodiscover: logger.info("Auto discover mode is disabled") - # In web server mode, defaul refresh time: 5 sec + # In web server mode if args.webserver: - args.time = 5 args.process_short_name = True # Server or client login/password diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py index 554dca57..053a1175 100644 --- a/glances/outputs/glances_bottle.py +++ b/glances/outputs/glances_bottle.py @@ -71,7 +71,7 @@ class GlancesBottle(object): def _route(self): """Define route.""" self._app.route('/', method="GET", callback=self._index) - self._app.route('/', method=["GET", "POST"], callback=self._index) + self._app.route('/', method=["GET"], callback=self._index) self._app.route('/', method="GET", callback=self._css) self._app.route('/', method="GET", callback=self._js) @@ -115,10 +115,6 @@ class GlancesBottle(object): def _index(self, refresh_time=None): """Bottle callback for index.html (/) file.""" - # Manage parameter - if refresh_time is None: - refresh_time = self.args.time - # Update the stat self.stats.update() diff --git a/glances/outputs/static/html/index.html b/glances/outputs/static/html/index.html index b0bbabe9..f8b7f23b 100644 --- a/glances/outputs/static/html/index.html +++ b/glances/outputs/static/html/index.html @@ -4,7 +4,7 @@ - Glances + Glances diff --git a/glances/outputs/static/html/plugins/diskio.html b/glances/outputs/static/html/plugins/diskio.html index c638eb8a..ea427041 100644 --- a/glances/outputs/static/html/plugins/diskio.html +++ b/glances/outputs/static/html/plugins/diskio.html @@ -1,16 +1,16 @@
DISK I/O
-
R/s
-
W/s
+
R/s
+
W/s
-
IOR/s
-
IOW/s
+
IOR/s
+
IOW/s
{{disk.name | min_size}}
-
{{disk.bitrate.txps }}
-
{{disk.bitrate.rxps }}
+
{{disk.bitrate.txps }}
+
{{disk.bitrate.rxps }}
-
{{disk.count.txps }}
-
{{disk.count.rxps }}
+
{{disk.count.txps }}
+
{{disk.count.rxps }}
diff --git a/glances/outputs/static/html/plugins/fs.html b/glances/outputs/static/html/plugins/fs.html index 11d56edb..8f5bc6d6 100644 --- a/glances/outputs/static/html/plugins/fs.html +++ b/glances/outputs/static/html/plugins/fs.html @@ -1,16 +1,16 @@
FILE SYS
- Used - Free + Used + Free
Total
{{ fs.mountPoint }} ({{ fs.name }})
- {{ fs.used | bytes }} - {{ fs.free | bytes }} + {{ fs.used | bytes }} + {{ fs.free | bytes }}
{{ fs.size | bytes }}
diff --git a/glances/outputs/static/html/plugins/network.html b/glances/outputs/static/html/plugins/network.html index f88c344b..6030f263 100644 --- a/glances/outputs/static/html/plugins/network.html +++ b/glances/outputs/static/html/plugins/network.html @@ -1,28 +1,28 @@
NETWORK
-
Rx/s
-
Tx/s
+
Rx/s
+
Tx/s
-
-
Rx+Tx/s
+
+
Rx+Tx/s
-
Rx
-
Tx
+
Rx
+
Tx
-
-
Rx+Tx
+
+
Rx+Tx
{{ network.interfaceName | min_size }}
-
{{ show.network_by_bytes ? (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}
-
{{ show.network_by_bytes ? (network.tx / network.time_since_update | bytes) : (network.tx / network.time_since_update | bits) }}
+
{{ arguments.byte ? (network.rx / network.time_since_update | bytes) : (network.rx / network.time_since_update | bits) }}
+
{{ arguments.byte ? (network.tx / network.time_since_update | bytes) : (network.tx / network.time_since_update | bits) }}
-
-
{{ show.network_by_bytes ? (network.cx / network.time_since_update | bytes) : (network.cx / network.time_since_update | bits) }}
+
+
{{ arguments.byte ? (network.cx / network.time_since_update | bytes) : (network.cx / network.time_since_update | bits) }}
-
{{ show.network_by_bytes ? (network.cumulativeRx | bytes) : (network.cumulativeRx | bits) }}
-
{{ show.network_by_bytes ? (network.cumulativeTx | bytes) : (network.cumulativeTx | bits) }}
+
{{ arguments.byte ? (network.cumulativeRx | bytes) : (network.cumulativeRx | bits) }}
+
{{ arguments.byte ? (network.cumulativeTx | bytes) : (network.cumulativeTx | bits) }}
-
-
{{ show.network_by_bytes ? (network.cumulativeCx | bytes) : (network.cumulativeCx | bits) }}
+
+
{{ arguments.byte ? (network.cumulativeCx | bytes) : (network.cumulativeCx | bits) }}
diff --git a/glances/outputs/static/html/plugins/processlist.html b/glances/outputs/static/html/plugins/processlist.html index 81b300bc..162cf2c1 100644 --- a/glances/outputs/static/html/plugins/processlist.html +++ b/glances/outputs/static/html/plugins/processlist.html @@ -27,7 +27,7 @@ -
{{process.name}}
-
{{process.cmdline}}
+
{{process.name}}
+
{{process.cmdline}}
diff --git a/glances/outputs/static/html/plugins/quicklook.html b/glances/outputs/static/html/plugins/quicklook.html index 27980659..4048636b 100644 --- a/glances/outputs/static/html/plugins/quicklook.html +++ b/glances/outputs/static/html/plugins/quicklook.html @@ -1,5 +1,5 @@
-
+
CPU
@@ -12,7 +12,7 @@ {{ statsQuicklook.cpu }}%
-
+
CPU{{ percpu.number }}
diff --git a/glances/outputs/static/html/stats.html b/glances/outputs/static/html/stats.html index 7a029e94..982e20ea 100644 --- a/glances/outputs/static/html/stats.html +++ b/glances/outputs/static/html/stats.html @@ -3,9 +3,9 @@
Loading...
-
+
-
+
@@ -20,47 +20,47 @@
-