Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Open Command tab if checkboxes are shown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c5164c9ddac6bb182eefbd7fe13501d17c34c48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5164c9ddac6b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:41:43 2011 +0200 Open Command tab if checkboxes are shown --- web/htdocs/views.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b3cc56d..e75f778 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1270,20 +1270,20 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if need_navi: html.write("<table class=navi><tr>\n") + # Painter-Options + if 'D' in display_options and len(painter_options) > 0 and config.may("painter_options"): + toggle_button("painter_options", False, _("Display")) + html.write("<td class=minigap></td>\n") + # Filter-button if 'F' in display_options and len(show_filters) > 0: filter_isopen = html.var("search", "") == "" and view["mustsearch"] toggle_button("table_filter", filter_isopen, _("Filter"), ["filter"]) html.write("<td class=minigap></td>\n") - # Command-button + # Command-button, open command form if checkboxes are currently shown if 'C' in display_options and len(rows) > 0 and config.may("act"): - toggle_button("table_actions", False, _("Commands")) - html.write("<td class=minigap></td>\n") - - # Painter-Options - if 'D' in display_options and len(painter_options) > 0 and config.may("painter_options"): - toggle_button("painter_options", False, _("Display")) + toggle_button("table_actions", show_checkboxes, _("Commands")) html.write("<td class=minigap></td>\n") # Buttons for view options @@ -1369,8 +1369,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if 'C' in display_options: show_action_form(True, datasource) - elif 'C' in display_options: - show_action_form(False, datasource) + elif 'C' in display_options: # (display open, if checkboxes are currently shown) + show_action_form(show_checkboxes, datasource) if need_navi: if 'O' in display_options and len(painter_options) > 0 and config.may("painter_options"):

13 years

Check_MK Git: check_mk: Do not display any tabs during command confirmation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 96d2defbe8ddf3526701b1683c6162a22f20c979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96d2defbe8ddf3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 17:38:02 2011 +0200 Do not display any tabs during command confirmation --- web/htdocs/views.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8d64461..b3cc56d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1260,7 +1260,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if show_buttons and 'B' in display_options: show_context_links(view, hide_filters) - need_navi = show_buttons and ( + need_navi = show_buttons and \ + not html.do_actions() and ( 'D' in display_options or 'F' in display_options or 'C' in display_options or @@ -1270,13 +1271,13 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.write("<table class=navi><tr>\n") # Filter-button - if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): + if 'F' in display_options and len(show_filters) > 0: filter_isopen = html.var("search", "") == "" and view["mustsearch"] toggle_button("table_filter", filter_isopen, _("Filter"), ["filter"]) html.write("<td class=minigap></td>\n") # Command-button - if 'C' in display_options and len(rows) > 0 and config.may("act") and not html.do_actions(): + if 'C' in display_options and len(rows) > 0 and config.may("act"): toggle_button("table_actions", False, _("Commands")) html.write("<td class=minigap></td>\n") @@ -1288,7 +1289,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and config.may("act") and not html.do_actions() and layout["checkboxes"]: + if 'C' in display_options and config.may("act") and layout["checkboxes"]: if show_checkboxes: addclass = " selected" title = _("Hide check boxes") @@ -1346,7 +1347,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru html.write("</table><table class=navi><tr>\n") # Filter form - if 'F' in display_options and len(show_filters) > 0 and not html.do_actions(): + if 'F' in display_options and len(show_filters) > 0: show_filter_form(filter_isopen, show_filters) # Actions @@ -2176,7 +2177,7 @@ def do_actions(view, what, rows, backurl): return False # no actions done # Handle optional row filter based on row selections - if html.var('selected_rows', '') != '': + if html.has_var('selected_rows'): selected_rows = html.var('selected_rows') action_rows = [] for row in rows:

13 years

Check_MK Git: check_mk: Suppress Checkboxes in single layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8cbe1b99baeec582c6f7f419e5567c28d9df437f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cbe1b99baeec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:47:47 2011 +0200 Suppress Checkboxes in single layout --- web/htdocs/views.py | 2 +- web/plugins/views/layouts.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 01dcf17..8d64461 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1288,7 +1288,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and config.may("act") and not html.do_actions(): + if 'C' in display_options and config.may("act") and not html.do_actions() and layout["checkboxes"]: if show_checkboxes: addclass = " selected" title = _("Hide check boxes") diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index a174a01..d9c4989 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -77,7 +77,8 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig multisite_layouts["dataset"] = { "title" : _("Single dataset"), "render" : render_single_dataset, - "group" : False + "group" : False, + "checkboxes" : False, } # ------------------------------------------------------------------------- @@ -202,7 +203,8 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show multisite_layouts["boxed"] = { "title" : _("Balanced boxes"), "render" : render_grouped_boxes, - "group" : True + "group" : True, + "checkboxes" : True, } # ------------------------------------------------------------------------- @@ -292,7 +294,9 @@ multisite_layouts["tiled"] = { "title" : _("Tiles"), "render" : render_tiled, "group" : True, + "checkboxes" : True, } + # ------------------------------------------------------------------------- # _____ _ _ # |_ _|_ _| |__ | | ___ @@ -434,4 +438,5 @@ multisite_layouts["table"] = { "title" : _("Table"), "render" : render_grouped_list, "group" : True, + "checkboxes" : True, }

13 years

Check_MK Git: check_mk: Multisite: Add Checkboxes to tiled/boxed layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1e398f2569178e0e1077ecc842b1988b3bbdf6c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e398f2569178e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:42:06 2011 +0200 Multisite: Add Checkboxes to tiled/boxed layout --- web/plugins/views/layouts.py | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index fdf7b26..a174a01 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -30,6 +30,16 @@ def init_rowselect(): return html.init_rowselect() +def render_checkbox(view, row, num_tds): + # value contains the number of columns of this datarow. This is + # needed for hiliting the correct number of TDs + html.write("<input type=checkbox name=\"%s\" value=%d />" % (row_id(view, row), num_tds)) + +def render_checkbox_td(view, row, num_tds): + html.write("<td class=checkbox>") + render_checkbox(view, row, num_tds) + html.write("</td>") + # ------------------------------------------------------------------------- # ____ _ _ # / ___|(_)_ __ __ _| | ___ @@ -142,6 +152,8 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show # paint table headers, if configured if paintheader: html.write("<tr>") + if show_checkboxes: + html.write("<th></th>") for p in painters: paint_header(view, p) html.write("\n") @@ -159,8 +171,10 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show state = row.get("host_state", 0) if state > 0: state +=1 # 1 is critical for hosts html.write('<tr class="data %s%d">' % (trclass, state)) + if show_checkboxes: + render_checkbox_td(view, row, len(painters)) for p in painters: - paint(p, row, index) + paint(p, row) html.write("</tr>\n") html.write("</table></div>\n") @@ -199,7 +213,7 @@ multisite_layouts["boxed"] = { # |_| |_|_|\___|\__,_| # # ------------------------------------------------------------------------- -def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ignore_show_checkboxes): +def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, show_checkboxes): html.write("<table class=\"data tiled\">\n") last_group = None @@ -255,8 +269,11 @@ def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ign rendered = [ ("", prepare_paint(p, row)[1]) for p in painters ] - html.write("<tr><td class=\"tl %s\">%s</td><td class=\"tr %s\">%s</td></tr>\n" % \ - (rendered[1][0], rendered[1][1], rendered[2][0], rendered[2][1])) + html.write("<tr><td class=\"tl %s\">" % (rendered[1][0],)) + if show_checkboxes: + render_checkbox(view, row, len(painters) - 1) + html.write("%s</td><td class=\"tr %s\">%s</td></tr>\n" % \ + (rendered[1][1], rendered[2][0], rendered[2][1])) html.write("<tr><td colspan=2 class=\"center %s\">%s</td></tr>\n" % \ (rendered[0][0], rendered[0][1])) for css, cont in rendered[5:]: @@ -396,11 +413,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ html.write('<tr class="data %s%d">' % (trclass, state)) if show_checkboxes: - html.write("<td class=checkbox>") - # value contains the number of columns of this datarow - html.write("<input type=checkbox name=\"%s\" value=%d />" % - (row_id(view, row), num_painters - 1)) - html.write("</td>") + render_checkbox_td(view, row, num_painters - 1) for p in painters: paint(p, row) column += 1

13 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6074f1e81f81117189d75f8bd0fb758fb2f9472c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6074f1e81f8111… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 16:30:17 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years

Check_MK Git: check_mk: Changed checkbox ids

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 080a171bde35e5fdaac1e0ef316d84d02fbe6807 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=080a171bde35e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 16:30:02 2011 +0200 Changed checkbox ids --- web/htdocs/views.py | 7 +++---- web/plugins/views/layouts.py | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d2d8614..51b6ee2 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2280,11 +2280,10 @@ def row_id(view, row): key += '~%s' % row[col] return str(hash(key)) -def paint(p, row, rid = None): +def paint(p, row): tdclass, content = prepare_paint(p, row) - row_classes = rid is not None and 'dr_%s dr ' % rid or '' - if tdclass or row_classes: - html.write("<td class=\"%s%s\">%s</td>\n" % (row_classes or '', tdclass or '', content)) + if tdclass: + html.write("<td class=\"%s\">%s</td>\n" % (tdclass, content)) else: html.write("<td>%s</td>" % content) return content != "" diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 09834cb..fdf7b26 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -397,10 +397,12 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ if show_checkboxes: html.write("<td class=checkbox>") - html.write("<input type=checkbox name=\"172377356\" title=lars hirnibaldi=77 width=88>") + # value contains the number of columns of this datarow + html.write("<input type=checkbox name=\"%s\" value=%d />" % + (row_id(view, row), num_painters - 1)) html.write("</td>") for p in painters: - paint(p, row, row_id(view, row)) + paint(p, row) column += 1 index += 1

13 years

Check_MK Git: check_mk: Multisite: new view option for showing checkboxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59eeeaf777f78bdc39538e1981c21d9f901dc928 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59eeeaf777f78b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:28:34 2011 +0200 Multisite: new view option for showing checkboxes --- web/htdocs/views.py | 63 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 19 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d2d8614..d04e87e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -702,6 +702,9 @@ function toggle_section(nr, oImg) { html.write("<tr><td>%s:</td><td>" % _('Sortable by user')) html.checkbox('user_sortable', True) html.write("</td><tr>\n") + html.write("<tr><td>%s:</td><td>" % _('Show check boxes')) + html.checkbox('show_checkboxes', False) + html.write("</td><tr>\n") html.write("</table>\n") section_footer(sid) @@ -805,6 +808,7 @@ def load_view_into_html_vars(view): html.set_var("mustsearch", view["mustsearch"] and "on" or "") html.set_var("hidebutton", view.get("hidebutton", False) and "on" or "") html.set_var("user_sortable", view.get("user_sortable", True) and "on" or "") + html.set_var("show_checkboxes", view.get("show_checkboxes", False) and "on" or "") # [3] Filters for name, filt in multisite_filters.items(): @@ -905,17 +909,19 @@ def create_view(): except: browser_reload = 0 - play_sounds = html.var("play_sounds", "") != "" - public = html.var("public", "") != "" and config.may("publish_views") - hidden = html.var("hidden", "") != "" - mustsearch = html.var("mustsearch", "") != "" - hidebutton = html.var("hidebutton", "") != "" - column_headers = html.var("column_headers") - user_sortable = html.var("user_sortable") + play_sounds = html.var("play_sounds", "") != "" + public = html.var("public", "") != "" and config.may("publish_views") + hidden = html.var("hidden", "") != "" + mustsearch = html.var("mustsearch", "") != "" + hidebutton = html.var("hidebutton", "") != "" + column_headers = html.var("column_headers") + user_sortable = html.var("user_sortable") + show_checkboxes = html.var("show_checkboxes") + show_filternames = [] hide_filternames = [] hard_filternames = [] - hard_filtervars = [] + hard_filtervars = [] for fname, filt in multisite_filters.items(): usage = html.var("filter_%s" % fname) @@ -1001,6 +1007,7 @@ def create_view(): "play_sounds" : play_sounds, "column_headers" : column_headers, "user_sortable" : user_sortable, + "show_checkboxes" : show_checkboxes, "show_filters" : show_filternames, "hide_filters" : hide_filternames, "hard_filters" : hard_filternames, @@ -1126,8 +1133,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # User can override the layout settings via HTML variables (buttons) # which are safed persistently. This is known as "view options" vo = view_options(view["name"]) - num_columns = vo.get("num_columns", view.get("num_columns", 1)) - browser_reload = vo.get("refresh", view.get("browser_reload", None)) + num_columns = vo.get("num_columns", view.get("num_columns", 1)) + browser_reload = vo.get("refresh", view.get("browser_reload", None)) + show_checkboxes = vo.get("show_checkboxes", view.get("show_checkboxes", False)) if browser_reload and 'R' in display_options: html.set_browser_reload(browser_reload) @@ -1280,12 +1288,20 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # Buttons for view options if 'O' in display_options: # Link for selecting/deselecting all rows - if 'C' in display_options and len(rows) > 0 and config.may("act") and not html.do_actions(): - html.write('<td class="left w30"><a href="javascript:toggle_all_rows()" ' - 'title="%s">%s</a></td>\n' % (_('Toggle all row selections'), _('x'))) + if 'C' in display_options and config.may("act") and not html.do_actions(): + if show_checkboxes: + addclass = " selected" + title = _("Hide check boxes") + uri = html.makeuri([("show_checkboxes", "")]) + else: + addclass = "" + title = _("Show check boxes for selecting specific items for the commands") + uri = html.makeuri([("show_checkboxes", "on")]) + html.write('<td class="left w30%s"><a href="%s" title="%s">%s</a></td>\n' % + (addclass, uri, title, _('X'))) html.write("<td class=minigap></td>\n") - if config.user_may(config.user, "view_option_columns"): + if config.may("view_option_columns"): for col in config.view_option_columns: uri = html.makeuri([("num_columns", col)]) if col == num_columns: @@ -1296,7 +1312,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru (addclass, uri, _('%d column layout') % col, col)) html.write("<td class=minigap></td>\n") - if 'R' in display_options and config.user_may(config.user, "view_option_refresh"): + if 'R' in display_options and config.may("view_option_refresh"): for ref in config.view_option_refreshes: uri = html.makeuri([("refresh", ref)]) if ref == browser_reload or (not ref and not browser_reload): @@ -1369,7 +1385,6 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning html.check_limit(rows, get_limit()) - show_checkboxes = html.var("show_checkboxes", "") != "" layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes) # Play alarm sounds, if critical events have been displayed @@ -1408,7 +1423,8 @@ def view_options(viewname): v = vo.get(viewname, {}) must_save = False - if config.user_may(config.user, "view_option_refresh"): + # Refresh rate + if config.may("view_option_refresh"): if html.has_var("refresh"): try: v["refresh"] = int(html.var("refresh")) @@ -1418,7 +1434,8 @@ def view_options(viewname): elif "refresh" in v: del v["refresh"] - if config.user_may(config.user, "view_option_columns"): + # Number of columns in layout + if config.may("view_option_columns"): if html.has_var("num_columns"): try: v["num_columns"] = max(1, int(html.var("num_columns"))) @@ -1428,7 +1445,15 @@ def view_options(viewname): elif "num_columns" in v: del v["num_columns"] - if config.user_may(config.user, "painter_options"): + # Show checkboxes for commands + if config.may("act"): + if html.has_var("show_checkboxes"): + v["show_checkboxes"] = html.var("show_checkboxes", "") != "" + must_save = True + elif "show_checkboxes" in v: + del v["show_checkboxes"] + + if config.may("painter_options"): for on, opt in multisite_painter_options.items(): if html.has_var(on): must_save = True

13 years

Check_MK Git: check_mk: Multisite: intermediate multi-row-select-change

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82d3e0925077ed80d89eb092024049c48e7aa044 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82d3e0925077ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 6 16:09:38 2011 +0200 Multisite: intermediate multi-row-select-change --- web/htdocs/check_mk.css | 5 +++++ web/htdocs/views.py | 7 ++++--- web/plugins/views/layouts.py | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index df11129..8f27f4c 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -658,6 +658,11 @@ table.data tr.data td { vertical-align: middle; } +table.data tr.data td.checkbox { + width: 20px; + text-align: center; +} + table.data td.host { border-style: none; font-weight: bold; diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 5c6b8f1..d2d8614 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1369,7 +1369,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru if not has_done_actions: # Limit exceeded? Show warning html.check_limit(rows, get_limit()) - layout["render"](rows, view, group_painters, painters, num_columns) + show_checkboxes = html.var("show_checkboxes", "") != "" + layout["render"](rows, view, group_painters, painters, num_columns, show_checkboxes) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"): @@ -1550,7 +1551,7 @@ def show_context_links(thisview, active_filters): active_filter_vars = set([]) for filt in active_filters: for var in filt.htmlvars: - if html.has_var(var) and var not in active_filter_vars: + if html.has_var(var): active_filter_vars.add(var) # sort views after text of possible button (sort buttons after their text) @@ -1584,7 +1585,7 @@ def show_context_links(thisview, active_filters): continue # add context link to this view - if len(used_contextvars) > 0: + if len(used_contextvars): if first: first = False html.begin_context_buttons() diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 9882dc4..09834cb 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -38,7 +38,7 @@ def init_rowselect(): # |____/|_|_| |_|\__, |_|\___| # |___/ # ------------------------------------------------------------------------- -def render_single_dataset(rows, view, group_painters, painters, num_columns): +def render_single_dataset(rows, view, group_painters, painters, num_columns, _ignore_show_checkboxes): for row in rows: register_events(row) # needed for playing sounds @@ -78,7 +78,7 @@ multisite_layouts["dataset"] = { # |____/ \___/_/\_\___|\__,_| # # ------------------------------------------------------------------------- -def render_grouped_boxes(rows, view, group_painters, painters, num_columns): +def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show_checkboxes): # N columns. Each should contain approx the same number of entries groups = [] last_group = None @@ -199,7 +199,7 @@ multisite_layouts["boxed"] = { # |_| |_|_|\___|\__,_| # # ------------------------------------------------------------------------- -def render_tiled(rows, view, group_painters, painters, _ignore_num_columns): +def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, _ignore_show_checkboxes): html.write("<table class=\"data tiled\">\n") last_group = None @@ -284,17 +284,21 @@ multisite_layouts["tiled"] = { # |_|\__,_|_.__/|_|\___| # # ------------------------------------------------------------------------ -def render_grouped_list(rows, view, group_painters, painters, num_columns): +def render_grouped_list(rows, view, group_painters, painters, num_columns, show_checkboxes): html.write("<table class=data>\n") last_group = None trclass = None column = 1 group_open = False num_painters = len(painters) + if show_checkboxes: + num_painters += 1 def show_header_line(): html.write("<tr>") for n in range(1, num_columns + 1): + if show_checkboxes: + html.write("<th></th>") for p in painters: paint_header(view, p) html.write("</tr>\n") @@ -337,7 +341,8 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): # paint group header group_open = True html.write("<tr class=groupheader>") - html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % (num_painters * (num_columns + 2) + (num_columns - 1))) + html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % + (num_painters * (num_columns + 2) + (num_columns - 1))) painted = False for p in group_painters: if painted: @@ -390,6 +395,10 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns): trclass = "odd" html.write('<tr class="data %s%d">' % (trclass, state)) + if show_checkboxes: + html.write("<td class=checkbox>") + html.write("<input type=checkbox name=\"172377356\" title=lars hirnibaldi=77 width=88>") + html.write("</td>") for p in painters: paint(p, row, row_id(view, row)) column += 1

13 years

Check_MK Git: check_mk: FIX: Preventing up-then-over effect while loading the dashboard in firefox

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0d6acc8adfc275ed1f4216a39f91211d00a57b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d6acc8adfc27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 10:24:04 2011 +0200 FIX: Preventing up-then-over effect while loading the dashboard in firefox --- ChangeLog | 1 + web/htdocs/check_mk.css | 5 +++-- web/htdocs/js/dashboard.js | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b690a3..32e1fb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * FIX: fix error on comment page caused by missing sorter * FIX: endless javascript when fetching pnp graphs on host/service detail pages * FIX: Not showing the action form in "try" mode of the view editor + * FIX: Preventing up-then-over effect while loading the dashboard in firefox * Added missing i18n strings in command form and list of views * Views are not reloaded completely anymore. The data tables are reloaded on their own. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 5b43013..df11129 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1663,16 +1663,17 @@ div#dashboard { div.dashlet { + position: absolute; padding: 0px; margin: 0px; + display: none; } /* content area of dashlet, if no iframes are used */ div.dashlet div.dashlet_inner { + position: absolute; padding: 0px; margin: 0px; - /* vertical-align: middle; - text-align: center; */ } /* Dashlets with "background" set to True */ diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 72d18bc..b456b38 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -42,10 +42,11 @@ function resize_dashlets(id, code) oDash = document.getElementById("dashlet_" + dashlet[0]); if(oDash) { oDash.style.position = 'absolute'; - oDash.style.left = dashlet[1] + "px"; - oDash.style.top = dashlet[2] + "px"; - oDash.style.width = dashlet[3] + "px"; - oDash.style.height = dashlet[4] + "px"; + oDash.style.display = 'block'; + oDash.style.left = dashlet[1] + "px"; + oDash.style.top = dashlet[2] + "px"; + oDash.style.width = dashlet[3] + "px"; + oDash.style.height = dashlet[4] + "px"; } // resize shadow images

13 years

Check_MK Git: check_mk: Fixed sidebar head styling in chrome

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 15a2f587395910a51f1f9c9a5500387463e7c930 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15a2f587395910… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 6 09:33:24 2011 +0200 Fixed sidebar head styling in chrome --- web/htdocs/check_mk.css | 15 +++------------ web/htdocs/sidebar.py | 10 +++++----- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 16aa16e..5b43013 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -191,10 +191,11 @@ body.side { background-image: url("images/sidebar_top.png"); } -#side_header a.logo { +#side_header a { display: block; + width: 100%; height: 55px; - width: 270px; + text-decoration: none; } #side_version { @@ -207,16 +208,6 @@ body.side { width: 200px; } -#side_version a { - text-decoration: none; - color: #e8e8e8; -} - -#side_version a:hover { - text-decoration: underline; - color: #fff; -} - /* Scrolling part with snapins */ #side_content { z-index: 5; diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 3a8ebf8..3a37d67 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -109,11 +109,11 @@ def save_user_config(user_config): config.save_user_file("sidebar", user_config) def sidebar_head(): - html.write('<a title="%s" target="main" href="%s">' - '<div id="side_header">' - '</div></a>\n' % (_("Go to main overview"), config.start_url)) - html.write('<a target="main" href="%s">' % config.start_url) - html.write('<div id="side_version">%s</div></a>\n' % defaults.check_mk_version) + html.write('<div id="side_header">' + '<a title="%s" target="main" href="%s">' + '<div id="side_version">%s</div>' + '</a>' + '</div>\n' % (_("Go to main overview"), config.start_url, defaults.check_mk_version)) def sidebar_foot(): html.write('<div id="side_footer">')

13 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits