3 Nov
2010
3 Nov
'10
8:04 a.m.
Module: check_mk
Branch: master
Commit: bcd916c648582ece43595093b3a45ad7383b1443
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcd916c648582e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Oct 20 16:39:57 2010 +0200
Fixed invalid css definition and set the correct doctype in the sidebar now
---
ChangeLog | 2 ++
web/htdocs/sidebar.js | 4 ++--
web/htdocs/sidebar.py | 4 +++-
web/plugins/sidebar/shipped.py | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 748b53e..e32a509 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
Multisite:
* The custom open/close states of custom links are now stored for each
user
+ * Setting doctype in sidebar frame now
+ * Fixed invalid sidebar css height/width definition
1.1.8:
Checks & Agents:
diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js
index 5aaa037..2b6ad97 100644
--- a/web/htdocs/sidebar.js
+++ b/web/htdocs/sidebar.js
@@ -368,9 +368,9 @@ function setSidebarHeight() {
if (weAreIEF__k)
- oContent.style.height = height - oFooter.clientHeight + 5;
+ oContent.style.height = (height - oFooter.clientHeight + 5) + 'px';
else
- oContent.style.height = height - oHeader.clientHeight - oFooter.clientHeight - 5;
+ oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5)
+ 'px';
}
var scrolling = true;
diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py
index 90988eb..d715b68 100644
--- a/web/htdocs/sidebar.py
+++ b/web/htdocs/sidebar.py
@@ -124,7 +124,9 @@ def page_side(h):
global html
html = h
- html.write("""<html>
+ html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Frameset//EN "http://www.w3.org/TR/html4/frameset.dtd">
+
+<html>
<head>
<title>Check_MK Sidebar</title>
<link href="check_mk.css" type="text/css"
rel="stylesheet">
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index a6ceaec..7087557 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -394,7 +394,7 @@ sidebar_snapins["sitestatus"] = {
"refresh" : 90,
"styles" : """
.snapin table.sitestate {
- width: %d;
+ width: %dpx;
}
.snapin table.sitestate td {
@@ -517,7 +517,7 @@ sidebar_snapins["tactical_overview"] = {
table.tacticaloverview {
border-collapse: separate;
border-spacing: 5px 0px;
- width: %d;
+ width: %dpx;
position: relative;
left: -4px;
}