Module: check_mk
Branch: master
Commit: e33b49670dd309e83fbc8c703f84a031a7588b7a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e33b49670dd309…
Author: Tom Baerwinkel <tb(a)mathias-kettner.de>
Date: Mon Jul 30 12:20:31 2018 +0200
Make timespecific parameters look more pleasant
Timespecific parameters are now shown after the default parameters and
the corresponding button now renders as a block so that it cannot not
cover other elements (like e.g. labels) on small window sizes.
Change-Id: I04c9dc30ffc72dbeb9827f58d03d0ab4d1cc6708
---
cmk/gui/plugins/wato/utils/__init__.py | 19 ++++++++++---------
web/htdocs/themes/facelift/theme.css | 4 +---
web/htdocs/wato.css | 4 ++--
3 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/cmk/gui/plugins/wato/utils/__init__.py
b/cmk/gui/plugins/wato/utils/__init__.py
index 3e6b159..59f5f79 100644
--- a/cmk/gui/plugins/wato/utils/__init__.py
+++ b/cmk/gui/plugins/wato/utils/__init__.py
@@ -685,16 +685,17 @@ class TimeperiodValuespec(ValueSpec):
mode = _("Disable") if is_active else _("Enable")
vars_copy[self.tp_toggle_var] = "%d" % (not is_active)
-
toggle_url = html.makeuri(vars_copy.items())
- html.buttonlink(toggle_url, _("%s timespecific parameters") % mode,
class_=["toggle_timespecific_parameter"])
if is_active:
value = self._get_timeperiod_value(value)
self._get_timeperiod_valuespec().render_input(varprefix, value)
+ html.buttonlink(toggle_url, _("%s timespecific parameters") % mode,
class_=["toggle_timespecific_parameter"])
else:
value = self._get_timeless_value(value)
- return self._enclosed_valuespec.render_input(varprefix, value)
+ r = self._enclosed_valuespec.render_input(varprefix, value)
+ html.buttonlink(toggle_url, _("%s timespecific parameters") % mode,
class_=["toggle_timespecific_parameter"])
+ return r
def value_to_text(self, value):
@@ -742,6 +743,12 @@ class TimeperiodValuespec(ValueSpec):
def _get_timeperiod_valuespec(self):
return Dictionary(
elements = [
+ (self.tp_default_value_key,
+ Transform(
+ self._enclosed_valuespec,
+ title = _("Default parameters when no timeperiod
matches")
+ )
+ ),
(self.tp_values_key,
ListOf(
Tuple(
@@ -758,12 +765,6 @@ class TimeperiodValuespec(ValueSpec):
title = _("Configured timeperiod parameters"),
)
),
- (self.tp_default_value_key,
- Transform(
- self._enclosed_valuespec,
- title = _("Default parameters when no timeperiod
matches")
- )
- ),
],
optional_keys = False,
)
diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css
index 9aae213..4079105 100644
--- a/web/htdocs/themes/facelift/theme.css
+++ b/web/htdocs/themes/facelift/theme.css
@@ -100,9 +100,7 @@ input, input[type=text], input[type=password], select, textarea,
div.snapin sele
width: auto;
margin-bottom: 0px; }
input.toggle_timespecific_parameter, select.toggle_timespecific_parameter,
textarea.toggle_timespecific_parameter, div.snapin select.toggle_timespecific_parameter,
div.snapin textarea.toggle_timespecific_parameter,
.toggle_timespecific_parameter#mk_side_search_field {
- margin: 0px;
- position: absolute;
- right: 110px; }
+ display: block; }
select[multiple=multiple] {
resize: none !important; }
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 1088e34..3ecc6ed 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -816,8 +816,8 @@ div.rulesets table.nform tr.bottom td {
}
input.toggle_timespecific_parameter {
- position: absolute;
- right: 18px;
+ margin-top: 5px;
+ display: block;
}
/* Page edit_ruleset */