Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Updated bug entries #0670

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 901da585282ec052a56faff0769476f365d8fe72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=901da585282ec0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:32:44 2012 +0200 Updated bug entries #0670 --- .bugs/670 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/670 b/.bugs/670 index f5b79f4..5275ebb 100644 --- a/.bugs/670 +++ b/.bugs/670 @@ -1,9 +1,9 @@ Title: Notification emails do not handle flapping nicely Component: core -State: open +Class: nastiness +State: done Date: 2012-03-30 08:39:31 Targetversion: 1.2.0 -Class: nastiness The notifications that are sent because of flapping should better display this. Currently it is like this: @@ -31,3 +31,6 @@ Output: CRITICAL: Build problem. State: error, last update: 2012-03-30 02:27:1 Perfdata: + +2012-05-25 15:32:42: changed state open -> done +Added NOTIFICATIONTYPE to mail body.

12 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 65e312eba3af8b950cff07b913a0a4cf65cdc5b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65e312eba3af8b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:17:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Several layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ec90531b363cbf2006896d8c7cc650bf178a574b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec90531b363cbf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:17:23 2012 +0200 Several layout fixes --- web/htdocs/images/checkbox_hover_bg.png | Bin 0 -> 199 bytes web/htdocs/js/checkmk.js | 145 +------------------------------ web/htdocs/pages.css | 17 +++-- web/htdocs/status.css | 1 - web/htdocs/views.css | 27 +++---- web/plugins/views/painters.py | 7 +- 6 files changed, 31 insertions(+), 166 deletions(-) diff --git a/web/htdocs/images/checkbox_hover_bg.png b/web/htdocs/images/checkbox_hover_bg.png new file mode 100644 index 0000000..de16b20 Binary files /dev/null and b/web/htdocs/images/checkbox_hover_bg.png differ diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index dc382ef..8cb829c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -882,130 +882,6 @@ function toggle_foldable_container(treename, id) { // Holds the row numbers of all selected rows var g_selected_rows = []; -// -function rgbToHsv(r, g, b) { - var r = (r / 255), - g = (g / 255), - b = (b / 255); - - var min = Math.min(Math.min(r, g), b), - max = Math.max(Math.max(r, g), b), - delta = max - min; - - var value = max, saturation, hue; - - // Hue - if (max == min) { - hue = 0; - } else if (max == r) { - hue = (60 * ((g-b) / (max-min))) % 360; - } else if (max == g) { - hue = 60 * ((b-r) / (max-min)) + 120; - } else if (max == b) { - hue = 60 * ((r-g) / (max-min)) + 240; - } - - if (hue < 0) - hue += 360; - - // Saturation - if (max == 0) { - saturation = 0; - } else { - saturation = 1 - (min/max); - } - return [Math.round(hue), Math.round(saturation * 100), Math.round(value * 100)]; -} - -function hsvToRgb(h,s,v) { - - var s = s / 100, - v = v / 100; - - var hi = Math.floor((h/60) % 6); - var f = (h / 60) - hi; - var p = v * (1 - s); - var q = v * (1 - f * s); - var t = v * (1 - (1 - f) * s); - - var rgb = []; - - switch (hi) { - case 0: rgb = [v,t,p];break; - case 1: rgb = [q,v,p];break; - case 2: rgb = [p,v,t];break; - case 3: rgb = [p,q,v];break; - case 4: rgb = [t,p,v];break; - case 5: rgb = [v,p,q];break; - } - - var r = Math.min(255, Math.round(rgb[0]*256)), - g = Math.min(255, Math.round(rgb[1]*256)), - b = Math.min(255, Math.round(rgb[2]*256)); - - return [r,g,b]; -} - -function lightenColor(color, val) { - if(color == 'transparent' || color == 'rgba(0, 0, 0, 0)') - return color; - - if(color.charAt(0) === 'r') { - var parts = color.substring(color.indexOf('(')+1, color.indexOf(')')).split(',', 3); - var r = parseInt(parts[0]); - var g = parseInt(parts[1]); - var b = parseInt(parts[2]); - } else if(color.charAt(0) === '#' && color.length == 7) { - var r = parseInt(color.substring(1, 3), 16); - var g = parseInt(color.substring(3, 5), 16); - var b = parseInt(color.substring(5, 7), 16); - } else if(color.charAt(0) === '#' && color.length == 4) { - var r = parseInt(color.substring(1, 2) + color.substring(1, 2), 16); - var g = parseInt(color.substring(2, 3) + color.substring(2, 3), 16); - var b = parseInt(color.substring(3, 4) + color.substring(3, 4), 16); - } else { - alert('Invalid color definition: ' + color); - return color; - } - - var hsv = rgbToHsv(r, g, b); - hsv[2] -= val; - var rgb = hsvToRgb(hsv[0], hsv[1], hsv[2]); - - r = rgb[0]; - g = rgb[1]; - b = rgb[2]; - - code = r < 16 ? "0"+r.toString(16) : r.toString(16); - code += g < 16 ? "0"+g.toString(16) : g.toString(16); - code += b < 16 ? "0"+b.toString(16) : b.toString(16); - - return "#" + code.toUpperCase(); -} - -function real_style(obj, attr, ieAttr) { - var st; - if(document.defaultView && document.defaultView.getComputedStyle) { - st = document.defaultView.getComputedStyle(obj, null).getPropertyValue(attr); - } else { - st = obj.currentStyle[ieAttr]; - } - - if(typeof(st) == 'undefined') { - st = 'transparent'; - } - - // If elem is a TD and has no background find the backround of the parent - // e.g. the TR and then set this color as background for the TD - // But only do this when the TR is not in the highlight scope - if(obj.tagName == 'TD' - && obj.parentNode.row_num === undefined - && (st == 'transparent' || st == 'rgba(0, 0, 0, 0)')) - st = real_style(obj.parentNode, attr, ieAttr); - - return st; -} - function find_checkbox(oTd) { // Find the checkbox of this oTdent to gather the number of cells // to highlight after the checkbox @@ -1050,23 +926,10 @@ function highlight_row(elem, on) { } function highlight_elem(elem, on) { - // Find all elements below "elem" with a defined background-color and change it - var bg_color = real_style(elem, 'background-color', 'backgroundColor'); - if (bg_color == 'white') - bg_color = "#ffffff"; - - if(on) { - elem['hover_orig_bg'] = bg_color; - elem.style.backgroundColor = lightenColor(elem['hover_orig_bg'], -20); - } else { - elem.style.backgroundColor = elem['hover_orig_bg']; - elem['hover_orig_bg'] = undefined; - } - - var childs = elem.childNodes; - for(var i = 0; i < childs.length; i++) - if(childs[i].tagName !== undefined && childs[i].tagName !== 'OPTION') - highlight_elem(childs[i], on); + if (on) + add_class(elem, "checkbox_hover"); + else + remove_class(elem, "checkbox_hover"); } function select_all_rows(elems, only_failed) { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 5abaa0e..ae1353f 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -239,13 +239,18 @@ table.data { color: black; } +table.data .checkbox_hover { + background-image: url("images/checkbox_hover_bg.png"); + background-attachment: fixed; +} + table.data th { font-weight: normal; border-left: 1px solid #ccc; border-right: 1px solid #ccc; - background-color: #899; - padding: 0 4px; + background-color: #999; + padding: 2px 2px; text-align: center; color: #fff; vertical-align: middle; @@ -259,11 +264,11 @@ table.data tr.dualheader th { /* Table header links (For sorting) */ table.data th.sort { - text-decoration: underline; + /* text-decoration: underline; */ } table.data th.sort:hover { - background-color: #A4B2B2; + background-color: #B2B2B2; cursor: pointer; } @@ -272,11 +277,11 @@ table.data th.sort:hover { } table.data th.asc { - color: #CBDCF2; + /* color: #CBDCF2; */ } table.data th.desc { - color: #CBDCF2; + /* color: #CBDCF2; */ } table.data th.tablegap { diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 4b17f0f..6d7fc82 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -40,7 +40,6 @@ Boston, MA 02110-1301 USA. td.state { text-align: center; font-weight: bold; - font-family: sans-serif; width: 32px; } diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 921a8b4..c0410c6 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -244,7 +244,7 @@ td.groupheader { padding: 0; } -td.gap { +td.gap, table.data .checkbox_hover.gap { background-image: url("images/contentframe_background.jpg"); background-attachment: fixed; background-repeat: repeat; @@ -335,28 +335,23 @@ table.data.single { box-shadow: 1px 1px 3px #000000; } -table.data.single tr.data { - background-color: #eee; -} - -table.data.single tr.gap { - background-color: transparent; -} - -table.data.single td { +table.data.single tr.data td { padding-bottom: 4px; - padding: 1px 10px 5px 10px; + padding: 2px 5px 2px 5px; text-align: left; vertical-align: middle; - border: 1px solid #bbb; } -table.data.single td.left { - padding-right: 10px; - color: #fff; - background-color: #888; +table.data.single tr.data td.left { width: 10%; white-space: nowrap; vertical-align: top; + padding-right: 20px; +} +table.data.single tr.even0 td.left { + background-color: #bbb; +} +table.data.single tr.odd0 td.left { + background-color: #ccc; } table.data.single td.gap { background-color: transparent; diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index eb961b2..b4eb304 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -966,10 +966,13 @@ def paint_host_with_state(row): state = row["host_state"] else: state = "p" - return "state hstate hstate%s" % state, row["host_name"] + if state != 0: + return "state hstate hstate%s" % state, row["host_name"] + else: + return "", row["host_name"] multisite_painters["host_with_state"] = { - "title" : _("Hostname colored with state"), + "title" : _("Hostname, marked red if down"), "short" : _("Host"), "columns" : ["site", "host_name", "host_state", "host_has_been_checked" ], "paint" : paint_host_with_state,

12 years, 1 month

Check_MK Git: check_mk: Fixed other css issues

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 930ad696a0740e48da1edbb542dfa40822efacd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=930ad696a0740e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:16:28 2012 +0200 Fixed other css issues --- web/plugins/sidebar/shipped.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index bdde471..6070b47 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -358,7 +358,7 @@ sidebar_snapins["hostmatrix"] = { "styles" : """ table.hostmatrix { border-spacing: 0; } table.hostmatrix tr { padding: 0; border-spacing: 0; } -table.hostmatrix a { display: block; width: 100%%; height: 100%%; line-height: 100%%; } +table.hostmatrix a { display: block; width: 100%; height: 100%; line-height: 100%; } table.hostmatrix td { border: 1px solid #123a4a; padding: 0; border-spacing: 0; } """

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed a lot of css/js errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5b78a42660db55cbf76c8ae9a6cd82e31684e52e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b78a42660db55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:03:34 2012 +0200 FIX: Fixed a lot of css/js errors --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 +++++-- web/htdocs/js/checkmk.js | 7 ++++--- web/htdocs/views.py | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4197261..0b519b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ when it comes to executing commands * FIX: Fixed styling issues of view filters with dropdown fields * FIX: multisite login can now deal with empty lines in htpasswd + * FIX: Fixed a bunch of js/css errors Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f802712..820c78f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -619,8 +619,11 @@ class html: id = "cb_" + varname if id: add_attr.append('id="%s"' % id) + add_attr_code = '' + if add_attr: + add_attr_code = ' ' + ' '.join(add_attr) self.write("<input type=checkbox name=\"%s\"%s%s%s%s>\n" % - (varname, checked, cssclass, onclick_code, " ".join(add_attr))) + (varname, checked, cssclass, onclick_code, add_attr_code)) self.form_vars.append(varname) if label: self.write('<label for="%s">%s</label>\n' % (id, label)) @@ -916,7 +919,7 @@ class html: if text and text.strip(): self.have_help = True self.write('<div class=help style="display: %s">' % ( - not self.help_visible and "none" or "")) + not self.help_visible and "none" or "block")) self.write(text.strip()) self.write('</div>') diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 5ab75af..6078503 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -295,15 +295,16 @@ function filter_activation(oSelect) oDiv.setAttribute("class", "filtersetting " + usage); var disabled = usage != "hard" && usage != "show"; - for (var i in oTd.childNodes) { - oNode = oTd.childNodes[i]; + var oNode; + for (var i in oDiv.childNodes) { + oNode = oDiv.childNodes[i]; if (oNode.tagName == "INPUT" || oNode.tagName == "SELECT") { oNode.disabled = disabled; } } p = null; - oTd = null; + oDiv = null; oSelect = null; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index cda5f13..5635f3e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -613,7 +613,7 @@ def page_edit_view(): html.write("<script language=\"javascript\">\n") for fname, filt in allowed_filters.items(): if fname not in ubiquitary_filters: - html.write("filter_activation(\"filter_%s\");\n" % fname) + html.write("filter_activation(document.getElementById(\"filter_%s\"));\n" % fname) html.write("</script>\n")

12 years, 1 month

Check_MK Git: check_mk: Fixed help/styling in view editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b00e1953ecb21b21e1a98edf1600326164bc2de3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b00e1953ecb21b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:52:30 2012 +0200 Fixed help/styling in view editor --- web/htdocs/views.css | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 8e29314..a9d3351 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -393,6 +393,7 @@ table.data.single td.perfometer div.title { div.filtersetting > select { float: left; margin-right: 10px; + height: 26px; } div.filtersetting.show > select { border: 3px solid #ff4; } div.filtersetting.hide > select { border: 3px solid #f8f; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 6cd06e4..cda5f13 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -596,7 +596,7 @@ def page_edit_view(): "that have a context (such as a host or a service). Such views can be used " "as targets for columns. Whenever the context is available, a button to that " "view will be displayed in related views.")) - show_help = True + shown_help = True html.write('<div class="filtersetting %s">' % html.var("filter_%s" % fname, "off")) html.sorted_select("filter_%s" % fname,

12 years, 1 month

Check_MK Git: check_mk: Fixed some css errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0ffceae2c531bd8386db859c8faf327840bc4e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ffceae2c531b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:43:21 2012 +0200 Fixed some css errors --- web/htdocs/js/checkmk.js | 2 +- web/htdocs/wato.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index dc382ef..5ab75af 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1626,7 +1626,7 @@ function help_switch(how) { // recursive scan for all div class=help elements var helpdivs = document.getElementsByClassName('help'); for (var i=0; i<helpdivs.length; i++) { - helpdivs[i].style.display = how ? "" : "none"; + helpdivs[i].style.display = how ? "block" : "none"; } get_url("ajax_switch_help.py?enabled=" + (how ? "yes" : "")); } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index e2a9a21..00ef5ab 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -143,7 +143,7 @@ Boston, MA 02110-1301 USA. height: 14px; margin: 0 5px 0 0; padding: 0; - border-style; none; + border-style: none; float: left; } @@ -212,7 +212,7 @@ table.validationerror img { } .wato table.data tr.data td.bulksearch { - text-align right; + text-align: right; padding-right: 0px; white-space: nowrap; }

12 years, 1 month

Check_MK Git: check_mk: Fixed some css errors

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7cad2e0905fbf8b0b4a5d862b94985d8caaa910 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7cad2e0905fbf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:38:27 2012 +0200 Fixed some css errors --- web/htdocs/check_mk.css | 2 +- web/htdocs/pages.css | 2 +- web/htdocs/views.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c9b4ca2..2b384e0 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -443,7 +443,7 @@ div.listofstrings.horizontal > div:last-child { } table.listchoice { - cell-spacing: 0px; + border-collapse: collapse; } table.listchoice td span.checkbox { height: 10px; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 5abaa0e..44d44a5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -554,7 +554,7 @@ table.nform { padding: 0; empty-cells: show; width: 100%; - border 1px solid green; + border: 1px solid green; border-radius: 5px; box-shadow: 0px 0px 2px #000; margin-bottom: 10px; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 921a8b4..8e29314 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -45,7 +45,7 @@ body.main.dashlet { '-------------------------------------------------------------------------*/ table.filterform { - cell-spacing: 0px; + border-collapse: collapse; padding: 0px; border-style: none; }

12 years, 1 month

Check_MK Git: check_mk: FIX: Fixed js error on hostlist page with search form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3fea6c88bb3b8cb86abc3aa0e098a903c77e759 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3fea6c88bb3b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:29:43 2012 +0200 FIX: Fixed js error on hostlist page with search form --- ChangeLog | 1 + web/htdocs/wato.py | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85959b4..4197261 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * Allow list of aux tags to be missing in host tag definitions. This makes migration from older version easier. * FIX: user management modules can now deal with empty lines in htpasswd + * FIX: Fixed js error on hostlist page with search form Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ebbd2cb..7bd373f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1181,12 +1181,9 @@ def show_hosts(folder): html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') html.write("</td><td class=bulksearch colspan=2>") - html.begin_form("search") html.text_input("search") html.button("_search", _("Search")) html.set_focus("search") - html.hidden_fields() - html.end_form() html.write('</td>') html.write("<td class=bulkactions colspan=%d>" % (colspan-3)) html.write(' ' + _("Selected hosts:\n"))

12 years, 1 month

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7912000a0e851119dca7172dac1747dd74e09e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7912000a0e851… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 14:29:48 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012