Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64710 discussions

Check_MK Git: check_mk: Fixed "add to visual" menu positioned out of top screen border

by Lars Michelsen

Module: check_mk Branch: master Commit: 42e0172d20764ca36079dfe50cf5727a2fcab943 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42e0172d20764c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 09:30:04 2014 +0100 Fixed "add to visual" menu positioned out of top screen border --- web/htdocs/js/checkmk.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 0f8a9bf..ec9c3f8 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -573,8 +573,8 @@ function create_graph(data, params) { // Add the control for adding the graph to a dashboard var visualadd = document.createElement('a'); - visualadd.title = 'Add to dashboard'; - visualadd.setAttribute('class', 'visualadd'); + visualadd.title = 'Add this view to...'; + visualadd.className = 'visualadd'; visualadd.onclick = function(host, service, view, source) { return function(event) { toggle_add_to_visual(event, this, 'pnpgraph', @@ -2301,7 +2301,6 @@ function add_dashboard_response_handler(data, response_text) } function fix_visualadd_menu_position(event, menu) { - //var target = getTarget(event); // //// When menu is out of screen on the right, move to left //if (menu.offsetLeft + menu.clientWidth > pageWidth()) { @@ -2309,11 +2308,16 @@ function fix_visualadd_menu_position(event, menu) { // menu.style.right = 'auto'; //} - //// When menu is out of screen on the top, move to bottom - //if (menu.offsetTop < 0) { - // menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; - // menu.style.bottom = 'auto'; - //} + // menu.offsetTop does not take whole page offset into account, because + // it is positioned relative to another element. Take this into account + var offset_top = menu.offsetTop + menu.offsetParent.offsetTop; + + // When menu is out of screen on the top, move to bottom + console.log(offset_top) + if (offset_top < 0) { + menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; + menu.style.bottom = 'auto'; + } } function add_to_visual(visual_type, name)

9 years, 10 months

Check_MK Git: check_mk: check_mk_agent.freebsd: Changed used shell to bash (needed for run_cached function)

by Lars Michelsen

Module: check_mk Branch: master Commit: 72281d71ea1648c221f99eb97c608156f33ae86e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72281d71ea1648… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 08:12:15 2014 +0100 check_mk_agent.freebsd: Changed used shell to bash (needed for run_cached function) --- agents/check_mk_agent.freebsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 5ce92aa..0862727 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / |

9 years, 10 months

Check_MK Git: check_mk: #1688 FIX juniper_screenos_mem: Fixed wrong total memory computation

by Lars Michelsen

Module: check_mk Branch: master Commit: c5233a305d8937717127983d77e1487450fa8658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5233a305d8937… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 08:01:19 2014 +0100 #1688 FIX juniper_screenos_mem: Fixed wrong total memory computation --- .werks/1688 | 9 +++++++++ ChangeLog | 1 + checks/juniper_screenos_mem | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/1688 b/.werks/1688 new file mode 100644 index 0000000..4ad3f55 --- /dev/null +++ b/.werks/1688 @@ -0,0 +1,9 @@ +Title: juniper_screenos_mem: Fixed wrong total memory computation +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418022065 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fdd9e0d..48b7148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ * 1703 FIX: ups_test: Fix computation of time since last self test... * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent * 1455 FIX: hp_proliant_mem: avoid a crash of the check when module_condition is empty + * 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/juniper_screenos_mem b/checks/juniper_screenos_mem index 58d70cd..46444ee 100644 --- a/checks/juniper_screenos_mem +++ b/checks/juniper_screenos_mem @@ -24,8 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def parse_juniper_screenos_mem(info): + new_info = [] + for used, free in info: + new_info.append([used, int(used)+int(free)]) + return new_info check_info["juniper_screenos_mem"] = { + "parse_function" : parse_juniper_screenos_mem, "check_function" : check_juniper_mem, "inventory_function" : inventory_juniper_mem, "group" : "juniper_mem",

9 years, 10 months

Check_MK Git: check_mk: Dashboard: Fixed broken views after trying to sort them

by Lars Michelsen

Module: check_mk Branch: master Commit: f8fa907011a9e0358605932dae23ec4bc7ccd181 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8fa907011a9e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 18:37:05 2014 +0100 Dashboard: Fixed broken views after trying to sort them --- web/htdocs/dashboard.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c95d729..466947f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -527,9 +527,10 @@ dashboard_scheduler(1); html.body_end() # omit regular footer with status icons, etc. -def render_dashlet_content(nr, the_dashlet): - html.stash_vars() - html.del_all_vars() +def render_dashlet_content(nr, the_dashlet, stash_html_vars = False): + if stash_html_vars: + html.stash_vars() + html.del_all_vars() visuals.add_context_to_uri_vars(the_dashlet) dashlet_type = dashlet_types[the_dashlet['type']] @@ -538,7 +539,8 @@ def render_dashlet_content(nr, the_dashlet): else: dashlet_type['render'](nr, the_dashlet) - html.unstash_vars() + if stash_html_vars: + html.unstash_vars() # Create the HTML code for one dashlet. Each dashlet has an id "dashlet_%d", # where %d is its index (in board["dashlets"]). Javascript uses that id @@ -662,7 +664,7 @@ def ajax_dashlet(): if the_dashlet['type'] not in dashlet_types: raise MKGeneralException(_('The requested dashlet type does not exist.')) - render_dashlet_content(ident, the_dashlet) + render_dashlet_content(ident, the_dashlet, stash_html_vars=False) #. # .--Dashboard List------------------------------------------------------.

9 years, 10 months

Check_MK Git: check_mk: Fixed merge problem

by Lars Michelsen

Module: check_mk Branch: master Commit: 5597731b5ef54709af9c6653f3c1fb04a0840592 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5597731b5ef547… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 18:23:10 2014 +0100 Fixed merge problem --- web/htdocs/js/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 6b73bbd..cc0eccf 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -524,7 +524,7 @@ function dashlet_toggle_edit(dashlet_obj, edit) { var controls = document.createElement('div'); controls.setAttribute('id', 'dashlet_controls_'+nr); controls.className = 'controls'; - dashlet.appendChild(controls); + dashlet_obj.appendChild(controls); set_control_size(controls, dashlet_obj.clientWidth, dashlet_obj.clientHeight); // IE < 9: Without this fix the controls container is not working

9 years, 10 months

Check_MK Git: check_mk: Added tooltips to dashboard editor controls

by Lars Michelsen

Module: check_mk Branch: master Commit: 65a41ed71d7ea909b80f5435220bfd02320f0326 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65a41ed71d7ea9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 13:46:55 2014 +0100 Added tooltips to dashboard editor controls --- web/htdocs/dashboard.css | 11 ++++++----- web/htdocs/js/dashboard.js | 11 ++++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index c34a860..6657396 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -317,7 +317,7 @@ div.dashlet.edit .del:hover { /* position anchors */ div.dashlet.edit .anchor { - cursor: pointer; + cursor: auto; position: absolute; width: 20px; height: 20px; @@ -330,14 +330,15 @@ div.dashlet.edit .anchor { background-image: url(images/dashlet_anchor_lo.png); } -div.dashlet.edit .anchor:hover { - background-image: url(images/dashlet_anchor_hi.png); -} - div.dashlet.edit .anchor.off { + cursor: pointer; background-image: url(images/dashlet_anchor_off.png); } +div.dashlet.edit .anchor.off:hover { + background-image: url(images/dashlet_anchor_hi.png); +} + div.dashlet.edit .anchor.anchor0 { top: 5px; left: 5px; diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 50dabf8..acda275 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -462,13 +462,16 @@ function render_sizer(controls, id, i, active, size) { if (size == MAX) { sizer.className += ' max'; sizer_lbl.innerHTML = 'MAX'; + sizer.title = 'Use maximum available space in this direction'; } else if (size == GROW) { sizer.className += ' grow'; sizer_lbl.innerHTML = 'GROW'; + sizer.title = 'Grow in this direction'; } else { sizer.className += ' abs'; + sizer.title = 'Fixed size (drag border for resize)'; render_resize_controls(controls, i, active); } @@ -479,6 +482,7 @@ function render_sizer(controls, id, i, active, size) { }; }(id, i); sizer_lbl.onclick = sizer.onclick; + sizer_lbl.title = sizer.title; controls.appendChild(sizer); if (size == MAX || size == GROW) @@ -525,8 +529,11 @@ function dashlet_toggle_edit(dashlet, edit) { for (var i = 0; i < 4; i++) { var anchor = document.createElement('a'); anchor.className = 'anchor anchor'+i; - if (active != i) + anchor.title = 'Currently growing from here'; + if (active != i) { anchor.className += ' off'; + anchor.title = 'Click to start growing from here'; + } // js magic stuff - closures! anchor.onclick = function(dashlet_id, anchor_id) { @@ -541,6 +548,7 @@ function dashlet_toggle_edit(dashlet, edit) { // Add edit dashlet button var edit = document.createElement('a'); edit.className = 'edit'; + edit.title = 'Edit properties of this dashlet'; edit.onclick = function(dashlet_id, board_name) { return function() { location.href = 'edit_dashlet.py?name=' + board_name + '&id=' + dashlet_id; @@ -551,6 +559,7 @@ function dashlet_toggle_edit(dashlet, edit) { // Add delete dashlet button var del = document.createElement('a'); del.className = 'del'; + del.title = 'Delete this dashlet'; del.onclick = function(dashlet_id, board_name) { return function() { location.href = 'delete_dashlet.py?name=' + board_name + '&id=' + dashlet_id;

9 years, 10 months

Check_MK Git: check_mk: Moved "add dashlet" choice to top of dashboard editor menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 6a40ee9ea3ee1fd7ed174c02d5e5a0dbdedd2224 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a40ee9ea3ee1f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 13:34:41 2014 +0100 Moved "add dashlet" choice to top of dashboard editor menu --- web/htdocs/dashboard.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 6449c2f..7fa419f 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -431,18 +431,11 @@ def render_dashboard(name): html.write('<li><a href="%s">%s</a></li>\n' % (html.makeuri([('edit', 1)]), _('Edit Dashboard'))) else: - # Show these options only to the owner of the dashboard - html.write('<li><a href="edit_dashboard.py?load_name=%s&back=%s" ' - 'onmouseover="hide_submenus();" >%s</a></li>\n' % - (name, html.urlencode(html.makeuri([])), _('Properties'))) + # + # Add dashlet menu + # - # Links visible during editing display = html.var('edit') == '1' and 'block' or 'none' - html.write('<li id="control_view" style="display:%s"><a href="javascript:void(0)" ' - 'onmouseover="hide_submenus();" ' - 'onclick="toggle_dashboard_edit(false)">%s</a>\n' % - (display, _('Stop Editing'))) - html.write('<li id="control_add" class="sublink" style="display:%s" ' 'onmouseover="show_submenu(\'control_add\')"><a href="javascript:void(0)">%s</a>\n' % (display, _('Add dashlet'))) @@ -468,7 +461,28 @@ def render_dashboard(name): html.write('</li>\n') + # + # Properties link + # + + html.write('<li><a href="edit_dashboard.py?load_name=%s&back=%s" ' + 'onmouseover="hide_submenus();" >%s</a></li>\n' % + (name, html.urlencode(html.makeuri([])), _('Properties'))) + + # + # Stop editing + # + + display = html.var('edit') == '1' and 'block' or 'none' + html.write('<li id="control_view" style="display:%s"><a href="javascript:void(0)" ' + 'onmouseover="hide_submenus();" ' + 'onclick="toggle_dashboard_edit(false)">%s</a></li>\n' % + (display, _('Stop Editing'))) + + # # Enable editing link + # + display = html.var('edit') != '1' and 'block' or 'none' html.write('<li id="control_edit" style="display:%s"><a href="javascript:void(0)" ' 'onclick="toggle_dashboard_edit(true)">%s</a></li>\n' %

9 years, 10 months

Check_MK Git: check_mk: Dashoard designer: Improved toggling of sizing modes

by Lars Michelsen

Module: check_mk Branch: master Commit: 0947e1b688aa9751252b907f0851b02667ab2991 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0947e1b688aa97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 13:51:26 2014 +0100 Dashoard designer: Improved toggling of sizing modes --- web/htdocs/js/dashboard.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index acda275..585fbf5 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -591,6 +591,8 @@ function toggle_sizer(nr, sizer_id) { dashlet.w = GROW; } else if (dashlet.w == GROW) { + if (!(nr in g_last_absolute_widths)) + g_last_absolute_widths[nr] = dashlet_obj.clientWidth / grid_size; dashlet.w = MAX; } else if (dashlet.w == MAX) { @@ -606,6 +608,8 @@ function toggle_sizer(nr, sizer_id) { dashlet.h = GROW; } else if (dashlet.h == GROW) { + if (!(nr in g_last_absolute_heights)) + g_last_absolute_heights[nr] = dashlet_obj.clientHeight / grid_size; dashlet.h = MAX; } else if (dashlet.h == MAX) {

9 years, 10 months

Check_MK Git: check_mk: Added icons to dashboard designer menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b7f18004ce1a50501bfc5dd049f8a1b3c19033f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b7f18004ce1a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 16:57:48 2014 +0100 Added icons to dashboard designer menu --- web/htdocs/dashboard.css | 24 +++++++++----------- web/htdocs/dashboard.py | 13 ++++++----- web/htdocs/images/dashboard_menuarrow.png | Bin 137 -> 452 bytes web/htdocs/images/dashlet_hoststats.png | Bin 0 -> 4042 bytes web/htdocs/images/dashlet_nodata.png | Bin 0 -> 5009 bytes web/htdocs/images/dashlet_pnpgraph.png | Bin 0 -> 2621 bytes web/htdocs/images/dashlet_servicestats.png | Bin 0 -> 5138 bytes web/htdocs/images/dashlet_url.png | Bin 0 -> 1038 bytes .../images/{icon_view.png => dashlet_view.png} | Bin 2203 -> 2203 bytes 9 files changed, 18 insertions(+), 19 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index 1c40968..6db6abf 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -219,7 +219,8 @@ div.dashlet_inner div.stats { #controls a { display: block; - padding: 1px 15px; + padding: 1px 15px 1px 2px; + line-height: 14px; text-align: left; text-decoration: none; } @@ -228,22 +229,19 @@ div.dashlet_inner div.stats { text-decoration: underline; } -#controls li.sublink > a:before { - position: absolute; - left: 7px; - width: 6px; - height: 10px; - margin-top: 3px; - background-image: url(images/dashboard_menuarrow.png); - background-repeat: no-repeat; - content: " "; -} - /* submenu */ #controls ul.sub { bottom: 5px; - right: 210px; + right: 212px; +} + +#controls > li > a > img, +#controls ul.menu > li > a > img { + margin-right: 4px; + vertical-align: middle; + width: 12px; + height: 12px; } /* dashlet controls */ diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 0140280..774fdfe 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -437,8 +437,8 @@ def render_dashboard(name): display = html.var('edit') == '1' and 'block' or 'none' html.write('<li id="control_add" class="sublink" style="display:%s" ' - 'onmouseover="show_submenu(\'control_add\')"><a href="javascript:void(0)">%s</a>\n' % - (display, _('Add dashlet'))) + 'onmouseover="show_submenu(\'control_add\')"><a href="javascript:void(0)">' + '<img src="images/dashboard_menuarrow.png" />%s</a>\n' % (display, _('Add dashlet'))) # The dashlet types which can be added to the view html.write('<ul id="control_add_sub" class="menu sub" style="display:none">\n') @@ -456,7 +456,8 @@ def render_dashboard(name): url = html.makeuri([('type', ty), ('back', html.makeuri([('edit', '1')]))], filename = 'edit_dashlet.py') if 'add_urlfunc' in dashlet_type: url = dashlet_type['add_urlfunc']() - html.write('<li><a href="%s">%s</a></li>\n' % (url, dashlet_type['title'])) + html.write('<li><a href="%s"><img src="images/dashlet_%s.png" />%s</a></li>\n' % + (url, ty, dashlet_type['title'])) html.write('</ul>\n') html.write('</li>\n') @@ -466,7 +467,7 @@ def render_dashboard(name): # html.write('<li><a href="edit_dashboard.py?load_name=%s&back=%s" ' - 'onmouseover="hide_submenus();" >%s</a></li>\n' % + 'onmouseover="hide_submenus();" ><img src="images/trans.png" />%s</a></li>\n' % (name, html.urlencode(html.makeuri([])), _('Properties'))) # @@ -476,7 +477,7 @@ def render_dashboard(name): display = html.var('edit') == '1' and 'block' or 'none' html.write('<li id="control_view" style="display:%s"><a href="javascript:void(0)" ' 'onmouseover="hide_submenus();" ' - 'onclick="toggle_dashboard_edit(false)">%s</a></li>\n' % + 'onclick="toggle_dashboard_edit(false)"><img src="images/trans.png" />%s</a></li>\n' % (display, _('Stop Editing'))) # @@ -485,7 +486,7 @@ def render_dashboard(name): display = html.var('edit') != '1' and 'block' or 'none' html.write('<li id="control_edit" style="display:%s"><a href="javascript:void(0)" ' - 'onclick="toggle_dashboard_edit(true)">%s</a></li>\n' % + 'onclick="toggle_dashboard_edit(true)"><img src="images/trans.png" />%s</a></li>\n' % (display, _('Edit Dashboard'))) html.write("</ul>\n") diff --git a/web/htdocs/images/dashboard_menuarrow.png b/web/htdocs/images/dashboard_menuarrow.png index 359779d..cb84135 100644 Binary files a/web/htdocs/images/dashboard_menuarrow.png and b/web/htdocs/images/dashboard_menuarrow.png differ diff --git a/web/htdocs/images/dashlet_hoststats.png b/web/htdocs/images/dashlet_hoststats.png new file mode 100644 index 0000000..102ec9f Binary files /dev/null and b/web/htdocs/images/dashlet_hoststats.png differ diff --git a/web/htdocs/images/dashlet_nodata.png b/web/htdocs/images/dashlet_nodata.png new file mode 100644 index 0000000..a3b76ba Binary files /dev/null and b/web/htdocs/images/dashlet_nodata.png differ diff --git a/web/htdocs/images/dashlet_pnpgraph.png b/web/htdocs/images/dashlet_pnpgraph.png new file mode 100644 index 0000000..84963ed Binary files /dev/null and b/web/htdocs/images/dashlet_pnpgraph.png differ diff --git a/web/htdocs/images/dashlet_servicestats.png b/web/htdocs/images/dashlet_servicestats.png new file mode 100644 index 0000000..697356a Binary files /dev/null and b/web/htdocs/images/dashlet_servicestats.png differ diff --git a/web/htdocs/images/dashlet_url.png b/web/htdocs/images/dashlet_url.png new file mode 100644 index 0000000..d317683 Binary files /dev/null and b/web/htdocs/images/dashlet_url.png differ diff --git a/web/htdocs/images/icon_view.png b/web/htdocs/images/dashlet_view.png similarity index 100% rename from web/htdocs/images/icon_view.png rename to web/htdocs/images/dashlet_view.png

9 years, 10 months

Check_MK Git: check_mk: #1687 FIX Add visual to dashboard menu can now be closed with click anywhere on page

by Lars Michelsen

Module: check_mk Branch: master Commit: 6c5c3ab75a8986bcda0d1851945d8c3af7af3700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5c3ab75a8986… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 17:57:29 2014 +0100 #1687 FIX Add visual to dashboard menu can now be closed with click anywhere on page --- .werks/1687 | 9 +++++ ChangeLog | 1 + web/htdocs/htmllib.py | 5 +-- web/htdocs/js/checkmk.js | 87 +++++++++++++++++++++++++++++++++++++++------- web/htdocs/pages.css | 31 +++++++++++++++-- web/htdocs/views.css | 26 -------------- 6 files changed, 116 insertions(+), 43 deletions(-) diff --git a/.werks/1687 b/.werks/1687 new file mode 100644 index 0000000..e7a8e15 --- /dev/null +++ b/.werks/1687 @@ -0,0 +1,9 @@ +Title: Add visual to dashboard menu can now be closed with click anywhere on page +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1417798625 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index ec0fc2a..9ae8b6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -177,6 +177,7 @@ * 1678 FIX: Fixed problem with garbled styles on user profile page after saving * 1680 FIX: Fixed various dashlet designer position/resizing issues... * 1683 FIX: Replaced a lot of old GIF images with better looking PNG images + * 1687 FIX: Add visual to dashboard menu can now be closed with click anywhere on page WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index af869fb..9d7740a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -883,10 +883,11 @@ class html: if self.myfile == "view": mode_name = self.var('mode') == "availability" and "availability" or "view" + encoded_vars = self.attrencode([ (k, v != None and v or '') for k,v in self.page_context.items() ]) h += '<div class="visualadd"><a class="visualadd" href="javascript:void(0)" ' \ - 'onclick="toggle_add_to_visual(this, \'%s\', %s, {\'name\': \'%s\'})">' \ + 'onclick="toggle_add_to_visual(event, this, \'%s\', %s, {\'name\': \'%s\'})">' \ '<img class=statusicon src="images/status_add_dashlet.png" title="%s"></a></div>\n' % \ - (mode_name, self.attrencode(self.page_context), self.var('view_name'), _("Add this view to...")) + (mode_name, encoded_vars, self.var('view_name'), _("Add this view to...")) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 04987ef..163dda4 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -156,6 +156,21 @@ function add_event_handler(type, func) { } } +function del_event_handler(type, func) { + if (window.removeEventListener) { + // W3 stadnard browsers + window.removeEventListener(type, func, false); + } + else if (window.detachEvent) { + // IE<9 + document.documentElement.detachEvent("on"+type, func); + } + else { + window["on" + type] = null; + } +} + + function prevent_default_events(event) { if (event.preventDefault) event.preventDefault(); @@ -561,8 +576,8 @@ function create_graph(data, params) { visualadd.title = 'Add to dashboard'; visualadd.setAttribute('class', 'visualadd'); visualadd.onclick = function(host, service, view, source) { - return function() { - toggle_add_to_visual(this, 'pnpgraph', + return function(event) { + toggle_add_to_visual(event, this, 'pnpgraph', { 'host': host, 'service': service }, { 'timerange': view, 'source': source } ); @@ -946,6 +961,8 @@ function folding_step(oImg, state, step) { /* Check if an element has a certain css class. */ function has_class(o, cn) { + if (typeof(o.className) === 'undefined') + return false; var parts = o.className.split(' '); for (x=0; x<parts.length; x++) { if (parts[x] == cn) @@ -2197,9 +2214,9 @@ function toggle_popup(event, id) // Add to Visual -var add_visual_data = null; -var visualadd_popup_id = null; -var visualadd_popup_content = null; +var add_visual_data = null; +var visualadd_popup_id = null; +var visualadd_popup_contents = {}; function close_visualadd_popup() { @@ -2209,10 +2226,31 @@ function close_visualadd_popup() menu.parentNode.removeChild(menu); menu = null; } + visualadd_popup_id = null; } -function toggle_add_to_visual(trigger_obj, element_type, context, params) +// Registerd as click handler on the page while the visualadd menu is opened +// This is used to close the menu when the user clicks elsewhere +function handle_visualadd_close(event) { + var target = getTarget(event); + + // Check whether or not a parent of the clicked node is the popup menu + while (target && target.id != 'visualadd_popup' && !has_class(target, 'statusicon')) { + target = target.parentNode; + } + + if (target) { + return true; // clicked menu or statusicon + } + + close_visualadd_popup(); + del_event_handler('click', handle_visualadd_close); +} + +function toggle_add_to_visual(event, trigger_obj, element_type, context, params) { + if(!event) + event = window.event; var container = trigger_obj.parentNode; var ident; for (var i in container.parentNode.childNodes) { @@ -2230,6 +2268,8 @@ function toggle_add_to_visual(trigger_obj, element_type, context, params) } visualadd_popup_id = ident; + add_event_handler('click', handle_visualadd_close); + menu = document.createElement('div'); menu.setAttribute('id', 'visualadd_popup'); menu.className = "popup_menu"; @@ -2237,22 +2277,43 @@ function toggle_add_to_visual(trigger_obj, element_type, context, params) // populate the menu using a webservice, because the list of dashboards // is not known in the javascript code. But it might have been cached // before. In this case do not perform a second request. - if (visualadd_popup_content !== null) - menu.innerHTML = visualadd_popup_content; + if (ident in visualadd_popup_contents) + menu.innerHTML = visualadd_popup_contents[ident]; else - get_url('ajax_popup_add_visual.py', add_dashboard_response_handler); + get_url('ajax_popup_add_visual.py', add_dashboard_response_handler, [ident, event]); add_visual_data = [ element_type, context, params ]; container.appendChild(menu); + fix_visualadd_menu_position(event, menu); } function add_dashboard_response_handler(data, response_text) { - visualadd_popup_content = response_text; - var popup = document.getElementById('visualadd_popup'); - if (popup) { - popup.innerHTML = response_text; + var ident = data[0]; + var event = data[1]; + visualadd_popup_contents[ident] = response_text; + var menu = document.getElementById('visualadd_popup'); + if (menu) { + menu.innerHTML = response_text; + fix_visualadd_menu_position(event, menu); + } +} + +function fix_visualadd_menu_position(event, menu) { + var target = getTarget(event); + var dashboard = document.getElementById('dashboard'); + + // When menu is out of screen on the right, move to left + if (menu.offsetLeft + menu.clientWidth > pageWidth()) { + menu.style.left = (menu.offsetLeft - menu.clientWidth - 15) + 'px'; + menu.style.right = 'auto'; + } + + // When menu is out of screen on the top, move to bottom + if (menu.offsetTop < 0) { + menu.style.top = (menu.offsetTop + menu.clientHeight) + 'px'; + menu.style.bottom = 'auto'; } } diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 264c98a..8676337 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -931,7 +931,8 @@ div.help tt { padding: 0px 5px 5px 10px; } -body.main table.footer .popup_menu a, .popup_menu span { +body.main table.footer .popup_menu a, +.popup_menu span { display: block; padding-top: 1px; padding-bottom: 1px; @@ -946,7 +947,7 @@ body.main table.footer .popup_menu a, .popup_menu span { margin-top: 8px; } -.popup_menu a:hover { +body.main table.footer .popup_menu a:hover { text-decoration: underline; } @@ -1039,3 +1040,29 @@ table.debug_vars td { font-family: courier, monospace; } +/* Popup for adding to visuals (Dashboard, Reports */ + +div.graph, div.visualadd { + position: relative; +} + +div.visualadd { + display: inline-block; +} + +div.graph a.visualadd { + position: absolute; + top: 10px; + left: 10px; + + display: block; + width: 20px; + height: 20px; + background-image: url(images/button_add_dashlet_lo.png); +} + +div.graph a.visualadd:hover { + background-image: url(images/button_add_dashlet_hi.png); + cursor: pointer; +} + diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 822f9a0..75e1f1d 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -714,29 +714,3 @@ td.invtree table td { background-color: #fff; } -/* Popup for adding to visuals (Dashboard, Reports */ - -div.graph, div.visualadd { - position: relative; -} - -div.visualadd { - display: inline-block; -} - -div.graph a.visualadd { - position: absolute; - top: 10px; - left: 10px; - - display: block; - width: 20px; - height: 20px; - background-image: url(images/button_add_dashlet_lo.png); -} - -div.graph a.visualadd:hover { - background-image: url(images/button_add_dashlet_hi.png); - cursor: pointer; -} -

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits