Module: check_mk
Branch: master
Commit: 2c658d868c1bd6cad1c553dcd09c172757e12ace
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c658d868c1bd6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 11:38:21 2014 +0100
Slight styling improvement in WATO global option
---
web/htdocs/valuespec.py | 7 ++++++-
web/plugins/wato/check_mk_configuration.py | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 131718e..6eaa33f 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -1465,6 +1465,7 @@ class ListChoice(ValueSpec):
self._render_function = kwargs.get("render_function",
lambda id, val: val)
self._toggle_all = kwargs.get("toggle_all", False)
+ self._render_orientation = kwargs.get("render_orientation",
"horizontal") # other: vertical
# In case of overloaded functions with dynamic elements
def load_elements(self):
@@ -1503,7 +1504,11 @@ class ListChoice(ValueSpec):
def value_to_text(self, value):
self.load_elements()
d = dict(self._elements)
- return ", ".join([ self._render_function(v, d.get(v,v)) for v in value
])
+ texts = [ self._render_function(v, d.get(v,v)) for v in value ]
+ if self._render_orientation == "horizontal":
+ return ", ".join(texts)
+ else:
+ return "<table><tr><td>" +
"<br>".join(texts) + "</td></tr></table>"
def from_html_vars(self, varprefix):
self.load_elements()
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index fe2de60..c675230 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1105,7 +1105,8 @@ register_configvar(group,
( "ps.perf", _("State and Count of Processes
(with additional performance data)")),
( "wmic_process", _("Ressource consumption of
windows processes")),
( "logwatch", _("Check logfiles for relevant new
messages")),
- ]
+ ],
+ render_orientation = "vertical",
),
need_restart = True
)