6 Jul
2012
6 Jul
'12
9:37 a.m.
Module: check_mk
Branch: master
Commit: eb662a1a48fe52955b2c0a85cc6665618dbd4e8e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb662a1a48fe52…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jul 6 11:37:10 2012 +0200
FIX: remove refresh information on non-refreshable pages
---
web/htdocs/htmllib.py | 5 +++--
web/htdocs/pages.css | 5 +++++
web/htdocs/views.css | 4 ----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py
index deffebd..4de2a71 100644
--- a/web/htdocs/htmllib.py
+++ b/web/htdocs/htmllib.py
@@ -850,8 +850,9 @@ class html:
if self.req.header_sent:
self.bottom_focuscode()
corner_text = ""
- corner_text += '<div id=foot_refresh>%s</div>' % \
- _("refresh: <div id=foot_refresh_time>%s</div>
secs") % self.browser_reload
+ corner_text += '<div style="display: %s"
id=foot_refresh>%s</div>' % (
+ (self.browser_reload and "inline-block" or "none",
+ _("refresh: <div id=foot_refresh_time>%s</div>
secs") % self.browser_reload))
if self.render_headfoot:
si = self.render_status_icons()
self.write("<table class=footer><tr>"
diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css
index 501ef80..cf547fc 100644
--- a/web/htdocs/pages.css
+++ b/web/htdocs/pages.css
@@ -161,6 +161,11 @@ body.main table.footer img.statusicon {
top: -3px;
}
+div#foot_refresh, div#foot_refresh_time {
+ display: inline-block;
+}
+
+
/*-------------------------------------------------------------------------.
| ____ _ _ _ _ _ |
| / ___|___ _ __ | |_ _____ _| |_| (_)_ __ | | _____ |
diff --git a/web/htdocs/views.css b/web/htdocs/views.css
index 56c0cb7..60ce869 100644
--- a/web/htdocs/views.css
+++ b/web/htdocs/views.css
@@ -32,10 +32,6 @@ body.main.dashlet {
padding: 0px;
}
-div#foot_refresh, div#foot_refresh_time {
- display: inline-block;
-}
-
/*-------------------------------------------------------------------------.
| _____ _ ___ ___ _ _ |
| |_ _|_ _| |__ ___ ( _ ) / _ \ _ __ | |_(_) ___ _ __ ___ |