Module: check_mk
Branch: master
Commit: 12727cc55e86a6f5c7b11d9e4d2b6a5bb7c2ed5b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12727cc55e86a6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu May 17 23:46:58 2012 +0200
Further layout fixes: in host configuration
---
web/htdocs/wato.css | 25 ++++++++-----------------
web/htdocs/wato.py | 18 +++++++-----------
2 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css
index 21f5b44..280e35d 100644
--- a/web/htdocs/wato.css
+++ b/web/htdocs/wato.css
@@ -186,27 +186,18 @@ Boston, MA 02110-1301 USA.
}
.wato div.inherited {
- color: #000;
- font-weight: bold;
-}
-.wato td.inherited {
- color: #666;
-}
-.wato div.inherited h3 {
- margin: 0px;
- padding: 0px;
- font-size: 8pt;
- color: #468;
+ color: #444;
}
-.wato div.inherited h3 a {
- color: #468;
+.wato div.inherited a {
+ color: #444;
}
-.wato h3 {
- margin-bottom: 2px;
- color: white;
- font-size: 13pt;
+.wato div.inherited b {
+ color: black;
font-weight: normal;
}
+.wato td.inherited {
+ color: #666;
+}
/* host validation error */
table.validationerror {
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index fab34dc..46130e3 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -4694,37 +4694,33 @@ def configure_attributes(hosts, for_what, parent, myself=None,
without_attribute
% (attrname, active and "display: none" or ""))
# in bulk mode we show inheritance only if *all* hosts inherit
+ explanation = ""
if for_what == "bulk":
if num_haveit == 0:
- html.write("<h3>" + inherited_from +
"</h3>")
+ explanation = " (" + inherited_from + ")"
value = inherited_value
elif not unique:
- html.write(_("<i>This value differs between the selected
hosts.</i>"))
+ explanation = _("This value differs between the selected
hosts.")
else:
value = values[0]
elif for_what in [ "host", "folder" ]:
- html.write("<h3>" + inherited_from +
"</h3>")
+ explanation = " (" + inherited_from + ")"
value = inherited_value
if for_what != "search" and not (for_what == "bulk" and
not unique):
tdclass, content = attr.paint(value, "")
if not content:
- content = "<i>" + _("(empty)") +
"</i>"
- html.write(content)
+ content = _("empty")
+ html.write("<b>" + content + "</b>")
+ html.write(explanation)
html.write("</div>")
- # html.write("</td></tr>\n")
if len(topics) > 1:
- # html.write("</table>")
- # html.end_foldable_container() # end of topic
if topic_is_volatile:
volatile_topics.append((topic or _("Basic
settings")).encode('utf-8'))
- if topic == topics[-1]:
- pass
- # html.write('<table class="form">')
def dump_json(obj):
return repr(obj).replace('None', 'null')