Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65243 discussions

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, 10 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, 10 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, 10 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, 10 months

Check_MK Git: check_mk: Removed scrollbars of sidebar in older IE versions and IE8 with compat mode

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c86c5895ff3b1dd51d8511847b4e0ec891e973f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c86c5895ff3b1d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 13:22:56 2010 +0100 Removed scrollbars of sidebar in older IE versions and IE8 with compat mode --- .bugs/9 | 3 +++ ChangeLog | 1 + web/htdocs/main.py | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/.bugs/9 b/.bugs/9 index 1fa90e2..32b55c6 100644 --- a/.bugs/9 +++ b/.bugs/9 @@ -13,6 +13,9 @@ Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: => Wurde behoben. Lösung: Async Request statt Sync Request * 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 + * Snapin "Views": Die Spiegelpunkte sind zu weit links, die Einrückung klappt nicht. * wenn man den Edit-Knopf nicht hat (wegen Berechtigungen), dann werden diff --git a/ChangeLog b/ChangeLog index 3d4bb6b..2659793 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 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 Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 854d989..44ff627 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -36,7 +36,7 @@ def page_index(html): <link rel="shortcut icon" href="images/favicon.ico" type="image/ico"> </head> <frameset cols="280,*" frameborder="0" framespacing="0" border="0"> - <frame src="side.py" name="side" noresize> + <frame src="side.py" name="side" noresize scrolling="no"> <frame src="%s" name="main" noresize> </frameset> </html>

13 years, 10 months

Check_MK Git: check_mk: Sidebar: Fixed scrolling problem in IE8 with compat mode ( or maybe older IE versions)

by lm＠mathias-kettner.de

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; }

13 years, 10 months

