Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

Check_MK Git: check_mk: WATO: Tune activation page, omit page reload

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c3a30694549bd654d18395486357082f4991c57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c3a30694549bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 26 11:16:26 2012 +0100 WATO: Tune activation page, omit page reload --- web/htdocs/images/repprogress.png | Bin 200 -> 199 bytes web/htdocs/js/wato.js | 10 +++++----- web/htdocs/wato.css | 10 ++++++++-- web/htdocs/wato.py | 10 ++++++++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/web/htdocs/images/repprogress.png b/web/htdocs/images/repprogress.png index ad02c31..5a85786 100644 Binary files a/web/htdocs/images/repprogress.png and b/web/htdocs/images/repprogress.png differ diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index a058dde..acdd16c 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -513,7 +513,7 @@ function wato_activation_result(siteid, code) { oMsg.innerHTML = code.substr(3); // Reload page after 2 secs - setTimeout(wato_replication_finish, 2000); + setTimeout(wato_replication_finish, 1000); } else { oState.innerHTML = ''; oMsg.innerHTML = code; @@ -571,24 +571,24 @@ function wato_replication_result(siteid, code) { oDiv.innerHTML = code; if (0 == num_replsites) { - setTimeout(wato_replication_finish, 2000); + setTimeout(wato_replication_finish, 1000); } } function wato_replication_finish() { // check if we have a sidebar-main frame setup - if(this.parent && parent && parent.frames[1] == this) + if (this.parent && parent && parent.frames[1] == this) parent.frames[0].location.reload(); // reload sidebar // always reload main - this.location.reload(); + // this.location.reload(); var oDiv = document.getElementById("act_changes_button"); oDiv.style.display = "none"; oDiv = null // Hide the pending changes container var oPending = document.getElementById("pending_changes"); - if(oPending) { + if (oPending) { oPending.style.display = "none"; oPending = null } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 24ff34f..0bcaa3d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -833,10 +833,11 @@ div.varname { background-image: url("images/repprogress.png"); background-repeat: repeat; float: left; - color: white; text-align: center; - padding-top: 0px; + padding-top: 4px; font-size: 8pt; + box-shadow: 0.5px 0.5px 1px #224466 inset; + color: black; } .wato td.tag-ellipsis { @@ -847,6 +848,11 @@ div.varname { -o-text-overflow: ellipsis; } +.wato td#repmsg_local { + width: 280px; +} + + /*-------------------------------------------------------------------------. | ____ | | | _ \ _ __ ___ __ _ _ __ ___ ___ ___ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e8a0035..95d7236 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7242,7 +7242,8 @@ def ajax_activation(): # html.message html.write('OK: ') - html.write('<div class=act_success><img src="images/icon_apply.png" /> %s</div>' % _("The new configuration has been successfully activated.")) + html.write('<div class=act_success><img src="images/icon_apply.png" /> %s</div>' % + _("Configuration successfully activated.")) except Exception, e: html.show_error(str(e)) @@ -11730,7 +11731,12 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo html.sorted_select( "folder", [ ("", "") ] + options, onchange = "folderpath.submit();", - attrs = {"class" : "folderpath"} + attrs = { + "class" : "folderpath", + # This does not work: it prevents the selection from + # being unfolded + # "onfhocus" : "if (this.blur) this.blur();", + } ) for var in keepvarnames: html.hidden_field(var, html.var(var))

11 years, 11 months

Check_MK Git: check_mk: Fix minor color difference in WATO folder selection

by Mathias Kettner

Module: check_mk Branch: master Commit: 8d688f0f2eb73d77d1c68796cf7e97c3a4128f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d688f0f2eb73d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 26 10:50:07 2012 +0100 Fix minor color difference in WATO folder selection --- web/htdocs/wato.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 6648f91..24ff34f 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -277,7 +277,7 @@ table.validationerror img { .wato div.folderpath li select { padding: 2px 0px 2px 4px; - background-color: #6da1b8; + background-color: #7399ba; margin: 0; color: #fff; font-weight: normal; @@ -287,6 +287,7 @@ table.validationerror img { right: -6px; z-index: 200; height: 17px; + box-shadow: none; } .wato div.folderpath li:hover select {

11 years, 11 months

Check_MK Git: check_mk: Better layout for tiled view

by Mathias Kettner

Module: check_mk Branch: master Commit: be076584cceacf46ca648c2ff0a7b39815e7dc55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be076584cceacf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 21:31:47 2012 +0100 Better layout for tiled view --- web/htdocs/views.css | 27 ++++++++++++++++++--------- web/plugins/views/layouts.py | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 431e300..0bbe7b8 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -266,14 +266,19 @@ table.tiled td { } .tile { - width: 160px; + width: 180px; border: 1px solid #000; float: left; - border-radius: 4px; - margin-right: 3px; - margin-bottom: 3px; - border-right: 2px solid #000; - border-bottom: 2px solid #000; + border-radius: 0px; + margin-right: 6px; + margin-bottom: 6px; + box-shadow: 1px 1px 3px #000; + background-color: #ccc; +} + +.tile img.icon { + width: 16px; + height: 16px; } .tile table { @@ -284,16 +289,20 @@ table.tiled td { font-size: 7pt; } .tile.sstate0, .tile.hhstate0 { - background-color: #afa; + border-color: #0f0; + /* background-color: #afa; */ } .tile.sstate1 { + border-color: #ff0; background-color: #ff0; } .tile.sstate2, .tile.hhstate1 { - background-color: #f42; + border-color: #f00; + background-color: #f88; } .tile.sstate3, .tile.hhstate2 { - background-color: #f80; + border-color: #f80; + background-color: #fc8; } .tile table { diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 6f1fc54..cd6d3fd 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -291,7 +291,7 @@ def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, show if len(painters) < 5: painters = painters + ([ (empty_painter, None) ] * (5 - len(painters))) - rendered = [ ("", prepare_paint(p, row)[1]) for p in painters ] + rendered = [ prepare_paint(p, row) for p in painters ] html.write("<tr><td class=\"tl %s\">" % (rendered[1][0],)) if show_checkboxes:

11 years, 11 months

Check_MK Git: check_mk: Added a couple of filters to general host views

by Mathias Kettner

Module: check_mk Branch: master Commit: 11e0cca655b9432f6a62760169e3dfac7e22739b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11e0cca655b943… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 21:11:15 2012 +0100 Added a couple of filters to general host views --- web/plugins/views/builtin.py | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 49bd369..49ea300 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -31,10 +31,7 @@ multisite_builtin_views.update({ 'description': 'Overall state of allhosts, with counts of services in the various states.', 'group_painters': [('sitealias', None)], 'hard_filters': ['summary_host'], - 'hard_filtervars': [('site', ''), - ('is_summary_host', '0'), - ('host', ''), - ('opthostgroup', '')], + 'hard_filtervars': [('is_summary_host', '0')], 'hidden': False, 'hide_filters': [], 'layout': 'table', @@ -52,7 +49,16 @@ multisite_builtin_views.update({ ('num_services_pending', 'host_pending')], 'play_sounds': False, 'public': True, - 'show_filters': ['siteopt', 'hostregex', 'opthostgroup'], + 'show_filters': ['host_scheduled_downtime_depth', + 'host_in_notification_period', + 'hoststate', + 'siteopt', + 'host_acknowledged', + 'hostregex', + 'host_notifications_enabled', + 'opthostgroup', + 'host_check_command', + 'opthost_contactgroup'], 'sorters': [('site', False), ('site_host', False)], 'title': _('All hosts'), 'topic': _('Hosts')}, @@ -78,7 +84,16 @@ multisite_builtin_views.update({ ('num_problems', 'problemsofhost')], 'play_sounds': False, 'public': True, - 'show_filters': ['siteopt', 'hostregex', 'opthostgroup'], + 'show_filters': ['host_scheduled_downtime_depth', + 'host_in_notification_period', + 'hoststate', + 'siteopt', + 'host_acknowledged', + 'hostregex', + 'host_notifications_enabled', + 'opthostgroup', + 'host_check_command', + 'opthost_contactgroup'], 'sorters': [('site', False), ('site_host', False)], 'title': _('All hosts (Mini)'), 'topic': _('Hosts')}, @@ -1370,7 +1385,16 @@ multisite_builtin_views.update({ ('host_state', None)], 'play_sounds': False, 'public': True, - 'show_filters': ['siteopt'], + 'show_filters': ['host_scheduled_downtime_depth', + 'host_in_notification_period', + 'hoststate', + 'siteopt', + 'host_acknowledged', + 'hostregex', + 'host_notifications_enabled', + 'opthostgroup', + 'host_check_command', + 'opthost_contactgroup'], 'sorters': [], 'title': _('All hosts (tiled)'), 'topic': _('Hosts')},

11 years, 11 months

Check_MK Git: check_mk: Table layout: omit empty group headers, saves V-space

by Mathias Kettner

Module: check_mk Branch: master Commit: ef38d93870b452651dda0ee633e3547683cc62ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef38d93870b452… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 21:01:52 2012 +0100 Table layout: omit empty group headers, saves V-space --- web/plugins/views/layouts.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index cedc8d3..6f1fc54 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -389,19 +389,28 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ html.write("</tr>\n") column = 1 - # paint group header group_open = True visible_row_number = 0 - html.write("<tr class=groupheader>") - html.write("<td class=groupheader colspan=%d><table class=groupheader cellspacing=0 cellpadding=0 border=0><tr>" % - (num_painters * (num_columns + 2) + (num_columns - 1))) - painted = False - for p in group_painters: - if painted: - html.write("<td>,</td>") - painted = paint(p, row) - html.write("</tr></table></td></tr>\n") + # paint group header, but only if it is non-empty + header_is_empty = True + for p in group_painters: + tdclass, content = prepare_paint(p, row) + if content: + header_is_empty = False + break + + if not header_is_empty: + html.write("<tr class=groupheader>") + html.write("<td class=groupheader colspan=%d><table class=groupheader cellspacing=0 cellpadding=0 border=0><tr>" % + (num_painters * (num_columns + 2) + (num_columns - 1))) + painted = False + for p in group_painters: + if painted: + html.write("<td>,</td>") + painted = paint(p, row) + + html.write("</tr></table></td></tr>\n") # Table headers if view.get("column_headers") != "off":

11 years, 11 months

Check_MK Git: check_mk: Fixed direction of dial wheel

by Mathias Kettner

Module: check_mk Branch: master Commit: 23aa45379c170fffa38ee8d2614a75aabf720fbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23aa45379c170f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 19:23:48 2012 +0100 Fixed direction of dial wheel --- web/htdocs/js/checkmk.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index c5d27d2..7c603a5 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1713,7 +1713,7 @@ function optiondial_wheel(e) { code = ('' + (oDiv.onclick)).replace("this", "oDiv").replace("onclick", "dial_wheel_function"); eval(code); - if (delta < 0) + if (delta > 0) dial_direction = -1; dial_wheel_function(e); dial_direction = 1;

11 years, 11 months

Check_MK Git: check_mk: Option dials (refresh, number of columns) now turnable by mouse wheel

by Mathias Kettner

Module: check_mk Branch: master Commit: def5a2a08edbb48fb565b0dc7a5553b2a87dc2a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def5a2a08edbb4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 19:22:20 2012 +0100 Option dials (refresh, number of columns) now turnable by mouse wheel This has been tested on Firefox only. --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 55 +++++++++++++++++++++++++++++++++++++++------ web/htdocs/views.py | 1 + 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b44c6c1..4a3e760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * FIX: output_format json: handle newlines correctly * FIX: handle ldap logins with ',' in distinguished name * FIX: quote HTML variable names, fixes potential JS injection + * Option dials (refresh, number of columns) now turnable by mouse wheel WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 212e3ee..c5d27d2 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1684,17 +1684,57 @@ function view_toggle_form(oButton, idForm) { add_class(oButton, down); } +function init_optiondial(id) { + oDiv = document.getElementById(id); + make_unselectable(oDiv); + + var eventname = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel" + + if (oDiv.attachEvent) //if IE (and Opera depending on user setting) + oDiv.attachEvent("on" + eventname, optiondial_wheel) + else if (oDiv.addEventListener) //WC3 browsers + oDiv.addEventListener(eventname, optiondial_wheel, false) + +} + +var dial_direction = 1; +function optiondial_wheel(e) { + var evt = window.event || e; + var delta = evt.detail ? evt.detail * (-120) : evt.wheelDelta; + + var oDiv; + if (evt.target) oDiv = evt.target; + else if (evt.srcElement) oDiv = evt.srcElement; + if (evt.nodeType == 3) // defeat Safari bug + oDiv = oDiv.parentNode; + while (!oDiv.className) + oDiv = oDiv.parentNode; + + + code = ('' + (oDiv.onclick)).replace("this", "oDiv").replace("onclick", "dial_wheel_function"); + eval(code); + if (delta < 0) + dial_direction = -1; + dial_wheel_function(e); + dial_direction = 1; + + if (evt.preventDefault) + evt.preventDefault(); + else + return false; + +} + // used for refresh und num_columns function view_dial_option(oDiv, viewname, option, choices) { // prevent double click from select text - make_unselectable(oDiv); var new_choice = choices[0]; // in case not contained in choices for (var c=0; c<choices.length; c++) { choice = choices[c]; val = choice[0]; title = choice[1]; if (has_class(oDiv, "val_" + val)) { - var new_choice = choices[(c+1) % choices.length]; + var new_choice = choices[(c + choices.length + dial_direction) % choices.length]; change_class(oDiv, "val_" + val, "val_" + new_choice[0]); break; } @@ -1705,11 +1745,11 @@ function view_dial_option(oDiv, viewname, option, choices) { speed = 10; for (var way = 0; way <= 10; way +=1) { step += speed; - setTimeout("turn_dial('" + option + "', '', " + way + ")", step); + setTimeout("turn_dial('" + option + "', '', " + way + "," + dial_direction + ")", step); } for (var way = -10; way <= 0; way +=1) { step += speed; - setTimeout("turn_dial('" + option + "', '" + new_choice[1] + "', " + way + ")", step); + setTimeout("turn_dial('" + option + "', '" + new_choice[1] + "', " + way + "," + dial_direction + ")", step); } get_url_sync("ajax_set_viewoption.py?view_name=" + viewname + @@ -1719,17 +1759,16 @@ function view_dial_option(oDiv, viewname, option, choices) { else { if (gReloadTimer) clearTimeout(gReloadTimer); - if (gReloadTime) - gReloadTimer = setTimeout("handleReload('')", 400.0); + gReloadTimer = setTimeout("handleReload('')", 400.0); } // handleReload(''); } // way ranges from -10 to 10 means centered (normal place) -function turn_dial(option, text, way) { +function turn_dial(option, text, way, direction) { var oDiv = document.getElementById("optiondial_" + option).firstChild; if (text && oDiv.innerHTML != text) oDiv.innerHTML = text; - oDiv.style.top = (way * 1.3) + "px"; + oDiv.style.top = (way * 1.3 * direction) + "px"; } diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 040cfb3..fe463bd 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1612,6 +1612,7 @@ def view_optiondial(view, option, choices, help): html.write('<div title="%s" id="optiondial_%s" class="optiondial %s val_%s"' 'onclick="view_dial_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( help, option, option, value, view["name"], option, choices, title)) + html.final_javascript("init_optiondial('optiondial_%s');" % option) def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option)

11 years, 11 months

Check_MK Git: check_mk: Fix wrongly layout inactive filter button

by Mathias Kettner

Module: check_mk Branch: master Commit: d1c9cf56ceb0815f5c1b152e9a5bfb131c8e098b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1c9cf56ceb081… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 18:43:54 2012 +0100 Fix wrongly layout inactive filter button --- web/htdocs/views.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index a9367e7..040cfb3 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1647,6 +1647,7 @@ def ajax_set_viewoption(): config.save_user_file("viewoptions", vo) def togglebutton_off(icon): + html.begin_context_buttons() html.write('<div class="togglebutton off %s"></div>' % icon) def togglebutton(id, isopen, icon, help):

11 years, 11 months

Check_MK Git: check_mk: Minor layout changes in option dials

by Mathias Kettner

Module: check_mk Branch: master Commit: 4357d4c2303819c3bb34c0ef4a5a4fb85d3b143f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4357d4c2303819… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 18:41:54 2012 +0100 Minor layout changes in option dials --- web/htdocs/views.css | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 728da06..431e300 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -187,8 +187,9 @@ div.optiondial { background-repeat: no-repeat; background-position: 1px -1px; overflow: hidden; - box-shadow: 0px 0px 1px #000; - color: #000; + box-shadow: 0px 0px 3px #123; + text-shadow: 0px 0.5px 0.5px #fff; + color: #222; } div.optiondial div {

11 years, 11 months

Check_MK Git: check_mk: Views: delay refresh after option dial change

by Mathias Kettner

Module: check_mk Branch: master Commit: e702711bfefc960e13afcf8aa866d596edd15d21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e702711bfefc96… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 25 18:36:05 2012 +0100 Views: delay refresh after option dial change This allows to faster toggle through all available options without intervening refreshes --- web/htdocs/js/checkmk.js | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 015a91c..212e3ee 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -738,7 +738,7 @@ function toggleRefreshFooter(s) { // timer to the given interval. If the parameter is 0 the reload is stopped. // When called with two parmeters the 2nd one is used as new url. function setReload(secs, url) { - if(typeof url === 'undefined') + if (typeof url === 'undefined') url = ''; if (gReloadTimer) { @@ -1716,7 +1716,13 @@ function view_dial_option(oDiv, viewname, option, choices) { "&option=" + option + "&value=" + new_choice[0]); if (option == "refresh") setReload(new_choice[0]); - handleReload(''); + else { + if (gReloadTimer) + clearTimeout(gReloadTimer); + if (gReloadTime) + gReloadTimer = setTimeout("handleReload('')", 400.0); + } + // handleReload(''); } // way ranges from -10 to 10 means centered (normal place) function turn_dial(option, text, way) {

11 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012