Module: check_mk
Branch: master
Commit: fc55e8ec80ed45e6e7b91d23a4ff644c2241869f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc55e8ec80ed45…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jan 17 09:40:37 2013 +0100
FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor
---
ChangeLog | 3 +++
web/htdocs/wato.css | 9 +++++++++
web/htdocs/wato.py | 6 +++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3e4c0f1..b3ae1a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@
* LDAP: Reduced number of ldap querys during a single page request / sync process
* LDAP: Implemnted some kind of debug logging for LDAP communication
+ WATO:
+ * FIX: Fixed displaying of tag selections when creating a rule in the ruleeditor
+
1.2.1i4:
Core:
* Better exception handling when executing "Check_MK"-Check. Printing
python
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 0bcaa3d..3dedc13 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -578,6 +578,15 @@ table.validationerror img {
width: 90px;
}
+.wato form.rule_editor td.tag_sel {
+ vertical-align: middle;
+ display: table-cell;
+}
+
+.wato form.rule_editor td.tag_sel > div {
+ white-space: nowrap;
+}
+
.wato table.itemlist td {
margin: 0;
padding: 0;
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index be7f22b..a6725a1 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -10523,12 +10523,12 @@ def render_condition_editor(tag_specs):
("is", _("is")),
("isnot", _("isnot"))], deflt,
onchange="valuespec_toggle_dropdownn(this, 'tag_sel_%s');"
% id)
- html.write("</td><td>")
+ html.write("</td><td class=\"tag_sel\">")
if html.form_submitted():
- div_is_open = html.var(tagtype + "_" + id) != "ignore"
+ div_is_open = html.var(tagtype + "_" + id, "ignore") !=
"ignore"
else:
div_is_open = deflt != "ignore"
- html.write('<div id="tag_sel_%s" style="white-space:
nowrap; %s">' % (
+ html.write('<div id="tag_sel_%s" style="%s">' %
(
id, not div_is_open and "display: none;" or ""))
# Show main tags