Check_MK Git: check_mk: Updated latest changes

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b9fc893094240202d637c3edc7b631ba707fef0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9fc8930942402… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 12:49:39 2010 +0100 Updated latest changes --- .bugs/9 | 3 +++ ChangeLog | 2 +- web/htdocs/js/check_mk.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/9 b/.bugs/9 index e7942e0..1fa90e2 100644 --- a/.bugs/9 +++ b/.bugs/9 @@ -9,6 +9,9 @@ Class: bug Multisite: Endgültig kompatibel mit IE machen. Bekannte Probleme: * reschedule Knopf geht irgendwie garnicht. Weder Animation noch reschedule. Nur das reload macht er + + => Wurde behoben. Lösung: Async Request statt Sync Request + * Bug mit Verschieben der Sidebar wo das Tabellengerüst stehen bleibt * Snapin "Views": Die Spiegelpunkte sind zu weit links, die Einrückung klappt nicht. diff --git a/ChangeLog b/ChangeLog index 4abb610..3d4bb6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,7 +32,7 @@ and services * 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 (Changed request to async mode) + * Fixed reloading button animation in Chrome/IE (Changed request to async mode) Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index ded9a04..4e8f46d 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -237,7 +237,7 @@ function performAction(oLink, action, type, site, name1, name2) { var oImg = oLink.childNodes[0]; oImg.src = 'images/icon_reloading.gif'; - // Chrome is not animating the gif during sync ajax request + // Chrome and IE are not animating the gif during sync ajax request // So better use the async request here get_url('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2, actionResponseHandler, oImg);

13 years, 10 months

Check_MK Git: check_mk: Sidebar: Fixed scroll position saving in Opera

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e98dcf3d6d1b02c55a222f60c8de465a8ea1c484 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e98dcf3d6d1b02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 11:35:57 2010 +0100 Sidebar: Fixed scroll position saving in Opera --- .bugs/18 | 10 +++++++--- ChangeLog | 1 + web/htdocs/js/sidebar.js | 11 +++++++++++ web/htdocs/sidebar.py | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.bugs/18 b/.bugs/18 index 6cb4c2a..a191bac 100644 --- a/.bugs/18 +++ b/.bugs/18 @@ -1,10 +1,11 @@ Title: Browserprobleme bei Opera Component: multisite +State: done +Class: bug +Date: 2010-12-21 16:18:53 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 16:18:53 -Class: bug +Fun: 0 * Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator springt dann immer nach ganz oben. @@ -13,3 +14,6 @@ springt dann immer nach ganz oben. * Im Opera wird sich die aktuelle Scroll-Position der Sidebar nicht korrekt gemerkt. + +2010-12-27 11:35:44: changed state open -> done +Things are working now in current opera version \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 26127f8..130dc30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * new view "Alert Statistics" showing alert statistics for all hosts and services * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera + * Sidebar: Fixed scroll position saving in Opera Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 9eff28d..ab971cb 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -24,6 +24,7 @@ var browser = navigator.userAgent.toLowerCase(); var weAreIEF__k = ((browser.indexOf("msie") != -1) && (browser.indexOf("opera") == -1)); +var weAreOpera = browser.indexOf("opera") != -1; var weAreFirefox = browser.indexOf("firefox") != -1 || browser.indexOf("namoroka") != -1; var contentLocation = parent.frames[1].document.location; @@ -456,6 +457,11 @@ function dragScroll(event) { var diff = startY - event.clientY; inhalt.scrollTop += diff; + + // Opera does not fire onunload event which is used to store the scroll + // position. So call the store function manually here. + if(weAreOpera) + storeScrollPos(); startY = event.clientY; @@ -496,6 +502,11 @@ function scrollWheel(event){ if (delta) handle(delta); + // Opera does not fire onunload event which is used to store the scroll + // position. So call the store function manually here. + if(weAreOpera) + storeScrollPos(); + if (event.preventDefault) event.preventDefault(); else diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 53efd52..1403ebe 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -130,7 +130,7 @@ def page_side(h): global html html = h - html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN "http://www.w3.org/TR/html4/frameset.dtd"> + html.write("""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head>

13 years, 10 months

Check_MK Git: check_mk: Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c711f14ccfcbf92a14f6aaa433c1abdea8fe06d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c711f14ccfcbf9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 11:12:37 2010 +0100 Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera --- .bugs/18 | 2 ++ ChangeLog | 1 + web/htdocs/.f12 | 2 +- web/htdocs/js/sidebar.js | 17 +++++++++-------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.bugs/18 b/.bugs/18 index bb54a1d..6cb4c2a 100644 --- a/.bugs/18 +++ b/.bugs/18 @@ -9,5 +9,7 @@ Class: bug * Bei Opera kann man kein Snapin nach ganz unten ziehen. Der Indikator springt dann immer nach ganz oben. + ==> Ist behoben. + * Im Opera wird sich die aktuelle Scroll-Position der Sidebar nicht korrekt gemerkt. diff --git a/ChangeLog b/ChangeLog index af97e19..26127f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * new datasource "alert_stats" for computing alert statistics * new view "Alert Statistics" showing alert statistics for all hosts and services + * Sidebar: Fixed snapin movement to the bottom of the snapin list in Opera Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index d836a21..c52f4b1 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,6 +1,6 @@ #!/bin/bash set -e -sudo cp -r images *.css *.py *.js /omd/versions/default/share/check_mk/web/htdocs +sudo cp -r images *.css *.py js /omd/versions/default/share/check_mk/web/htdocs sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 9231551..9eff28d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -250,14 +250,11 @@ function snapinStopDrag(event) { } function getDivChildNodes(node) { - if(typeof node.children === 'undefined') { - var children = []; - for(var i in node.childNodes) - if(node.childNodes[i].tagName === 'DIV') - children.push(node.childNodes[i]); - return children; - } else - return node.children; + var children = []; + for(var i in node.childNodes) + if(node.childNodes[i].tagName === 'DIV') + children.push(node.childNodes[i]); + return children; } function getSnapinList() { @@ -346,6 +343,10 @@ function getSnapinTargetPos() { * misc sidebar stuff *************************************************/ +function debug(s) { + window.parent.frames[1].document.write(s+'<br />'); +} + function pageHeight() { var h;

13 years, 10 months

Check_MK Git: check_mk: Fixed reloading button animation in Chrome ( Changed request to async mode)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7394d401656bebecf1239f9b9a88d57224210513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7394d401656beb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 27 12:42:27 2010 +0100 Fixed reloading button animation in Chrome (Changed request to async mode) --- .bugs/10 | 11 ++++++++--- ChangeLog | 1 + web/htdocs/js/check_mk.js | 24 ++++++++++++++++-------- web/plugins/views/painters.py | 2 +- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.bugs/10 b/.bugs/10 index 3306b0b..a3023ff 100644 --- a/.bugs/10 +++ b/.bugs/10 @@ -1,10 +1,15 @@ Title: Multisite mit Chrome kompatible machen Component: multisite +State: done +Class: bug +Date: 2010-12-21 11:01:49 Benefit: 1 -State: open Cost: 2 -Date: 2010-12-21 11:01:49 -Class: bug +Fun: 0 Bekannte Probleme: * reschedule Knopf wird nicht animiert + +2010-12-27 12:41:36: changed state open -> done +Animated gif images are stopped duing sync ajax requests in chrome. So the reloading image is not rotating. +Switched the request to async ajax request. diff --git a/ChangeLog b/ChangeLog index 130dc30..4abb610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ and services * 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 (Changed request to async mode) Checks & Agents: * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index ee8528f..ded9a04 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -204,15 +204,12 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn // Everything else: // <undefined> - Unknown format. Simply echo. -function performAction(oLink, action, type, site, name1, name2) { - var oImg = oLink.childNodes[0]; - oImg.src = 'images/icon_reloading.gif'; - +function actionResponseHandler(oImg, code) { var validResponse = true; - var response = get_url_sync('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2); + var response = null; try { - response = eval(response); + response = eval(code); } catch(e) { validResponse = false; } @@ -231,7 +228,18 @@ function performAction(oLink, action, type, site, name1, name2) { oImg.title = 'Invalid response: ' + response; } - validResponse = null; - response = null; + response = null; + validResponse = null; + oImg = null; +} + +function performAction(oLink, action, type, site, name1, name2) { + var oImg = oLink.childNodes[0]; + oImg.src = 'images/icon_reloading.gif'; + + // Chrome is not animating the gif during sync ajax request + // So better use the async request here + get_url('nagios_action.py?action='+action+'&site='+site+'&host='+name1+'&service='+name2, + actionResponseHandler, oImg); oImg = null; } diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index e4c90a4..6031e20 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -259,7 +259,7 @@ def paint_icons(what, row): # what is "host" or "service" name2 = row['service_description'] output += '<a href=\"#\" onclick="performAction(this, \'reschedule\', \'%s\', \'%s\', \'%s\', \'%s\');">' \ '<img class=icon title="Reschedule an immediate check of this %s" ' \ - 'src="images/icon_reload.gif"></a>' % (what, row["site"], row["host_name"], name2, what) + 'src="images/icon_reload.gif" /></a>' % (what, row["site"], row["host_name"], name2, what) return "icons", output

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits