summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2014-04-27 11:52:41 +0200
committerNicolargo <nicolas@nicolargo.com>2014-04-27 11:52:41 +0200
commit8fcc70049d4d4860f644fe9f9a3bee3e2093d5c9 (patch)
tree938d9a9b8edcbe6c07a13aca934ee597030368bf
parent47b3f5d8337faf2b2e9b5af315709f81f96a4232 (diff)
Margin between rights stats on the Web Interface
-rw-r--r--glances/outputs/glances_bottle.py6
-rw-r--r--glances/outputs/static/css/style.css14
2 files changed, 12 insertions, 8 deletions
diff --git a/glances/outputs/glances_bottle.py b/glances/outputs/glances_bottle.py
index 115b592d..00ff1296 100644
--- a/glances/outputs/glances_bottle.py
+++ b/glances/outputs/glances_bottle.py
@@ -132,7 +132,7 @@ class glancesBottle:
html += '<section>'
html += self.display_plugin('cpu', self.stats.get_plugin('cpu').get_stats_display(args=self.args))
load_msg = self.stats.get_plugin('load').get_stats_display(args=self.args)
- if (load_msg['msgdict'] != []):
+ if load_msg['msgdict'] != []:
# Load is not available on all OS
# Only display if stat is available
html += self.display_plugin('load', load_msg)
@@ -141,13 +141,13 @@ class glancesBottle:
html += '</section>'
html += template('newline')
html += '<div>'
- html += '<aside>'
+ html += '<aside id="lefttstats">'
html += self.display_plugin('network', self.stats.get_plugin('network').get_stats_display(args=self.args))
html += self.display_plugin('diskio', self.stats.get_plugin('diskio').get_stats_display(args=self.args))
html += self.display_plugin('fs', self.stats.get_plugin('fs').get_stats_display(args=self.args))
html += self.display_plugin('sensors', self.stats.get_plugin('sensors').get_stats_display(args=self.args))
html += '</aside>'
- html += '<section>'
+ html += '<section id="rightstats">'
html += self.display_plugin('alert', self.stats.get_plugin('alert').get_stats_display(args=self.args))
html += self.display_plugin('processcount', self.stats.get_plugin('processcount').get_stats_display(args=self.args))
html += self.display_plugin('monitor', self.stats.get_plugin('monitor').get_stats_display(args=self.args))
diff --git a/glances/outputs/static/css/style.css b/glances/outputs/static/css/style.css
index 63478731..6397bf5c 100644
--- a/glances/outputs/static/css/style.css
+++ b/glances/outputs/static/css/style.css
@@ -97,6 +97,7 @@ div#newline{
#load {}
#mem {}
#memswap {}
+#leftstats {}
#network {
margin-bottom: 1em;
}
@@ -107,20 +108,23 @@ div#newline{
margin-bottom: 1em;
}
#sensors {}
+#rightstats {}
+#alert {
+ display: block;
+}
#processcount {
- margin-bottom: 1em;
+ display: block;
+ margin: 1em;
}
#monitor {
- margin-bottom: 1em;
+ display: block;
+ margin: 1em;
}
#processlist {}
article#processlist>div>div>span:last-child {
visibility: hidden;
white-space: nowrap;
}
-#alert {
- margin-bottom: 1em;
-}
#now {}
/*Responsive design*/
@media only screen and (max-width: 1024px) {