Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

by Roland Halbig

Module: check_mk Branch: master Commit: b41626c6f4313b9f788c975c415ddc95154c1946 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b41626c6f4313b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 14:53:32 2016 +0100 Refactored and tested dashboard. --- web/htdocs/dashboard.py | 112 ++++++++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 46 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index c0c1006..421e017 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -357,7 +357,7 @@ def draw_dashboard(name): html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"]) - html.write("<div id=dashboard class=\"dashboard_%s\">\n" % name) # Container of all dashlets + html.open_div(class_=["dashboard_%s" % name], id_="dashboard") # Container of all dashlets dashlet_javascripts(board) dashlet_styles(board) @@ -424,11 +424,12 @@ dashboard_scheduler(1); def dashlet_error(nr, dashlet, msg): - html.write('<div class="dashlet_inner background err" id="dashlet_inner_%d">' % (nr)) - html.write("<div>") + html.open_div(id_="dashlet_inner_%d" % nr, class_=["dashlet_inner", "background", "err"]) + html.open_div() html.write(_('Problem while rendering dashlet %d of type %s: ') % (nr, dashlet["type"])) - html.write(html.attrencode(msg).replace("\n", "<br>")+"</div>") - html.write("</div>") + html.write(html.attrencode(msg).replace("\n", "<br>")) + html.close_div() + html.close_div() def dashlet_container_begin(nr, dashlet): @@ -438,11 +439,11 @@ def dashlet_container_begin(nr, dashlet): if dashlet_type.get('resizable', True): classes.append('resizable') - html.write('<div class="%s" id="dashlet_%d">' % (' '.join(classes), nr)) + html.open_div(id_="dashlet_%d" % nr, class_=classes) def dashlet_container_end(): - html.write("</div>\n") + html.close_div() def draw_dashlet_content(nr, the_dashlet, wato_folder, stash_html_vars=True): @@ -470,26 +471,29 @@ def dashboard_edit_controls(name, board, dashlet_types): if not config.user.may("general.edit_dashboards"): return - html.write('<ul id="controls" class="menu" style="display:none">\n') + html.open_ul(style="display:none;", class_=["menu"], id_="controls") if board['owner'] != config.user.id: # Not owned dashboards must be cloned before being able to edit. Do not switch to # edit mode using javascript, use the URL with edit=1. When this URL is opened, # the dashboard will be cloned for this user - html.write('<li><a href="%s">%s</a></li>\n' % (html.makeuri([('edit', 1)]), _('Edit Dashboard'))) + html.li(html.render_a(_("Edit Dashboard"), href = html.makeuri([("edit", 1)]))) else: # # Add dashlet menu # - - 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)">' - '<img src="images/dashboard_menuarrow.png" />%s</a>\n' % (display, _('Add dashlet'))) + html.open_li(class_=["sublink"], + id_="control_add", + style="display:%s;" % ("block" if html.var("edit") == '1' else "none"), + onmouseover="show_submenu(\'control_add\');") + html.open_a(href="javascript:void(0)") + html.img("images/dashboard_menuarrow.png") + html.write(_("Add dashlet")) + html.close_a() # The dashlet types which can be added to the view - html.write('<ul id="control_add_sub" class="menu sub" style="display:none">\n') + html.open_ul(style="display:none", class_=["menu", "sub"], id_="control_add_sub") add_existing_view_type = dashlet_types['view'].copy() add_existing_view_type['title'] = _('Existing View') @@ -504,45 +508,57 @@ def dashboard_edit_controls(name, board, dashlet_types): 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"><img src="images/dashlet_%s.png" />%s</a></li>\n' % - (url, ty, dashlet_type['title'])) - html.write('</ul>\n') + html.open_li() + html.open_a(href=url) + html.img("images/dashlet_%s.png" % ty) + html.write(dashlet_type["title"]) + html.close_a() + html.close_li() + html.close_ul() - html.write('</li>\n') + html.close_li() # # Properties link # - - html.write('<li><a href="edit_dashboard.py?load_name=%s&back=%s" ' - 'onmouseover="hide_submenus();" ><img src="images/trans.png" />%s</a></li>\n' % - (name, html.urlencode(html.makeuri([])), _('Properties'))) + html.open_li() + html.open_a(href="edit_dashboard.py?load_name=%s&back=%s" % (name, html.urlencode(html.makeuri([]))), + onmouseover="hide_submenus();") + html.img(src="images/trans.png") + html.write(_('Properties')) + html.close_a() + html.close_li() # # 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)"><img src="images/trans.png" />%s</a></li>\n' % - (display, _('Stop Editing'))) + html.open_li(style="display:%s;" % ("block" if html.var("edit") == '1' else "none"), + id_="control_view") + html.open_a(href="javascript:void(0)", + onclick="toggle_dashboard_edit(false)", + onmouseover="hide_submenus();") + html.img(src="images/trans.png") + html.write(_('Stop Editing')) + html.close_a() + html.close_li() # # Enable editing link # + html.open_li(style="display:%s;" % ("none" if html.var("edit") == '1' else "block"), + id_="control_edit") + html.open_a(href="javascript:void(0)", onclick="toggle_dashboard_edit(true);") + html.img("images/trans.png") + html.write(_('Edit Dashboard')) + html.close_a() + html.close_li() - 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)"><img src="images/trans.png" />%s</a></li>\n' % - (display, _('Edit Dashboard'))) - - html.write("</ul>\n") + html.close_ul() html.icon_button(None, _('Edit the Dashboard'), 'dashboard_controls', 'controls_toggle', onclick = 'void(0)') - html.write("</div>\n") + html.close_div() # Render dashlet custom scripts @@ -556,7 +572,7 @@ def dashlet_javascripts(board): def dashlet_styles(board): styles = '\n'.join([ ty['styles'] for ty in used_dashlet_types(board) if ty.get('styles') ]) if styles: - html.write("<style>\n%s\n</style>\n" % styles) + html.style(styles) def used_dashlet_types(board): @@ -676,12 +692,12 @@ def draw_dashlet(name, board, nr, dashlet, wato_folder): title = '<a href="%s">%s</a>' % (url, _u(title)) else: title = _u(title) - html.write('<div class="title" id="dashlet_title_%d"><span>%s</span></div>' % (nr, title)) + html.div(html.render_span(title), id_="dashlet_title_%d" % nr, class_=["title"]) if dashlet.get("background", True): bg = " background" else: bg = "" - html.write('<div class="dashlet_inner%s" id="dashlet_inner_%d">' % (bg, nr)) + html.open_div(id_="dashlet_inner_%d" % nr, class_="dashlet_inner%s" % bg) # Optional way to render a dynamic iframe URL if "iframe_urlfunc" in dashlet_type: @@ -711,15 +727,19 @@ def draw_dashlet(name, board, nr, dashlet, wato_folder): url = 'about:blank' # Fix of iPad >:-P - html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch;">') - html.write('<iframe id="dashlet_iframe_%d" allowTransparency="true" frameborder="0" width="100%%" ' - 'height="100%%" src="%s"> </iframe>' % (nr, url)) - html.write('</div>') + html.open_div(style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch;") + html.iframe('', src=url, + id_="dashlet_iframe_%d" % nr, + allowTransparency="true", + frameborder="0", + width="100%", + height="100%") + html.close_div() if dashlet.get("reload_on_resize"): html.javascript('reload_on_resize["%d"] = "%s"' % (nr, add_wato_folder_to_url(dashlet["iframe"], wato_folder))) - html.write("</div>") + html.close_div() #. # .--Draw Dashlet--------------------------------------------------------. @@ -932,7 +952,7 @@ def choose_view(name): return except MKUserError, e: - html.write("<div class=error>%s</div>\n" % e) + html.div(e, class_="error") html.add_user_error(e.varname, e) html.begin_form('choose_view') @@ -1119,7 +1139,7 @@ def page_edit_dashlet(): return except MKUserError, e: - html.write("<div class=error>%s</div>\n" % e) + html.div(e, class_="error") html.add_user_error(e.varname, e) html.begin_form("dashlet", method="POST")

7 years, 8 months

Smaller amendments to htmllib generator.

by Roland Halbig

Module: check_mk Branch: master Commit: a52955c1310e400c9931f2979c3afeae01761f8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a52955c1310e40… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 15:10:03 2016 +0100 Smaller amendments to htmllib generator. --- web/htdocs/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9673f00..8187e9b 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -353,7 +353,7 @@ class HTMLGenerator(OutputFunnel): # these tags can be called by their tag names, e.g. 'self.title(content)' - _shortcut_tags = set(['title', 'h1', 'h2', 'h3', 'th', 'tr', 'td', 'center', 'pre',\ + _shortcut_tags = set(['title', 'h1', 'h2', 'h3', 'th', 'tr', 'td', 'center', 'pre', 'style', 'iframe',\ 'div', 'p', 'span', 'canvas', 'strong', 'sub', 'tt', 'u', 'i', 'b']) # these tags can be called by open_name(), close_name() and render_name(), e.g. 'self.open_html()' @@ -530,7 +530,7 @@ class HTMLGenerator(OutputFunnel): 'onclick', 'onsubmit', 'onmouseover', 'onmouseout', 'onfocus', 'value', \ 'content', 'href', 'http-equiv', 'rel', 'for', 'title', 'target',\ 'align', 'valign', 'style', 'width', 'height', 'colspan', 'data-role',\ - 'cellspacing', 'cellpadding', 'border'], key + 'cellspacing', 'cellpadding', 'border', 'allowTransparency', 'frameborder'], key for k, v in attrs.iteritems(): if v is None: continue

7 years, 8 months

Fixed bug in autorefactor.

by Roland Halbig

Module: check_mk Branch: master Commit: 8c79627c3052e596d8ba73f4695fe2debf81f739 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c79627c3052e5… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 14:53:09 2016 +0100 Fixed bug in autorefactor. --- tests/web/auto_refactor.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tests/web/auto_refactor.py b/tests/web/auto_refactor.py index 144ed74..80938a4 100644 --- a/tests/web/auto_refactor.py +++ b/tests/web/auto_refactor.py @@ -67,6 +67,17 @@ def split_html(text): index += 1 return text[:index], text[index:] + +def stripper(x): + x = re.sub(r' %\s+$.*', '', x) + index = len(x) - 1 + while index >= 0 and x[index] in ['n', ' ', ')', '"', '\'']: + if x[index] == 'n' and index > 0 and x[index - 1] == '\\': + index -= 1 + index -= 1 + return x[:index+1] + + # this function does a big chunk of the refactoring for me def replace_tags(html, indent = 0): @@ -81,6 +92,9 @@ def replace_tags(html, indent = 0): html, rest = split_html(html) orig_html = html + # strip all comments + html = re.sub(r'#.*', '', html) + if len(html.split(" % ")) == 2: html, string_input = html.split(" % ") string_input = string_input.lstrip("(").rstrip("$").rstrip("\n").rstrip(' ').rstrip(")") @@ -93,7 +107,7 @@ def replace_tags(html, indent = 0): return orig_html + rest inbetween = re.split(r'<[^<]*>', re.sub(r'\s*html\.write\([\'|"]?', '', html, 1)) - inbetween[-1] = ''.join(list(reversed(re.sub(r'\n$["|\']', '', ''.join(list(reversed(inbetween[-1]))), count=1)))) + inbetween = map(stripper, inbetween) html = orig_html + "\n(new)" @@ -115,7 +129,7 @@ def replace_tags(html, indent = 0): if not skip_next and inbetween[counter].strip(' ') not in ['', '\n']: html = append_to_html(html, indent, "html.write(%s)" % inbetween[counter]) - return html + rest + "\n(/new)" + return html + "\n(/new)" + rest import re

7 years, 8 months

Fixed timeline highliting bug.

by Roland Halbig

Module: check_mk Branch: master Commit: c093901a726bc4d31d173bc881a4e81173600c1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c093901a726bc4… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 13:29:13 2016 +0100 Fixed timeline highliting bug. --- web/htdocs/js/checkmk.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index fb787ab..cf66a52 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2606,7 +2606,7 @@ function host_tag_update_value(prefix, grp) { function timeline_hover(td, row_nr, onoff) { - var timeline_bar_table = td.parentNode.parentNode.parentNode; + var timeline_bar_table = td.parentNode.parentNode.parentNode.parentNode; var events_table = timeline_bar_table.nextElementSibling; var row = events_table.children[0].children[row_nr+1]; if (onoff)

7 years, 8 months

Got old refactoring of crashreporting

by Roland Halbig

Module: check_mk Branch: master Commit: 6057563a0171826fc7305dd1ebfc1a3f3595c50d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6057563a017182… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 13:10:20 2016 +0100 Got old refactoring of crashreporting --- web/htdocs/crash_reporting.py | 158 +++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 88 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6057563a01…

7 years, 8 months

Fixed missing import in forms.

by Roland Halbig

Module: check_mk Branch: master Commit: 887c5b6dac3e6c8afe2fbe25538d79b95199dae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=887c5b6dac3e6c… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 12:43:36 2016 +0100 Fixed missing import in forms. --- web/htdocs/forms.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 12cf6d8..72432d1 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -24,6 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +from htmllib import HTML from lib import * # A input function with the same call syntax as htmllib.textinput()

7 years, 8 months

Updated test tools for refactoring

by Roland Halbig

Module: check_mk Branch: master Commit: 555d75c1be79c9ee607c2cb365444763df935a9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=555d75c1be79c9… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 17:34:45 2016 +0200 Updated test tools for refactoring --- tests/web/auto_build_test.py | 29 ++++++++++++++++++++++++----- tests/web/classes.py | 12 ++++++++++++ tests/web/tools.py | 2 +- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/tests/web/auto_build_test.py b/tests/web/auto_build_test.py index ad51128..d236741 100644 --- a/tests/web/auto_build_test.py +++ b/tests/web/auto_build_test.py @@ -29,7 +29,7 @@ from bs4 import BeautifulSoup as bs # internal imports from classes import HTMLOrigTester, HTMLCheck_MKTester -from tools import compare_html , gentest, compare_and_empty +from tools import compare_html, gentest, compare_and_empty ''' function_start = lambda x: ''' @@ -67,15 +67,27 @@ if __name__ == "__main__": exit(0) counter = 0 + indent = ' ' * 4 with open(autotest_filename, 'w') as auto: auto.write(header) with open(sys.argv[1], 'r') as diff: + + old_line = [] + new_line = [] + for line in diff: + line = line[0] + line[1:].lstrip(' ') + if re.match(r'@@.*', line): if counter > 0: + auto.write(indent + indent.join(old_line)) + auto.write(indent + indent.join(new_line)) + auto.write("\n\n") auto.write(function_end) + old_line = [] + new_line = [] auto.write(function_start(counter)) counter += 1 continue @@ -87,21 +99,28 @@ if __name__ == "__main__": continue if not re.match(r'[+|-].+', line) and line[0] not in ['+', '-']: - auto.write(line[1:]) + old_line.append(line[1:]) + new_line.append(line[1:]) elif re.match(r'[+]{3}.*', line) or re.match(r'[-]{3}.*', line): continue elif re.match(r'[-]\s*html\..*', line): pattern = re.compile(r'[-]\s*html\.') - auto.write(re.sub(r'\s*html\.', ' old.', line[1:], count=1)) + old_line.append(re.sub(r'\s*html\.', 'old.', line[1:], count=1)) elif re.match(r'[+]\s*html\..*', line): pattern = re.compile(r'\s*html\.') - auto.write(pattern.sub(' new.', line[1:], count=1)) + new_line.append(pattern.sub('new.', line[1:], count=1)) + + elif re.match(r'[-].*', line): + old_line.append(line[1:]) + + elif re.match(r'[+].*', line): + new_line.append(line[1:]) else: - auto.write(line[1:]) + print line if(counter > 0): auto.write(function_end) diff --git a/tests/web/classes.py b/tests/web/classes.py index 6da3e1d..8e3b88f 100644 --- a/tests/web/classes.py +++ b/tests/web/classes.py @@ -50,6 +50,7 @@ class DeprecatedRenderer(object): self.enable_debug = False self.screenshotmode = False + self.have_help = False self.help_visible = False self.body_classes = ['main'] @@ -125,6 +126,17 @@ class DeprecatedRenderer(object): self._dump_get_vars() + # Embed help box, whose visibility is controlled by a global + # button in the page. + def help(self, text): + if text and text.strip(): + self.have_help = True + self.write('<div class=help style="display: %s">' % ( + not self.help_visible and "none" or "block")) + self.write(text.strip()) + self.write('</div>') + + # # HTML form rendering # diff --git a/tests/web/tools.py b/tests/web/tools.py index 5d65476..ede4c5e 100644 --- a/tests/web/tools.py +++ b/tests/web/tools.py @@ -130,7 +130,7 @@ def compare_soup(html1, html2): if key.startswith("on") or key == "style": val1 = filter(lambda x: x, map(lambda x: unify_attrs(x).strip(' '), attrs1.pop(key, '').split(';'))) val2 = filter(lambda x: x, map(lambda x: unify_attrs(x).strip(' '), attrs2.pop(key, '').split(';'))) - assert val1 == val2, '\n%s\n%s' % (attrs1, attrs2) + assert val1 == val2, '\n%s\n%s' % (val1, val2) assert attrs1 == attrs2, '\n%s\n%s' % (d1, d2)

7 years, 8 months

Refctored WATO

by Roland Halbig

Module: check_mk Branch: master Commit: d6458e6f27ee0bf2b5e67ace0e7df18d0494ad35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6458e6f27ee0b… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Oct 25 12:05:27 2016 +0200 Refctored WATO --- web/htdocs/htmllib.py | 4 +- web/htdocs/wato.py | 1261 ++++++++++++++++++++++++++++--------------------- 2 files changed, 713 insertions(+), 552 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d6458e6f27…

7 years, 8 months

Fixed checkbox bug in forms.

by Roland Halbig

Module: check_mk Branch: master Commit: a6391c5440db7f732e68d8da3362da0fa9742253 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6391c5440db7f… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Mon Oct 31 12:23:36 2016 +0100 Fixed checkbox bug in forms. --- web/htdocs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 7d6027b..12cf6d8 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -274,7 +274,7 @@ def section(title = None, checkbox = None, id = None, simple=False, hide = False html.close_div() if checkbox: html.open_div(class_="checkbox") - if type(checkbox) == str: + if type(checkbox) in [str, unicode, HTML]: html.write(checkbox) else: name, active, attrname = checkbox

7 years, 8 months

Some bugfixes in html class.

by Roland Halbig

Module: check_mk Branch: master Commit: 00fa8cf5dceaf4c6b12dfd3ed3a660be55d3ec87 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00fa8cf5dceaf4… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Fri Oct 28 17:33:48 2016 +0200 Some bugfixes in html class. --- web/htdocs/htmllib.py | 52 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 153b721..4454daf 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -349,15 +349,17 @@ class HTMLGenerator(OutputFunnel): non HtML relevant signs '&', '<', '>' and '"'. """ + # TODO: Replace u, i, b with underline, italic, bold, usw. + + # these tags can be called by their tag names, e.g. 'self.title(content)' _shortcut_tags = set(['title', 'h1', 'h2', 'h3', 'th', 'tr', 'td', 'center',\ - 'div', 'p', 'span', 'canvas', 'strong', 'sub', 'tt', 'u']) + 'div', 'p', 'span', 'canvas', 'strong', 'sub', 'tt', 'u', 'i', 'b']) # these tags can be called by open_name(), close_name() and render_name(), e.g. 'self.open_html()' _tag_names = set(['html', 'head', 'body', 'header', 'footer', 'a', 'b',\ 'script', 'form', 'button', 'p', 'select', 'pre',\ - 'table', 'row', 'ul', 'li', 'br', 'nobr', 'input',\ - 'tt']) + 'table', 'tbody', 'row', 'ul', 'li', 'br', 'nobr', 'input']) # Of course all shortcut tags can be used as well. _tag_names.update(_shortcut_tags) @@ -565,7 +567,7 @@ class HTMLGenerator(OutputFunnel): def _render_content_tag(self, tag_name, tag_content, **attrs): tag = '' - if not tag_content: + if tag_content in ['', None]: tag = "%s</%s>" % (self._render_opening_tag(tag_name, **attrs), tag_name) elif isinstance(tag_content, HTML): tag = "%s%s</%s>" % (self._render_opening_tag(tag_name, **attrs).rstrip('\n'), @@ -616,6 +618,7 @@ class HTMLGenerator(OutputFunnel): return lambda content, **attrs: HTML(self._render_content_tag(tag_name, content, **attrs)) else: + # FIXME: This returns None, which is not a very informative error message return object.__getattribute__(self, name) # @@ -658,6 +661,10 @@ class HTMLGenerator(OutputFunnel): self.write(self._render_opening_tag('a', **attrs)) + def render_a(self, content, href, **attrs): + attrs['href'] = href + return HTML(self._render_content_tag('a', content, **attrs)) + def a(self, content, href, **attrs): attrs['href'] = href self.write(self._render_content_tag('a', content, **attrs)) @@ -681,6 +688,11 @@ class HTMLGenerator(OutputFunnel): self.write(self._render_content_tag('script', '', type_="text/javascript", src='js/%s.js' % name)) + def render_img(self, src, **attrs): + attrs['src'] = src + return HTML(self._render_opening_tag('img', close_tag=True, **attrs)) + + def img(self, src, **attrs): attrs['src'] = src self.write(self._render_opening_tag('img', close_tag=True, **attrs)) @@ -795,6 +807,7 @@ class HTMLCheck_MK(HTMLGenerator): self.render_headfoot = True self.enable_debug = False self.screenshotmode = False + self.have_help = False self.help_visible = False # browser options @@ -940,6 +953,20 @@ class HTMLCheck_MK(HTMLGenerator): self._dump_get_vars() + # Embed help box, whose visibility is controlled by a global + # button in the page. + + # TODO: Add to integration tests!!! + + def help(self, text): + if text and text.strip(): + self.have_help = True + self.open_div(class_="help", style="display: %s;" % ( + "block" if self.help_visible else "none")) + # TODO: Replace with write_text??? + self.write(text.strip()) + self.close_div() + # # HTML form rendering # @@ -949,12 +976,16 @@ class HTMLCheck_MK(HTMLGenerator): raise NotImplementedError() + + #FIXME: Change order of input arguments in one: icon and render_icon!! + def icon(self, help, icon, **kwargs): #TODO: Refactor title = help + icon_name = icon - self.write(self.render_icon(icon_name=icon, help=title, **kwargs)) + self.write(self.render_icon(icon_name=icon_name, help=title, **kwargs)) def empty_icon(self): @@ -1160,7 +1191,6 @@ class html(DeprecationWrapper): self._request_timeout = 110 # seconds # Settings - self.have_help = False self.io_error = False self.mobile = False self.buffering = True @@ -2152,16 +2182,6 @@ class html(DeprecationWrapper): "<a href=\"%s\">in the global settings</a>.") % url)) - # Embed help box, whose visibility is controlled by a global - # button in the page. - def help(self, text): - if text and text.strip(): - self.have_help = True - self.write('<div class=help style="display: %s">' % ( - not self.help_visible and "none" or "block")) - self.write(text.strip()) - self.write('</div>') - def _dump_get_vars(self): self.begin_foldable_container("html", "debug_vars", True, _("GET/POST variables of this page")) self.debug_vars(hide_with_mouse = False)

7 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016