Module: check_mk
Branch: master
Commit: 854bb6105d1d28246ee03201eb662ab5571cf693
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=854bb6105d1d28…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 27 14:23:18 2010 +0100
Fixed sidebar bulletlink positioning
---
.bugs/9 | 5 +++++
ChangeLog | 1 +
web/htdocs/check_mk.css | 19 +++++++------------
web/plugins/sidebar/shipped.py | 16 +++++++++++++++-
4 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/.bugs/9 b/.bugs/9
index fa27d2d..f9adf92 100644
--- a/.bugs/9
+++ b/.bugs/9
@@ -21,6 +21,11 @@ Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme:
* Snapin "Views": Die Spiegelpunkte sind zu weit links, die Einrückung
klappt nicht.
+ => <li> Tags sollten nicht ohne <ul> oder <ol> verwendet werden -
das Verhalten
+ der Browser in dem Fall ist nicht ordentlich definiert.
+ Ich habe nun um alle <li> Elemente in der sidebar <ul> Elemente gebaut,
damit
+ verhalten sich die Browser einheitlich
+
* wenn man den Edit-Knopf nicht hat (wegen Berechtigungen), dann werden
alle Tabs ganz komisch über die Breite verteilt. Am Ende ist die
ganze Implementierung der Tabs murks und muss eh neu gemacht werden.
diff --git a/ChangeLog b/ChangeLog
index 7e4f3c1..0b895bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@
* 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
+ * Sidebar: Fixed bulletlist positioning
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 f2e27c0..3c73e91 100644
--- a/web/htdocs/check_mk.css
+++ b/web/htdocs/check_mk.css
@@ -156,9 +156,6 @@ div#check_mk_sidebar div#side_header a.logo {
/* Scrolling part with snapins */
div#check_mk_sidebar div#side_content {
z-index: 5;
- /*position: relative;
- top: -4px;
- left: 0px;*/
width: 100%;
height: 500px;
overflow: hidden;
@@ -307,17 +304,15 @@ div.snapin a:hover {
text-decoration: underline;
color: #fff;
}
+div.snapin ul {
+ margin: 0;
+ padding: 0;
+ padding-left: 16px;
+ width: 220px;
+}
li.sidebar {
margin-left: 0px;
- padding-left: 1ex;
-}
-div.snapin ul.link {
- margin: 0px;
- padding-left: 32px;
-}
-div.snapin ul.link li {
- margin: 0px;
- padding: 0px;
+ margin-left: 0px;
}
div.snapin div.footnote {
diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py
index 82179f8..f599762 100644
--- a/web/plugins/sidebar/shipped.py
+++ b/web/plugins/sidebar/shipped.py
@@ -66,9 +66,11 @@ sidebar_snapins["about"] = {
#
# -----------------------------------------------------------------------
def render_admin():
+ html.write('<ul>')
bulletlink("View permissions", "view_permissions.py")
if config.may("edit_permissions"):
bulletlink("Edit permissions", "edit_permissions.py")
+ html.write('</ul>')
sidebar_snapins["admin"] = {
"title" : "Administration",
@@ -99,8 +101,10 @@ def render_views():
continue
if t == topic:
if first:
+ html.write("</ul>")
html.write("<h3>%s</h3>\n" % topic)
first = False
+ html.write("<ul>")
bulletlink(title, "view.py?view_name=%s" % name)
s = [ (view.get("topic", "Other"), view["title"], name)
for name, view in html.available_views.items() if not view["hidden"] ]
@@ -153,8 +157,10 @@ def render_groups(what):
groups.sort() # sort by Alias!
target = views.get_context_link(html.req.user, "%sgroup" % what)
if target:
+ html.write('<ul>')
for alias, name in groups:
bulletlink(alias, target + "&%sgroup=%s" % (what,
htmllib.urlencode(name)))
+ html.write('</ul>')
sidebar_snapins["hostgroups"] = {
"title" : "Hostgroups",
@@ -521,7 +527,11 @@ sidebar_snapins["tactical_overview"] = {
"styles" : """
table.tacticaloverview {
border-collapse: separate;
- /*border-spacing: 5px 2px;*/
+ /**
+ * Don't use border-spacing. It is not supported by IE8 with compat mode and older
IE versions.
+ * Better set cellspacing in HTML code. This works in all browsers.
+ * border-spacing: 5px 2px;
+ */
width: %dpx;
}
table.tacticaloverview th { font-size: 7pt; text-align: left; font-weight: normal;
padding: 0px; padding-top: 2px; }
@@ -625,8 +635,10 @@ div.time {
# |___/
# --------------------------------------------------------------
def render_nagios():
+ html.write('<ul>')
bulletlink("Home", "http://www.nagios.org")
bulletlink("Documentation", "%snagios/docs/toc.html" %
defaults.url_prefix)
+ html.write('</ul>')
for entry in [
"General",
("tac.cgi", "Tactical Overview"),
@@ -662,7 +674,9 @@ def render_nagios():
("config.cgi", "Configuration"),
]:
if type(entry) == str:
+ html.write('</ul>')
heading(entry)
+ html.write('<ul>')
else:
ref, text = entry
if text[0] == "*":