From 6c73885a7e0f1208a82846ffde698a8750cdeb7c Mon Sep 17 00:00:00 2001 From: fr4nc0is Date: Sun, 16 Oct 2022 11:38:10 +0200 Subject: [PATCH 1/3] added now plugin and updated layout --- glances/outputs/static/css/style.scss | 9 +- glances/outputs/static/js/App.vue | 229 +++++++++--------- .../static/js/components/plugin-alert.vue | 4 +- .../static/js/components/plugin-cloud.vue | 2 +- .../js/components/plugin-connections.vue | 2 +- .../static/js/components/plugin-diskio.vue | 2 +- .../static/js/components/plugin-folders.vue | 2 +- .../static/js/components/plugin-fs.vue | 2 +- .../static/js/components/plugin-ip.vue | 2 +- .../static/js/components/plugin-irq.vue | 2 +- .../static/js/components/plugin-network.vue | 2 +- .../static/js/components/plugin-now.vue | 20 ++ .../static/js/components/plugin-ports.vue | 2 +- .../static/js/components/plugin-quicklook.vue | 2 +- .../static/js/components/plugin-raid.vue | 2 +- .../static/js/components/plugin-sensors.vue | 2 +- .../static/js/components/plugin-system.vue | 2 +- .../static/js/components/plugin-uptime.vue | 2 +- .../static/js/components/plugin-wifi.vue | 2 +- glances/outputs/static/public/glances.js | 12 +- 20 files changed, 168 insertions(+), 136 deletions(-) create mode 100644 glances/outputs/static/js/components/plugin-now.vue diff --git a/glances/outputs/static/css/style.scss b/glances/outputs/static/css/style.scss index 502e1b37..ba76e0b5 100644 --- a/glances/outputs/static/css/style.scss +++ b/glances/outputs/static/css/style.scss @@ -20,12 +20,11 @@ body { text-align: right; } -.top-plugin { - margin-bottom: 20px; -} - .plugin { margin-bottom: 20px; + .table:last-child { + margin-bottom: 0; + } } .plugin.table-row-group .table-row:last-child .table-cell { padding-bottom: 20px; @@ -116,7 +115,7 @@ body { white-space: nowrap; } -#quicklook-plugin { +#quicklook { .progress { margin-bottom: 0px; min-width: 100px; diff --git a/glances/outputs/static/js/App.vue b/glances/outputs/static/js/App.vue index 7911fdc8..cd6dcf84 100644 --- a/glances/outputs/static/js/App.vue +++ b/glances/outputs/static/js/App.vue @@ -4,8 +4,8 @@
Loading...
-
-
+
+
@@ -19,6 +19,8 @@
+
+
@@ -26,115 +28,124 @@
-
-
- -
- -
-
- -
-
- -
-
- -
- - -
- -
-
- -
-
-
-
\ No newline at end of file diff --git a/glances/outputs/static/js/components/plugin-ports.vue b/glances/outputs/static/js/components/plugin-ports.vue index c2801c6a..040a75e5 100644 --- a/glances/outputs/static/js/components/plugin-ports.vue +++ b/glances/outputs/static/js/components/plugin-ports.vue @@ -1,5 +1,5 @@