Module: check_mk
Branch: master
Commit: 370cb1d7d71b60b1de1723699a72795ecc482b39
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=370cb1d7d71b60…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 27 13:46:23 2010 +0100
Sidebar: Fixed scrolling problem in IE8 with compat mode (or maybe older IE versions)
which broke the snapin titles and also the tactical overview table
---
.bugs/9 | 3 +++
ChangeLog | 4 +++-
web/htdocs/check_mk.css | 14 ++++----------
web/plugins/sidebar/shipped.py | 12 +++++-------
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/.bugs/9 b/.bugs/9
index 32b55c6..fa27d2d 100644
--- a/.bugs/9
+++ b/.bugs/9
@@ -15,6 +15,9 @@ Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme:
* Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt
-> LM: Lässt sich bei mir nur im IE8 mit aktivierter Kompatibilitätsansicht
nachvollziehen
+ => Problem waren "position: relative;" Definitionen in den Snapins. Damit
kann
+ IE < 8 nicht ordentlich umgehen. Die Definitionen sind nun umgebaut.
+ Damit ist das hier auch behoben.
* Snapin "Views": Die Spiegelpunkte sind zu weit links, die Einrückung
klappt nicht.
diff --git a/ChangeLog b/ChangeLog
index 2659793..7e4f3c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,9 @@
* Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera
* Sidebar: Fixed scroll position saving in Opera
* Fixed reloading button animation in Chrome/IE (Changed request to async mode)
- * Removed scrollbars of sidebar in older IE versions and IE8 with compat mode
+ * Sidebar: Removed scrollbars of in older IE versions and IE8 with compat mode
+ * Sidebar: Fixed scrolling problem in IE8 with compat mode (or maybe older IE
versions)
+ which broke the snapin titles and also the tactical overview table
Checks & Agents:
* Fixed problem with OnlyFrom: in Linux agent (df didn't work properly)
diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css
index 6d3eef3..f2e27c0 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -226,40 +226,34 @@ color: white;
/* General layout of snapins */
div.snapin {
- /*width: 280px;*/
width: 100%;
margin: 0;
padding: 0;
}
-
/* snapin header */
div.snapin div.head {
width: 260px;
text-align: center;
color: white;
+ padding-top: 9px;
}
div.snapin div.head.open {
background-image: url("images/snapin_header.png");
- height: 26px;
+ height: 17px;
}
div.snapin div.head.closed {
background-image: url("images/snapin_closed.png");
- height: 33px;
+ height: 22px;
}
/* close button on header */
div.snapin div.closesnapin {
float: right;
margin-right: 10px;
- margin-top: 11px;
-}
-
-div.snapin div.head b.heading {
- position: relative;
- top:9px;
+ margin-top: 2px;
}
div.snapin div.content {
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index a7f1a01..82179f8 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -487,7 +487,7 @@ def render_tactical_overview():
except livestatus.MKLivestatusNotFoundError:
html.write("<center>No data from any site</center>")
return
- html.write("<table class=tacticaloverview cellspacing=0 cellpadding=0
border=0>\n")
+ html.write("<table class=tacticaloverview cellspacing=2 cellpadding=0
border=0>\n")
for title, data, view, what in [
("Hosts", hstdata, 'hostproblems', 'host'),
("Services", svcdata, 'svcproblems', 'service'),
@@ -521,15 +521,13 @@ sidebar_snapins["tactical_overview"] = {
"styles" : """
table.tacticaloverview {
border-collapse: separate;
- border-spacing: 5px 0px;
+ /*border-spacing: 5px 2px;*/
width: %dpx;
- position: relative;
- left: -4px;
}
table.tacticaloverview th { font-size: 7pt; text-align: left; font-weight: normal;
padding: 0px; padding-top: 2px; }
-table.tacticaloverview td { text-align: right; border: 1px solid #444; padding: 0px;
padding-right: 2px; }
-table.tacticaloverview td a { display: block; }
-""" % (snapin_width + 9)
+table.tacticaloverview td { text-align: right; border: 1px solid #444; padding: 0px; }
+table.tacticaloverview td a { display: block; margin-right: 2px; }
+""" % (snapin_width + 5)
}
# table.tacticaloverview td.prob { font-weight: bold; }