Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

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: 643f4e9bbdc04f7a00825e2f1400684cec1294b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=643f4e9bbdc04f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 16:31:28 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Allow has_perfdata to be missing in check_info

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2282622d5664023302dd0c422ee062d29548ef5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2282622d56640… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 16:31:27 2012 +0200 Allow has_perfdata to be missing in check_info Default is False. --- modules/check_mk.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 3f03bd2..20e654e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -423,7 +423,7 @@ def output_check_info(): checks_sorted.sort() for check_type, check in checks_sorted: try: - if check["has_perfdata"]: + if check.get("has_perfdata", False): p = tty_green + tty_bold + "yes" + tty_normal else: p = "no" @@ -1604,7 +1604,7 @@ def create_nagios_servicedefs(outfile, hostname): else: used_descriptions[description] = ( checkname, item ) - if check_info[checkname]["has_perfdata"]: + if check_info[checkname].get("has_perfdata", False): template = passive_service_template_perf else: template = passive_service_template

12 years, 5 months

Check_MK Git: check_mk: Fixed some firefox styling issues

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e75011dfabd9406e588a7bbe403760c464f38230 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e75011dfabd940… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:23:45 2012 +0200 Fixed some firefox styling issues --- web/htdocs/wato.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 12f5d06..fb8422b 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -306,12 +306,17 @@ table.validationerror img { padding-top: 1px; padding-bottom: 1px; background-color: #6da1b8; + color: #000; } .wato div.folderpath li:hover select { background-color: #7fb0c6; } +.wato div.folderpath li select option { + background-color: #6da1b8; +} + .wato div.folderpath li div.left, .wato div.folderpath li div.right { position: absolute;

12 years, 5 months

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: c3a33abc2a3b3c744e5af7618c7dde63fc9a2985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a33abc2a3b3c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:23:52 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: Implemented new layout for the breadcrumb navigation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 731ccee2f18a9bc979d472655e7a9c5c74dec7c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=731ccee2f18a9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 24 16:18:44 2012 +0200 WATO: Implemented new layout for the breadcrumb navigation --- web/htdocs/images/breadcrumb_c_hi.png | Bin 0 -> 178 bytes web/htdocs/images/breadcrumb_c_lo.png | Bin 0 -> 178 bytes web/htdocs/images/breadcrumb_l_hi.png | Bin 0 -> 446 bytes web/htdocs/images/breadcrumb_l_lo.png | Bin 0 -> 458 bytes web/htdocs/images/breadcrumb_lm_hi.png | Bin 0 -> 866 bytes web/htdocs/images/breadcrumb_lm_lo.png | Bin 0 -> 866 bytes web/htdocs/images/breadcrumb_r_hi.png | Bin 0 -> 481 bytes web/htdocs/images/breadcrumb_r_lo.png | Bin 0 -> 483 bytes web/htdocs/images/breadcrumb_rm_hi.png | Bin 0 -> 847 bytes web/htdocs/images/breadcrumb_rm_lo.png | Bin 0 -> 887 bytes web/htdocs/wato.css | 99 ++++++++++++++++++++++++++++++- web/htdocs/wato.py | 41 +++++++++++--- 12 files changed, 128 insertions(+), 12 deletions(-) diff --git a/web/htdocs/images/breadcrumb_c_hi.png b/web/htdocs/images/breadcrumb_c_hi.png new file mode 100644 index 0000000..00a02f1 Binary files /dev/null and b/web/htdocs/images/breadcrumb_c_hi.png differ diff --git a/web/htdocs/images/breadcrumb_c_lo.png b/web/htdocs/images/breadcrumb_c_lo.png new file mode 100644 index 0000000..f92e6a2 Binary files /dev/null and b/web/htdocs/images/breadcrumb_c_lo.png differ diff --git a/web/htdocs/images/breadcrumb_l_hi.png b/web/htdocs/images/breadcrumb_l_hi.png new file mode 100644 index 0000000..dc9eaa3 Binary files /dev/null and b/web/htdocs/images/breadcrumb_l_hi.png differ diff --git a/web/htdocs/images/breadcrumb_l_lo.png b/web/htdocs/images/breadcrumb_l_lo.png new file mode 100644 index 0000000..34fc2e8 Binary files /dev/null and b/web/htdocs/images/breadcrumb_l_lo.png differ diff --git a/web/htdocs/images/breadcrumb_lm_hi.png b/web/htdocs/images/breadcrumb_lm_hi.png new file mode 100644 index 0000000..4a29324 Binary files /dev/null and b/web/htdocs/images/breadcrumb_lm_hi.png differ diff --git a/web/htdocs/images/breadcrumb_lm_lo.png b/web/htdocs/images/breadcrumb_lm_lo.png new file mode 100644 index 0000000..4b83a06 Binary files /dev/null and b/web/htdocs/images/breadcrumb_lm_lo.png differ diff --git a/web/htdocs/images/breadcrumb_r_hi.png b/web/htdocs/images/breadcrumb_r_hi.png new file mode 100644 index 0000000..be6b4a4 Binary files /dev/null and b/web/htdocs/images/breadcrumb_r_hi.png differ diff --git a/web/htdocs/images/breadcrumb_r_lo.png b/web/htdocs/images/breadcrumb_r_lo.png new file mode 100644 index 0000000..e9aa000 Binary files /dev/null and b/web/htdocs/images/breadcrumb_r_lo.png differ diff --git a/web/htdocs/images/breadcrumb_rm_hi.png b/web/htdocs/images/breadcrumb_rm_hi.png new file mode 100644 index 0000000..2fb11e8 Binary files /dev/null and b/web/htdocs/images/breadcrumb_rm_hi.png differ diff --git a/web/htdocs/images/breadcrumb_rm_lo.png b/web/htdocs/images/breadcrumb_rm_lo.png new file mode 100644 index 0000000..50e5dfe Binary files /dev/null and b/web/htdocs/images/breadcrumb_rm_lo.png differ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fe20dc6..12f5d06 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -260,9 +260,102 @@ table.validationerror img { /* Path to current folder at top of screen */ .wato div.folderpath { margin-bottom: 10px; + height: 30px; } -.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { +.wato div.folderpath ul { + list-style-type:none; + padding-left:0; +} + +.wato div.folderpath li { + float:left; + display:block; + height:26px; + + position:relative; + + /* spacing for the image divs left/right */ + padding-left: 20px; + padding-right: 20px; + + /* move left border of all items 22px left to make the items overlap */ + margin-left: -13px; + + color: #fff; +} + +.wato div.folderpath li a { + color: #fff; + text-decoration: none; +} + +.wato div.folderpath li div.content { + height: 18px; + background-image: url('images/breadcrumb_c_lo.png'); + + padding:4px 2px; + line-height:18px; +} + +.wato div.folderpath li:hover div.content { + background-image: url('images/breadcrumb_c_hi.png'); +} + +.wato div.folderpath li select { + padding-top: 1px; + padding-bottom: 1px; + background-color: #6da1b8; +} + +.wato div.folderpath li:hover select { + background-color: #7fb0c6; +} + +.wato div.folderpath li div.left, +.wato div.folderpath li div.right { + position: absolute; + width: 20px; + height: 100%; +} + +.wato div.folderpath li div.left { + top: 0; + left: 0; + background-image: url('images/breadcrumb_lm_lo.png'); +} + +.wato div.folderpath li:hover div.left { + background-image: url('images/breadcrumb_lm_hi.png'); +} + +.wato div.folderpath li div.left.end { + background-image: url('images/breadcrumb_l_lo.png'); +} + +.wato div.folderpath li:hover div.left.end { + background-image: url('images/breadcrumb_l_hi.png'); +} + +.wato div.folderpath li div.right { + top: 0; + right: 0; + background-image: url('images/breadcrumb_rm_lo.png'); +} + +.wato div.folderpath li:hover div.right { + background-image: url('images/breadcrumb_rm_hi.png'); +} + +.wato div.folderpath li div.right.end { + background-image: url('images/breadcrumb_r_lo.png'); +} + +.wato div.folderpath li:hover div.right.end { + background-image: url('images/breadcrumb_r_hi.png'); +} + +/*.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { float: left; } @@ -281,14 +374,12 @@ table.validationerror img { font-weight: normal; } .wato div.folderpath a { -/* color: #46c; */ text-decoration: none; } .wato div.folderpath a:hover { color: #fff; background-color: #9bc; - /* text-decoration: underline; */ -} +}*/ .wato select.folderpath { background-color: #8ab; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 680210e..fe2801f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10656,11 +10656,18 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo the_folder = g_folder keepvars = [ (name, html.var(name)) for name in keepvarnames ] + def render_component(folder): return '<a href="%s">%s</a>' % ( html.makeuri_contextless([ ("folder", folder[".path"])] + keepvars), folder["title"]) + def bc_el_start(end = '', z_index = 0): + html.write('<li style="z-index:%d;"><div class="left %s"></div>' % (z_index, end)) + + def bc_el_end(end = ''): + html.write('<div class="right %s"></div></li>' % end) + folders = [] folder = the_folder.get(".parent") while folder: @@ -10670,24 +10677,42 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo parts = [] for folder in folders[::-1]: parts.append(render_component(folder)) + + # The current folder (with link or without link) if link_to_last: parts.append(render_component(the_folder)) else: - parts.append("<b>" + the_folder["title"] + "</b>") + parts.append(the_folder["title"]) - html.write("<div class=folderpath>%s\n" % "<i> / </i>".join(parts)) + # Render the folder path + html.write("<div class=folderpath><ul>\n") + num = 0 + for part in parts: + if num == 0: + bc_el_start('end', z_index = 100 + num) + else: + bc_el_start(z_index = 100 + num) + html.write('<div class=content>%s</div>\n' % part) + bc_el_end() + num += 1 + # Render the current folder when having subfolders subfolders = the_folder[".folders"] if len(subfolders) > 0 and not link_to_last: - html.write("<i> / </i>") - html.write("<form method=GET name=folderpath>") + bc_el_start(z_index = 100 + num) + html.write("<div class=content><form method=GET name=folderpath>") options = [ (sf[".path"], sf["title"]) for sf in subfolders.values() ] - html.sorted_select("folder", [ ("", "") ] + options, onchange="folderpath.submit();", attrs={"class" : "folderpath"}) + html.sorted_select( + "folder", [ ("", "") ] + options, + onchange = "folderpath.submit();", + attrs = {"class" : "folderpath"} + ) for var in keepvarnames: html.hidden_field(var, html.var(var)) - html.write("</form>") - html.write("<div style='clear: both;'></div>") - html.write("</div>") + html.write("</form></div>") + bc_el_end('end') + + html.write("</ul></div>\n") def may_see_hosts(): return config.may("wato.use") and \

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0680, #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a3bb79bea96b792b9f6d1a3ae283fe27ec1b044f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3bb79bea96b79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 12:34:04 2012 +0200 Updated bug entries #0680, #0679 --- .bugs/679 | 2 ++ .bugs/680 | 9 +++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/679 b/.bugs/679 index 5cdd39f..eb27992 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -26,3 +26,5 @@ Traceback (most recent call last): File "/usr/share/check_mk/web/htdocs/valuespec.py", line 633, in from_html_vars indexes[int(indexof)] = n ValueError: invalid literal for int() with base 10: '' + +It also looks that the pickling does not work on this browser. diff --git a/.bugs/680 b/.bugs/680 new file mode 100644 index 0000000..bf43aa0 --- /dev/null +++ b/.bugs/680 @@ -0,0 +1,9 @@ +Title: Logwatch page: hilit OK blockes +Component: checks +State: open +Date: 2012-04-24 12:13:52 +Targetversion: 1.2.0 +Class: todo + +Due to logwatch reclassification, blocks can now have OK state. +This should be hilited green.

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a39dd6a1bb2bad6db307fd69b5e821818f2c39a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a39dd6a1bb2bad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 12:10:07 2012 +0200 Updated bug entries #0679 --- .bugs/679 | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/.bugs/679 b/.bugs/679 new file mode 100644 index 0000000..5cdd39f --- /dev/null +++ b/.bugs/679 @@ -0,0 +1,28 @@ +Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on older Iceweasel +Component: multisite +State: open +Date: 2012-04-24 12:07:14 +Targetversion: 1.2.0 +Class: bug + +On Iceweasel 3.5.16 the rule editor breaks while editing ListOf() +in the logwatch pattern editor. When adding a line, the layout +is broken. When saving, there is the following exception: + + +Internal error nagiosadmin (admin) 00:51 +wato.py?ve_1_0=0&ve_1_1=t&ve_1_2=t&filled_in=rule_editor&host_11=&host_10=&host_13=&host_12=&item=%28dp0%0D%0A.&mode=edit_rule&tagvalue_networking=lan&tagvalue_criticality=prod&rulenr=0&item_14=&save=Save&item_10=&item_11=&item_12=&item_13=&auxtag_tcp=ignore&varname=logwatch_rules&ve_count=2&ve_@_1=&ve_indexof_1=1&ve_indexof_2=&ve_@_2=&host_4=&ve_indexof_@=&folder=monitoring&debug=1&host=&host_2=&rule_folder=monitoring&ve_@_0=0&tagvalue_agent=cmk-agent&host_7=&auxtag_snmp=ignore&tag_networking=ignore&host_1=&host_0=&host_3=&tag_agent=ignore&host_5=&ve_2_2=34t&ve_2_1=t34t&ve_2_0=0&host_9=&host_8=&tag_criticality=ignore&item_6=&item_7=&item_4=&item_5=&item_2=&item_3=&item_0=&item_1=&host_14=&host_6=&new_rule_folder=monitoring&item_8=&item_9= +Internal error:: invalid literal for int() with base 10: '' + +Traceback (most recent call last): + File "/usr/share/check_mk/web/htdocs/index.py", line 312, in handler + handler() + File "/usr/share/check_mk/web/htdocs/wato.py", line 254, in page_handler + result = modefunc("action") + File "/usr/share/check_mk/web/htdocs/wato.py", line 9303, in mode_edit_rule + value = get_edited_value(valuespec) + File "/usr/share/check_mk/web/htdocs/wato.py", line 4593, in get_edited_value + value = valuespec.from_html_vars("ve") + File "/usr/share/check_mk/web/htdocs/valuespec.py", line 633, in from_html_vars + indexes[int(indexof)] = n +ValueError: invalid literal for int() with base 10: ''

12 years, 5 months

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: b91000d372bd0f7beb609061ddb4dc060196ca5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b91000d372bd0f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 24 12:10:09 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: WATO: distributed wato slaves now preserve SiteAttribute host tag

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57c8ad2e132809c368925bf0658737ebeca3f793 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57c8ad2e132809… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 24 00:07:12 2012 +0200 WATO: distributed wato slaves now preserve SiteAttribute host tag --- web/htdocs/wato.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 57a5725..680210e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -638,6 +638,10 @@ def save_hosts(folder = None): value = effective.get(attr.name()) tags.update(attr.get_tag_list(value)) + # Slave sites preserve any SiteAttribute tag + if not is_distributed() and "site" in effective: + tags.update(SiteAttribute().get_tag_list(effective["site"])) + tagstext = "|".join(list(tags)) if tagstext: tagstext += "|"

12 years, 5 months

Check_MK Git: check_mk: Re-implemented move to code for folders in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 515125c74afe488abcf81d4dfe91ee0bd7e018ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=515125c74afe48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 23 15:34:14 2012 +0200 Re-implemented move to code for folders in WATO --- web/htdocs/images/button_move_hi.png | Bin 0 -> 6163 bytes web/htdocs/images/button_move_lo.png | Bin 0 -> 6524 bytes web/htdocs/js/wato.js | 89 +++++++++++++++++++++++++++++----- web/htdocs/wato.css | 42 ++++++++++++++-- web/htdocs/wato.py | 52 +++++++++++++------- 5 files changed, 149 insertions(+), 34 deletions(-) diff --git a/web/htdocs/images/button_move_hi.png b/web/htdocs/images/button_move_hi.png new file mode 100644 index 0000000..19114eb Binary files /dev/null and b/web/htdocs/images/button_move_hi.png differ diff --git a/web/htdocs/images/button_move_lo.png b/web/htdocs/images/button_move_lo.png new file mode 100644 index 0000000..a6445dc Binary files /dev/null and b/web/htdocs/images/button_move_lo.png differ diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index dfa3d4f..16b082b 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -483,23 +483,88 @@ function wato_randomize_secret(id, len) { // Folderlist // ---------------------------------------------------------------------------- -function wato_toggle_folder(oDiv, on) { +function wato_open_folder(event, link) { + if (!event) + event = window.event; + var target = getTarget(event); + if(target.tagName != 'DIV') { + // Skip this event on clicks on other elements than the pure div + return false; + } + + location.href = link; +} + +function wato_toggle_folder(event, oDiv, on) { + if (!event) + event = window.event; + + // Skip mouseout event when moving mouse over a child element of the + // folder element + if (!on) { + var node = event.toElement || event.relatedTarget; + while (node) { + if (node == oDiv) { + return false; + } + node = node.parentNode; + } + } + var obj = oDiv.parentNode; var id = obj.id.substr(7); - var obj_edit = document.getElementById('edit_' + id); - var obj_delete = document.getElementById('delete_' + id); + + var elements = ['edit', 'move', 'delete']; + for(var num in elements) { + var elem = document.getElementById(elements[num] + '_' + id); + if(elem) { + if(on) { + elem.style.display = 'inline'; + } else { + elem.style.display = 'none'; + } + } + } + if(on) { - obj_edit.style.display = 'inline'; - if(obj_delete) - obj_delete.style.display = 'inline'; obj.style.backgroundImage = 'url("images/folder_open.png")'; - } else { - obj_edit.style.display = 'none'; - if(obj_delete) - obj_delete.style.display = 'none'; obj.style.backgroundImage = 'url("images/folder_closed.png")'; + + // Hide the eventual open move dialog + var move_dialog = document.getElementById('move_dialog_' + id); + if(move_dialog) { + move_dialog.style.display = 'none'; + move_dialog = null; + } } - obj_delete = null; - obj_edit = null; + elem = null; + obj = null; +} + +function wato_toggle_move_folder(event, oButton) { + if(!event) + event = window.event; + + var id = oButton.id.substr(5); + var obj = document.getElementById('move_dialog_' + id); + if(obj) { + if(obj.style.display == 'none') { + obj.style.display = 'block'; + } else { + obj.style.display = 'none'; + } + obj = null; + } + + if (event.stopPropagation) + event.stopPropagation(); + event.cancelBubble = true; + + // Disable the default events for all the different browsers + if (event.preventDefault) + event.preventDefault(); + else + event.returnValue = false; + return false; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index caacfa0..fe20dc6 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -315,19 +315,25 @@ table.validationerror img { .wato div.floatfolder .autherr { position: absolute; top: 20px; - right: 20px; + right: 62px; } .wato div.floatfolder .edit { position: absolute; top:20px; - right:42px; + right:54px; +} + +.wato div.floatfolder .move { + position: absolute; + top:20px; + right:32px; } .wato div.floatfolder .delete { position: absolute; top:20px; - right:20px; + right:10px; } .wato div.floatfolder .infos { @@ -356,7 +362,35 @@ table.validationerror img { font-size: 14px; text-decoration: none; position: relative; - top: -3px; + top: -2px; +} + +.wato div.move_dialog { + padding:10px; + background-color: #45829D; + + position: relative; + left:105px; + top:35px; + z-index: 200; + height: 190px; + + width: -moz-max-content; + width: intrinsic; + + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 1px solid #fff; +} + +.wato div.move_dialog select[multiple] { + height: 170px; +} + +.wato div.move_dialog span { + display: block; + margin-bottom: 2px; } .wato div.hoverarea { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7483ec0..57a5725 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1034,25 +1034,19 @@ def show_subfolders(folder): # Am I authorized? auth = check_folder_permissions(entry, "write", False) - html.write('<div class=floatfolder id="folder_%s" onclick="location.href = \'%s\'">' % ( + html.write('<div class=floatfolder id="folder_%s" onclick="wato_open_folder(event, \'%s\');">' % ( entry[".name"], enter_url)) # Only make folder openable when permitted to edit if auth == True: - html.write('<div class=hoverarea ' - 'onmouseover="wato_toggle_folder(this, true);" ' - 'onmouseout="wato_toggle_folder(this, false)">' - '</div>') + html.write( + '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' + 'onmouseout="wato_toggle_folder(event, this, false)">' + ) if auth != True: html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ (htmllib.strip_tags(auth))) - ## Move To - #if may_move_folders: - # html.write("<td>") - # move_to_folder_combo("folder", entry, False) - # html.write("</td>") - html.icon_button( edit_url, _("Edit the properties of this folder"), @@ -1062,6 +1056,23 @@ def show_subfolders(folder): style = 'display:none', ) + may_move_folders = config.may("wato.manage_folders") and \ + check_folder_permissions(g_folder, "write", False) + if may_move_folders: + html.icon_button( + '', # url is replaced by onclick code + _("Move this folder to another place"), + "move", + id = 'move_' + entry['.name'], + cssclass = 'move', + style = 'display:none', + onclick = 'wato_toggle_move_folder(event, this);' + ) + html.write('<div id="move_dialog_%s" class=move_dialog style="display:none">' % entry['.name']) + html.write('<span>%s</span>' % _('Move this folder to:')) + move_to_folder_combo("folder", entry, False, multiple = True) + html.write('</div>') + if config.may("wato.manage_folders"): html.icon_button( delete_url, @@ -1072,11 +1083,12 @@ def show_subfolders(folder): style = 'display:none', ) + # Close the eventuall hoverarea + if auth == True: + html.write('</div>') + html.write('<div class=infos>') - html.write( - 'Hosts: %d<br />' - 'Folders: %d' % (num_hosts_in(entry, recurse=True), len(entry[".folders"])) - ) + html.write('Hosts: %d' % num_hosts_in(entry, recurse=True)) html.write('</div>') title = entry['title'] @@ -1288,12 +1300,16 @@ def show_hosts(folder): return True move_to_folder_combo_cache_id = None -def move_to_folder_combo(what, thing = None, top = False): +def move_to_folder_combo(what, thing = None, top = False, multiple = False): global move_to_folder_combo_cache, move_to_folder_combo_cache_id if move_to_folder_combo_cache_id != id(html): move_to_folder_combo_cache = {} move_to_folder_combo_cache_id = id(html) + select_attrs = {} + if multiple: + select_attrs = {'multiple': '10'} + # In case of a folder move combo, thing is the folder object # we want to move if what == "folder" or id(g_folder) not in move_to_folder_combo_cache: @@ -1330,12 +1346,12 @@ def move_to_folder_combo(what, thing = None, top = False): html.hidden_field("host", thing) uri = html.makeactionuri([("host", thing)]) html.select("_host_move_%s" % thing, selections, "@", - "location.href='%s' + '&_move_host_to=' + this.value;" % uri); + "location.href='%s' + '&_move_host_to=' + this.value;" % uri, attrs = select_attrs); else: # what == "folder" # html.hidden_field("what_folder", thing) uri = html.makeactionuri([("what_folder", thing[".path"])]) html.select("_folder_move_%s" % thing[".path"], selections, "@", - "location.href='%s' + '&_move_folder_to=' + this.value;" % uri); + "location.href='%s' + '&_move_folder_to=' + this.value;" % uri, attrs = select_attrs);

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits