Checkmk git commits April 2012

checkmk-commits@lists.checkmk.com

2 participants
184 discussions

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

Check_MK Git: check_mk: WATO: fix page header after confirmation dialogs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42b3daa19e39f8d879091a940a953cf799cb7595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42b3daa19e39f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 20 10:15:02 2012 +0200 WATO: fix page header after confirmation dialogs --- ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b247a9..0ca4f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ WATO: * Reimplemented folder listing in host/folders module + * FIX: fix page header after confirmation dialogs 1.2.0b2: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b5cced0..7483ec0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10620,7 +10620,8 @@ def make_action_link(vars): # Show confirmation dialog, send HTML-header if dialog is shown. def wato_confirm(html_title, message): - wato_html_head(html_title) + if not html.has_var("_do_confirm") and not html.has_var("_do_actions"): + wato_html_head(html_title) return html.confirm(message) def wato_html_head(title):

12 years, 5 months

Check_MK Git: check_mk: FIX: fix bug in SNMP info handling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d8219df0cee9f0e4ba27265c1a53216154a29c1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8219df0cee9f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 20 09:24:09 2012 +0200 FIX: fix bug in SNMP info handling --- ChangeLog | 4 ++++ modules/check_mk_base.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f30f09..3b247a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ 1.2.0b3: + Core: + * FIX: fixed SNMP info declaration in checks: could be garbled + up in rare cases + Multisite: * FIX: allow web plugins to be byte compiled (*.pyc). Those are preferred over *.py if existing diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 2054205..59c49f7 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -801,7 +801,7 @@ def convert_check_info(): # Now gather snmp_info and snmp_scan_function back to the # original arrays. Note: these information is tied to a "agent section", # not to a check. Several checks may use the same SNMP info and scan function. - for info in check_info.values(): + for check_type, info in check_info.iteritems(): basename = check_type.split(".")[0] if info["snmp_info"] and basename not in snmp_info: snmp_info[basename] = info["snmp_info"]

12 years, 5 months

Check_MK Git: check_mk: WATO: Better layout of buttons in host table

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eb603b3bc4e9f049e98ce9bd3c0fd8319c8530be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb603b3bc4e9f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 19:30:15 2012 +0200 WATO: Better layout of buttons in host table --- web/htdocs/wato.css | 19 +++++++++++ web/htdocs/wato.py | 87 ++++++++++++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 38 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 23b3c0f..caacfa0 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -72,6 +72,9 @@ Boston, MA 02110-1301 USA. border-right-style: none; -moz-border-radius: 0px 4px 0px 0px; } +.wato td.right { + text-align: right; +} /* WATO configuration forms */ .wato table.form { @@ -238,6 +241,22 @@ table.validationerror img { margin-right: 15px; } +/* bulk actions in host table */ +.wato td.bulkactions { + text-align: right; +} + +.wato table.data tr.data td.bulksearch { + text-align right; + padding-right: 0px; +} + +.wato td.bulksearch input[type=text] { + width: 142px; + margin-right: 5px; +} + + /* Path to current folder at top of screen */ .wato div.folderpath { margin-bottom: 10px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ca3a6e4..b5cced0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1098,44 +1098,28 @@ def show_hosts(folder): return False html.write("<h3>" + _("Hosts") + "</h3>") - html.begin_form("search") - html.text_input("search") - html.button("_search", _("Search")) - html.set_focus("search") - html.hidden_fields() - html.end_form() - html.write("<p>") - hostnames = folder[".hosts"].keys() hostnames.sort() + search_text = html.var("search") - # Show table of hosts in this folder - colspan = 5 - html.begin_form("hosts", None, "POST", onsubmit = 'add_row_selections(this);') - html.write("<table class=data>\n") - html.write("<tr><th class=left></th><th></th><th>" - + _("Hostname") + "</th><th>" - + _("Auth") + "</th>") - if not config.wato_hide_hosttags: - html.write("<th>" + _("Tags") + "</th>") - - for attr, topic in host_attributes: - if attr.show_in_table(): - html.write("<th>%s</th>" % attr.title()) - colspan += 1 - - if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): - html.write("<th class=right>" + _("Move To") + "</th>") - colspan += 1 - html.write("</tr>\n") - odd = "odd" - - def bulk_actions(at_least_one_imported, top = False): + # Helper function for showing bulk actions. This is needed at the bottom + # of the table of hosts and - if there are more than just a few - also + # at the top of the table. + def bulk_actions(at_least_one_imported, top, colspan): # bulk actions - html.write('<tr class="data %s0">' % odd) - html.write("<td colspan=%d>" % colspan) + html.write('<tr class="data odd0">') + html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') - html.write(' ' + _("On all selected hosts:\n")) + 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")) if config.may("wato.manage_hosts"): html.button("_bulk_delete", _("Delete")) if config.may("wato.edit_hosts"): @@ -1149,7 +1133,9 @@ def show_hosts(folder): html.button("_bulk_movetotarget", _("Move to Target Folders")) html.write("</td></tr>\n") - search_text = html.var("search") + # Show table of hosts in this folder + html.begin_form("hosts", None, "POST", onsubmit = 'add_row_selections(this);') + html.write("<table class=data>\n") # Remember if that host has a target folder (i.e. was imported with # a folder information but not yet moved to that folder). If at least @@ -1169,11 +1155,36 @@ def show_hosts(folder): if num == 11: more_than_ten_items = True + # Compute colspan for bulk actions + colspan = 5 + for attr, topic in host_attributes: + if attr.show_in_table(): + colspan += 1 + if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + colspan += 1 + # Add the bulk action buttons also to the top of the table when this # list shows more than 10 rows if more_than_ten_items and \ (config.may("wato.edit_hosts") or config.may("wato.manage_hosts")): - bulk_actions(at_least_one_imported, top = True) + bulk_actions(at_least_one_imported, True, colspan) + + # Header line + html.write("<tr><th class=left></th><th></th><th>" + + _("Hostname") + "</th><th>" + + _("Auth") + "</th>") + if not config.wato_hide_hosttags: + html.write("<th>" + _("Tags") + "</th>") + + for attr, topic in host_attributes: + if attr.show_in_table(): + html.write("<th>%s</th>" % attr.title()) + + if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): + html.write("<th class=right>" + _("Move To") + "</th>") + + html.write("</tr>\n") + odd = "odd" host_errors = validate_all_hosts(hostnames) # Now loop again over all hosts and display them @@ -1260,13 +1271,13 @@ def show_hosts(folder): # Move to if config.may("wato.edit_hosts") and config.may("wato.move_hosts"): - html.write("<td>") + html.write("<td class=right>") move_to_folder_combo("host", hostname) html.write("</td>\n") html.write("</tr>\n") if config.may("wato.edit_hosts") or config.may("wato.manage_hosts"): - bulk_actions(at_least_one_imported) + bulk_actions(at_least_one_imported, False, colspan) html.write("</table>\n") html.hidden_fields() @@ -1306,7 +1317,7 @@ def move_to_folder_combo(what, thing = None, top = False): if len(selections) > 1: if thing == None: - html.button("_bulk_move", _("Move To:")) + html.button("_bulk_move", _("Move:")) field_name = 'bulk_moveto' if top: field_name = '_top_bulk_moveto'

12 years, 5 months

Check_MK Git: check_mk: Small layout fixed in new folder style

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c4d8c115e294b906590962f2c2d90cf96caebcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c4d8c115e294b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 19 19:02:55 2012 +0200 Small layout fixed in new folder style --- web/htdocs/js/wato.js | 3 ++- web/htdocs/wato.css | 19 +++++++++++++++---- web/htdocs/wato.py | 12 ++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index ad3e879..dfa3d4f 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -483,7 +483,8 @@ function wato_randomize_secret(id, len) { // Folderlist // ---------------------------------------------------------------------------- -function folder_toggle(obj, on) { +function wato_toggle_folder(oDiv, on) { + var obj = oDiv.parentNode; var id = obj.id.substr(7); var obj_edit = document.getElementById('edit_' + id); var obj_delete = document.getElementById('delete_' + id); diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 84fa765..23b3c0f 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -302,20 +302,20 @@ table.validationerror img { .wato div.floatfolder .edit { position: absolute; top:20px; - left:20px; + right:42px; } .wato div.floatfolder .delete { position: absolute; top:20px; - left:42px; + right:20px; } .wato div.floatfolder .infos { position: absolute; - top: 85px; + bottom: 29px; left: 20px; - color: #fff; + color: #bde; } .wato div.floatfolder .title { @@ -336,6 +336,17 @@ table.validationerror img { color: #fff; font-size: 14px; text-decoration: none; + position: relative; + top: -3px; +} + +.wato div.hoverarea { + width: 154px; + height: 40px; + position: relative; + top: 4px; + left: 10px; + z-index: 100; } .wato div.floatfolder:hover { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 33efbb8..ca3a6e4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1034,14 +1034,14 @@ def show_subfolders(folder): # Am I authorized? auth = check_folder_permissions(entry, "write", False) - html.write('<div class=floatfolder onclick="location.href = \'%s\'" ' % enter_url) + html.write('<div class=floatfolder id="folder_%s" onclick="location.href = \'%s\'">' % ( + entry[".name"], enter_url)) # Only make folder openable when permitted to edit if auth == True: - html.write( - 'onmouseover="folder_toggle(this, true);" ' - 'onmouseout="folder_toggle(this, false)" id="folder_%s"' % entry['.name'] - ) - html.write('>') + html.write('<div class=hoverarea ' + 'onmouseover="wato_toggle_folder(this, true);" ' + 'onmouseout="wato_toggle_folder(this, false)">' + '</div>') if auth != True: html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \

12 years, 5 months

Check_MK Git: check_mk: Implemented new folder listing code in WATO host/ folders - move-to is not working for the moment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01b55e2b9af325506017a56a78f287e2231b0d32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01b55e2b9af325… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 17:36:18 2012 +0200 Implemented new folder listing code in WATO host/folders - move-to is not working for the moment --- ChangeLog | 3 + web/htdocs/htmllib.py | 9 ++- web/htdocs/images/folder_closed.png | Bin 0 -> 3699 bytes web/htdocs/images/folder_hi.png | Bin 0 -> 8311 bytes web/htdocs/images/folder_open.png | Bin 0 -> 3615 bytes web/htdocs/js/wato.js | 24 ++++++ web/htdocs/wato.css | 69 ++++++++++++++++++ web/htdocs/wato.py | 135 ++++++++++++++-------------------- 8 files changed, 158 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=01b55e2b9a…

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: 9d7178ebfd4e97c19277ccd21a595048d0815e47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d7178ebfd4e97… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 19 17:41:59 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2012