Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64139 discussions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 44c918775eb2c51aaf0b42262d6684ac55460ff8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44c918775eb2c5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 16:19:41 2010 +0100 Updated bug 9 --- .bugs/9 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.bugs/9 b/.bugs/9 index b789cb5..e7c5f18 100644 --- a/.bugs/9 +++ b/.bugs/9 @@ -1,10 +1,11 @@ Title: Multisite mit IE kompatibel machen Component: multisite +State: done +Class: bug +Date: 2010-12-21 11:01:09 Benefit: 4 -State: open Cost: 3 -Date: 2010-12-21 11:01:09 -Class: bug +Fun: 0 Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: * reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. @@ -33,3 +34,6 @@ Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: und einfach -moz-border-radius verwenden. Schaut bei IE a bisserl anders aus, aber was solls. => Fixed + +2010-12-27 16:19:35: changed state open -> done +Fixed all the listed problems

13 years, 8 months

Check_MK Git: check_mk: Removed workaround which does seem not to be needed anymore

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: aeb977b0503c892cdf6185adb3755d8f5b8ed08c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb977b0503c89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:54:42 2010 +0100 Removed workaround which does seem not to be needed anymore --- web/htdocs/js/sidebar.js | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index f74181b..7b60bb2 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -376,9 +376,8 @@ function setSidebarHeight() { if(height == 0) return; - /* This does not seem to be needed anymore: - if (weAreIEF__k) - oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; + /*if (weAreIEF__k) + oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; else*/ oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px';

13 years, 8 months

Check_MK Git: check_mk: Removed unneeded IE workarounds - fixed by setting correct doctype

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 262a3a61af2f6560e2bf8ac4ad552512e8cf2830 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=262a3a61af2f65… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 15:15:49 2010 +0100 Removed unneeded IE workarounds - fixed by setting correct doctype --- web/htdocs/js/sidebar.js | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 7b60bb2..b2719e8 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -148,8 +148,8 @@ function snapinDrag(event) { // Drag the snapin snapinDragging.style.position = 'absolute'; var newTop = event.clientY - snapinOffset[0] - snapinScrollTop; - if (weAreIEF__k) - newTop += document.getElementById('side_content').scrollTop; + /*if (weAreIEF__k) + newTop += document.getElementById('side_content').scrollTop;*/ snapinDragging.style.top = newTop + 'px'; snapinDragging.style.left = (event.clientX - snapinOffset[1]) + 'px'; snapinDragging.style.width = '175px'; @@ -277,9 +277,7 @@ function getSnapinList() { } function getSnapinCoords(obj) { - var snapinTop = snapinDragging.offsetTop; - if (!weAreIEF__k) - snapinTop += document.getElementById('side_content').scrollTop; + var snapinTop = snapinDragging.offsetTop + document.getElementById('side_content').scrollTop; var bottomOffset = obj.offsetTop + obj.clientHeight - snapinTop; if (bottomOffset < 0) @@ -376,9 +374,6 @@ function setSidebarHeight() { if(height == 0) return; - /*if (weAreIEF__k) - oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; - else*/ oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; oFooter = null;

13 years, 8 months

Check_MK Git: check_mk: Fixed left/top definitions when moving a snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1b694be8bfee586a7fe8ba294b4e37f4aa7ac76b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b694be8bfee58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 13:52:24 2010 +0100 Fixed left/top definitions when moving a snapin --- web/htdocs/js/sidebar.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index ab971cb..b205c68 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -150,8 +150,8 @@ function snapinDrag(event) { var newTop = event.clientY - snapinOffset[0] - snapinScrollTop; if (weAreIEF__k) newTop += document.getElementById('side_content').scrollTop; - snapinDragging.style.top = newTop; - snapinDragging.style.left = event.clientX - snapinOffset[1]; + snapinDragging.style.top = newTop + 'px'; + snapinDragging.style.left = (event.clientX - snapinOffset[1]) + 'px'; snapinDragging.style.width = '175px'; snapinDragging.style.zIndex = 200;

13 years, 8 months

Check_MK Git: check_mk: Fixed invalid css/html

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c86e36f92b85ee1779214e764988d0da64666521 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c86e36f92b85ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:31:23 2010 +0100 Fixed invalid css/html --- web/plugins/sidebar/shipped.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index e861bdf..1b9bcae 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -307,7 +307,7 @@ def render_hostmatrix(): style = 'height: %dpx; ' % (snapin_width) if rows > 10: style += "border-collapse: collapse;" - html.write('<table class=hostmatrix style="%s"\n' % style) + html.write('<table class=hostmatrix style="%s">\n' % style) col = 1 row = 1 for site, host, state, has_been_checked, worstsvc, downtimedepth in hosts: @@ -344,7 +344,7 @@ sidebar_snapins["hostmatrix"] = { "allowed" : [ "user", "admin", "guest" ], "refresh" : 10, "styles" : """ -table.hostmatrix { width: %dpx; cell-spacing: 1px; } +table.hostmatrix { width: %dpx; border-spacing: 1px; } table.hostmatrix a { display: block; width: 100%%; height: 100%%; } table.hostmatrix td { border: 1px solid white; } """ % snapin_width

13 years, 8 months

Check_MK Git: check_mk: Fixed invalid css definition

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9a6f13d2760a7889b4a7653562ef4a409ff00c36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a6f13d2760a78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:37:32 2010 +0100 Fixed invalid css definition --- web/plugins/sidebar/shipped.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 1b9bcae..3080b63 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -955,14 +955,14 @@ def render_custom_links(): display = "" img = "link_folder_open.gif" else: - display = "none" + display = "display: none; " img = "link_folder.gif" html.write('<h3 onclick="toggle_folder(this, \'%s\');" ' % ''.join(idss)) html.write('onmouseover="this.style.cursor=\'pointer\';" ') html.write('onmouseout="this.style.cursor=\'auto\';">') html.write('<img src="images/%s">' % img) html.write("%s</h3>\n" % entry[0]) - html.write('<div style="display: %s;" class=sublist>' % display) + html.write('<div style="%s" class=sublist>' % display) render_list(idss, entry[2]) html.write('</div>\n') elif type(entry[1]) == str:

13 years, 8 months

Check_MK Git: check_mk: Fixed custom link positioning when scrolling in IE

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 483aa73e24c9cd13926fa2177e6b93e1db3e7b7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=483aa73e24c9cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:42:21 2010 +0100 Fixed custom link positioning when scrolling in IE --- web/plugins/sidebar/shipped.py | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 3080b63..97511cd 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -960,7 +960,7 @@ def render_custom_links(): html.write('<h3 onclick="toggle_folder(this, \'%s\');" ' % ''.join(idss)) html.write('onmouseover="this.style.cursor=\'pointer\';" ') html.write('onmouseout="this.style.cursor=\'auto\';">') - html.write('<img src="images/%s">' % img) + html.write('<img src="images/%s" align="center" />' % img) html.write("%s</h3>\n" % entry[0]) html.write('<div style="%s" class=sublist>' % display) render_list(idss, entry[2]) @@ -985,16 +985,10 @@ sidebar_snapins["custom_links"] = { "render" : render_custom_links, "allowed" : [ "user", "admin", "guest" ], "styles" : """ -div#snapin_custom_links { -} div#snapin_custom_links div.sublist { padding-left: 10px; } -div#snapin_custom_links h3 { -} div#snapin_custom_links img { - position: relative; - top: 3px; margin-right: 5px; } """

13 years, 8 months

Check_MK Git: check_mk: Removed workaround which does seem not to be needed anymore

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fa90b7c438c3182b195fa8106c20ec47e6b908d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa90b7c438c318… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:50:20 2010 +0100 Removed workaround which does seem not to be needed anymore --- web/htdocs/js/sidebar.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index b205c68..f74181b 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -376,10 +376,11 @@ function setSidebarHeight() { if(height == 0) return; - if (weAreIEF__k) + /* This does not seem to be needed anymore: + if (weAreIEF__k) oContent.style.height = (height - oFooter.clientHeight + 5) + 'px'; - else - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; + else*/ + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; oFooter = null; oContent = null;

13 years, 8 months

Check_MK Git: check_mk: Fixed sidebar bulletlink positioning

by lm＠mathias-kettner.de

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] == "*":

13 years, 8 months

Check_MK Git: check_mk: Fixed invalid css definitions

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 425dd5d0916c74c41cf0813334848e9b07b233ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=425dd5d0916c74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 14:28:01 2010 +0100 Fixed invalid css definitions --- web/plugins/sidebar/shipped.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index f599762..e861bdf 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -304,7 +304,7 @@ def render_hostmatrix(): if lastcols > 0: rows += 1 - style = 'height: %d; ' % (snapin_width) + style = 'height: %dpx; ' % (snapin_width) if rows > 10: style += "border-collapse: collapse;" html.write('<table class=hostmatrix style="%s"\n' % style) @@ -344,7 +344,7 @@ sidebar_snapins["hostmatrix"] = { "allowed" : [ "user", "admin", "guest" ], "refresh" : 10, "styles" : """ -table.hostmatrix { width: %d; cell-spacing: 1px; } +table.hostmatrix { width: %dpx; cell-spacing: 1px; } table.hostmatrix a { display: block; width: 100%%; height: 100%%; } table.hostmatrix td { border: 1px solid white; } """ % snapin_width @@ -579,7 +579,7 @@ sidebar_snapins["performance"] = { table.performance { -moz-border-radius: 5px; font-size: 8pt; - width: %d; + width: %dpx; border-style: solid; background-color: #589; border-color: #444 #bbb #eee #666; @@ -620,7 +620,7 @@ div.time { -moz-border-radius: 10px; background-color: #588; color: #aff; - width: %d + width: %dpx; } """ % (snapin_width - 2) } @@ -738,7 +738,7 @@ sidebar_snapins["master_control"] = { "allowed" : [ "admin", ], "styles" : """ div#check_mk_sidebar table.master_control { - width: %d; + width: %dpx; margin: 0px; border-spacing: 0px; }

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits