From 6abbd2bf9a0dafa93e92928a269820eaa127b12b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 29 Jul 2016 12:18:36 +0200
Subject: [statistics] Make filtering more dynamic, remove hard cutoff from
summary
---
modules-available/statistics/templates/cpumodels.html | 8 +++++---
modules-available/statistics/templates/filterbox.html | 19 ++++++++++++++++++-
modules-available/statistics/templates/id44.html | 7 ++++---
modules-available/statistics/templates/kvmstate.html | 6 ++++--
modules-available/statistics/templates/memory.html | 6 ++++--
5 files changed, 35 insertions(+), 11 deletions(-)
(limited to 'modules-available/statistics/templates')
diff --git a/modules-available/statistics/templates/cpumodels.html b/modules-available/statistics/templates/cpumodels.html
index f4af9cd2..0ab5286f 100644
--- a/modules-available/statistics/templates/cpumodels.html
+++ b/modules-available/statistics/templates/cpumodels.html
@@ -15,10 +15,12 @@
{{#rows}}
- |
- {{systemmodel}}
+ |
+ {{systemmodel}}
+ |
+
+ {{cores}}
|
- {{cores}} |
{{count}} |
{{/rows}}
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html
index 2e7928e9..a8a36adb 100644
--- a/modules-available/statistics/templates/filterbox.html
+++ b/modules-available/statistics/templates/filterbox.html
@@ -99,7 +99,8 @@ document.addEventListener("DOMContentLoaded", function () {
/* initialize selectize */
filterSelectize = $('#filterInput').selectize({
delimiter: slxFilterDel,
- plugins: ['restore_on_backspace', 'remove_button'],
+ persist: false,
+ plugins: ['remove_button'],
create: function(input) {
return {value: input, text: input}
},
@@ -156,6 +157,22 @@ document.addEventListener("DOMContentLoaded", function () {
initButtons();
+ $('.filter-col').each(function(idx, elem) {
+ var e = $(elem);
+ var col = e.data('filter-col');
+ if (!col) return;
+ e.find('.filter-val').each(function(idx, elem) {
+ var e = $(elem);
+ var val = e.data('filter-val');
+ if (!val) return;
+ e.click(function(ev) {
+ ev.preventDefault();
+ addFilter(col, '=', val);
+ refresh();
+ });
+ });
+ });
+
}, false);
diff --git a/modules-available/statistics/templates/id44.html b/modules-available/statistics/templates/id44.html
index f0b5b9f7..84b515d1 100644
--- a/modules-available/statistics/templates/id44.html
+++ b/modules-available/statistics/templates/id44.html
@@ -6,14 +6,16 @@
-
+
| {{lang_partitionSize}} |
{{lang_machineCount}} |
{{#rows}}
- | {{gb}} GiB |
+
+ {{gb}} GiB
+ |
{{count}} |
{{/rows}}
@@ -35,7 +37,6 @@
return;
}
sel = $('#tmpid' + String(tooltip.text));
- console.log('#tmpid' + String(tooltip.text));
sel.addClass('slx-bold');
}
});
diff --git a/modules-available/statistics/templates/kvmstate.html b/modules-available/statistics/templates/kvmstate.html
index 4c286d36..c44fb9ab 100644
--- a/modules-available/statistics/templates/kvmstate.html
+++ b/modules-available/statistics/templates/kvmstate.html
@@ -6,14 +6,16 @@
-
+
| {{lang_kvmState}} |
{{lang_machineCount}} |
{{#rows}}
- | {{kvmstate}} |
+
+ {{kvmstate}}
+ |
{{count}} |
{{/rows}}
diff --git a/modules-available/statistics/templates/memory.html b/modules-available/statistics/templates/memory.html
index 8a882fa6..2d50c47f 100644
--- a/modules-available/statistics/templates/memory.html
+++ b/modules-available/statistics/templates/memory.html
@@ -6,14 +6,16 @@
-
+
| {{lang_ramSize}} |
{{lang_machineCount}} |
{{#rows}}
- | {{gb}} GiB |
+
+ {{gb}} GiB
+ |
{{count}} |
{{/rows}}
--
cgit v1.2.3-55-g7522