Checkmk git commits September 2011

checkmk-commits@lists.checkmk.com

3 participants
125 discussions

Check_MK Git: check_mk: Added select/deselect all button ("x") to view action row

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ac51262fba3cc16143061e0d1e0cfb999508e6d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac51262fba3cc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 5 10:07:15 2011 +0200 Added select/deselect all button ("x") to view action row --- web/htdocs/js/check_mk.js | 31 ++++++++++++++++++++++++++++++- web/htdocs/views.py | 14 +++++++++++--- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index c1b0321..588b105 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -961,9 +961,17 @@ function highlight_elem(elem, on, ty) { highlight_elem(childs[i], on, ty); } +function select_all_rows(elems) { + for(var i = 0; i < elems.length; i++) { + highlight_elem(elems[i], true, 'click'); + if(g_selected_rows.indexOf(elems[i].row_num) === -1) + g_selected_rows.push(elems[i].row_num); + } +} + function remove_selected_rows(row_num) { for(var i = g_selected_rows.length - 1; i >= 0; i--) { - if(g_selected_rows[i] != row_num) { + if(g_selected_rows[i] !== row_num) { highlight_row(g_selected_rows[i], false, 'click'); highlight_row(g_selected_rows[i], false, 'hover'); g_selected_rows.splice(i, 1); @@ -1031,6 +1039,27 @@ function disable_selection(e) { return false; } +// Is used to select/deselect all rows in the current view +function toggle_all_rows() { + var elems = document.getElementsByClassName('dr'); + + var all_selected = true; + for(var i = 0; i < elems.length && all_selected == true; i++) { + if(elems[i].tagName != 'TD' && elems[i].tagName != 'DIV') + continue; + + if(g_selected_rows.indexOf(elems[i].row_num) === -1) + all_selected = false; + } + + // Now set the new state + if(all_selected) { + remove_selected_rows(''); + } else { + select_all_rows(elems); + } +} + function get_row_num(elem) { // FIXME: Maybe performance problem. Would be better to have a // dedicated attribute for the data row number diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 845d6c0..c6a16db 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1275,6 +1275,12 @@ 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'))) + html.write("<td class=minigap></td>\n") + if config.user_may(config.user, "view_option_columns"): for col in config.view_option_columns: uri = html.makeuri([("num_columns", col)]) @@ -1282,7 +1288,8 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru addclass = " selected" else: addclass = "" - html.write('<td class="left w30%s"><a href="%s">%s</a></td>\n' % (addclass, uri, col)) + html.write('<td class="left w30%s"><a href="%s" title="%s">%s</a></td>\n' % + (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"): @@ -1296,8 +1303,9 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru reftext = "%d s" % ref else: reftext = "∞" - html.write('<td class="left w40%s" id="button-refresh-%s"><a href="%s">%s</a></td>\n' % - (addclass, ref, uri, reftext)) + html.write('<td class="left w40%s" id="button-refresh-%s">' + '<a href="%s" title="%s">%s</a></td>\n' % + (addclass, ref, uri, _('refresh every %d seconds') % ref, reftext)) html.write("<td class=minigap></td>\n") html.write("<td class=gap> </td>\n")

13 years

Check_MK Git: check_mk: Added missing localization string

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eee9d96b27a266ab97d1ca5dee2b4e031f0df5de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eee9d96b27a266… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat Sep 3 16:18:08 2011 +0200 Added missing localization string --- .bugs/58 | 10 +++++++--- web/htdocs/views.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.bugs/58 b/.bugs/58 index 1ed3d43..fdd7735 100644 --- a/.bugs/58 +++ b/.bugs/58 @@ -1,11 +1,15 @@ Title: Views per Ajax refreshen, Reload der Seite verhindern Component: multisite +State: done +Class: feature +Date: 2010-12-21 22:16:00 Benefit: 1 -State: open Cost: 3 -Date: 2010-12-21 22:16:00 -Class: feature +Fun: 0 orschlag von Bastian: Bei den Views könnte man den Datenbereich (Tabelle) per Ajax refreshen und müsste nicht die ganze Seite neu aufbauen. Damit wird ein Bildschirmflimmern vermieden. + +2011-09-03 16:11:01: changed state open -> done +Has been fixed. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index eda637b..845d6c0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1270,7 +1270,7 @@ def show_view(view, show_heading = False, show_buttons = True, show_footer = Tru # 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("painter_options", False, _("Display")) html.write("<td class=minigap></td>\n") # Buttons for view options

13 years

Check_MK Git: check_mk: Added missing i18n strings in command form and list of views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc6ebf11f363ad8b8c8f8427eefd52c9773450e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc6ebf11f363ad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 16:42:24 2011 +0200 Added missing i18n strings in command form and list of views --- ChangeLog | 1 + web/htdocs/views.py | 118 ++++++++++++++++---------------- web/plugins/views/painters.py | 6 +- web/plugins/wato/builtin_attributes.py | 4 +- 4 files changed, 67 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=cc6ebf11f3…

13 years

Check_MK Git: check_mk: Implemented row selection in views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 021fe461031073681c83c195eb2e0742e7a21869 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=021fe461031073… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 15:50:03 2011 +0200 Implemented row selection in views Implemented row selection in views to select only a subset of shown data for actions. Implementation notes: Momentan verfügen die Views nicht über die Möglichkeit einzelne Datensätze zu selektieren und dann nur auf diese ein Command auszuführen. Dies ist in MS4 gefordert und soll wie folgt direkt im Multisite Code umgesetzt werden: - Standard-Verhalten bleibt bestehen: Wenn kein Datensatz explizit ausgewählt wurde, dann werden die Aktionen auf alle angezeigten Datensätze ausgeführt. - Beim Mouseover über eine Row wird diese durch Ändern der Hintergrundfarbe hervorgehoben. Man muss dafür nicht neue Farben definieren, es sollte reichen für jede Zelle, wo ein Hintergrund gesetzt ist, die Farbe etwas heller/dunkler zu machen. - Der Nutzer kann mit der Maus auf eine beliebige Stelle in der Tabelle Klicken. Daraufhin wird die Row selektiert. Bei nochmaligem Klicken wird die Seletion aufgehoben. - Die aktuellen Selektionen müssen auf der aktuellen Seite den Reload überleben. Allerdings werden die nicht persistiert. Also ganz genau wie die sorter. Dazu müssen die aktuellen Selektionen des Nutzers nach dem regulären Reload der Seite neu gesetzt werden. Alternativ müssen die Selektionen als URL Parameter durchgeschleift werden und dazu führen, dass die Rows beim Laden der Seite selektiert sind. - Wie werden die Rows identifiziert? Die Rows müssten immer in der Reihenfolge angezeigt werden, in der auch die Datensätze im Check_MK vorliegen. Wenn das so ist, dann kann man die Rows einfach durchnummerieren. Die Alternative sähe schon komplizierter aus. Da müsste man für jede Row einen eindeutigen Schlüssel finden, der sich je nach angezeigten Daten aus verschiedenen Infos zusammensetzen kann. z.B. site,host,service oder ... Eine Row bedeutet hier nicht (!) ein html TR Element, denn die verschiedenen Layouts sind nicht unbendingt einfache Tabellen. Versuch: Die Row Elemente werden via CSS-Klasse identifiziert. Das hat den Grund, dass man mit getElementsByClassName() relativ komfortablen alle Objekte bekommt. Es gibt eine CSS-Klasse "dr" für alle "data row" Elemente und "dr_#" durchnummeriert für alle Elemente eine "data row". - views.py vor dem Verarbeiten von do_actions() müssen die Rows gefiltert werden. Allerdings dürfen diese nur für die Aktionen gefiltert werden. Bei der Anzeige muss wieder alles gezeigt werden. - Alle Layouts inkl. verschiedene Datasources testen --- ChangeLog | 2 + web/htdocs/htmllib.py | 10 +- web/htdocs/js/check_mk.js | 308 ++++++++++++++++++++++++++++++++++++++++++ web/htdocs/js/sidebar.js | 4 - web/htdocs/views.py | 27 +++- web/plugins/views/layouts.py | 29 +++- 6 files changed, 358 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=021fe46103…

13 years

Check_MK Git: check_mk: Fixed IE8 javascript errors

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2b7a3169067ae2e9dc68dcf344c14ecafa5a9a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b7a3169067ae2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 2 16:18:01 2011 +0200 Fixed IE8 javascript errors --- web/htdocs/check_mk.css | 20 ++++++++++---------- web/htdocs/js/check_mk.js | 9 ++++++--- web/htdocs/js/dashboard.js | 14 ++++++++------ web/htdocs/js/search.js | 4 ++-- web/htdocs/js/sidebar.js | 14 ++++++++------ 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 11f60b7..96bf4ed 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1696,7 +1696,7 @@ div.dashlet div.title { position: absolute; left: 0px; width: 150px; /* will be changed by javascript later */ - color: white; + color: #fff; text-align: center; padding: 0px; margin: 0px; @@ -1794,7 +1794,7 @@ div.dashlet table.hoststats td.color { div.dashlet table.hoststats th, table.hoststats td { padding-top: 3px; padding-bottom: 3px; - border-color: white; + border-color: #fff; border-style: solid none; border-width: 1px; vertical-align: middle; @@ -1907,7 +1907,7 @@ table.add_snapin i { padding-top: 7px; vertical-align: top; text-align: right; - border: 1px solid white; + border: 1px solid #fff; border-left-style: none; } @@ -1975,7 +1975,7 @@ table.add_snapin i { -moz-border-radius: 3px; background-color: #8ab; padding: 2px 9px; - color: white; + color: #fff; font-weight: normal; } .wato div.folderpath a { @@ -1983,7 +1983,7 @@ table.add_snapin i { text-decoration: none; } .wato div.folderpath a:hover { - color: white; + color: #fff; background-color: #9bc; /* text-decoration: underline; */ } @@ -2018,11 +2018,11 @@ table.add_snapin i { background-image: url("images/form_background.png"); background-repeat: repeat; width: 50%; - border: 1px solid black; + border: 1px solid #000; } .wato table.progress th { - background-color: white; + background-color: #fff; padding: 3px 0px; } @@ -2030,7 +2030,7 @@ table.add_snapin i { .wato table.progress td.log div { background-image: url("images/form_background.png"); background-repeat: repeat; - border: 1px solid white; + border: 1px solid #fff; padding: 5px; height: 250px; overflow: auto; @@ -2101,7 +2101,7 @@ table.add_snapin i { .wato table.progress td.stats table { border-collapse: collapse; border-spacing: 0px; - border: 1px solid white; + border: 1px solid #fff; } .wato table.progress td.stats th { text-align: left; @@ -2110,7 +2110,7 @@ table.add_snapin i { padding-left: 6px; } .wato table.progress td.stats th, .wato table.progress td.stats td { - border-bottom: 1px solid white; + border-bottom: 1px solid #fff; padding-top: 3px; padding-bottom: 3px; } diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 91cd044..c1b0321 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -154,7 +154,7 @@ function executeJS(objId) { // if (!isFirefox()) { var obj = document.getElementById(objId); var aScripts = obj.getElementsByTagName('script'); - for(var i in aScripts) { + for(var i = 0; i < aScripts.length; i++) { if (aScripts[i].src && aScripts[i].src !== '') { var oScr = document.createElement('script'); oScr.src = aScripts[i].src; @@ -322,7 +322,7 @@ function pnp_response_handler(data, code) { var response = null; try { response = eval(code); - for(var i in response) { + for(var i = 0; i < response.length; i++) { var graph = response[i]; var view = data['view'] == '' ? '0' : data['view']; create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); @@ -338,7 +338,7 @@ function pnp_response_handler(data, code) { // Fallback bei doofer/keiner Antwort function fallback_graphs(data) { - for(var i in [0, 1, 2, 3, 4, 5, 6, 7]) { + for(var i = 0; i < 8; i++) { create_graph(data, '&host=' + data['host'] + '&srv=' + data['service'] + '&source=' + i); } } @@ -878,6 +878,9 @@ function lightenColor(color, rD, gD, bD) { var r = parseInt(color.substring(1, 2) + color.substring(1, 2), 16); var g = parseInt(color.substring(2, 3) + color.substring(2, 3), 16); var b = parseInt(color.substring(3, 4) + color.substring(3, 4), 16); + } else { + alert('Invalid color definition: ' + color); + return color; } var brightness = (r*299 + g*587 + b*114) / 1000; diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 6b4e79f..72d18bc 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -40,11 +40,13 @@ function resize_dashlets(id, code) // resize outer div oDash = document.getElementById("dashlet_" + dashlet[0]); - 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"; + 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"; + } // resize shadow images oDash = document.getElementById("dashadow_w_" + dashlet[0]); @@ -99,7 +101,7 @@ function set_dashboard_size() function dashboard_scheduler(force) { var timestamp = Date.parse(new Date()) / 1000; var newcontent = ""; - for (var i in refresh_dashlets) { + for(var i = 0; i < refresh_dashlets.length; i++) { var nr = refresh_dashlets[i][0]; var refresh = refresh_dashlets[i][1]; var url = refresh_dashlets[i][2]; diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js index c4e8690..0809ffa 100644 --- a/web/htdocs/js/search.js +++ b/web/htdocs/js/search.js @@ -222,7 +222,7 @@ function mkSearchMoveElement(step) { oResults = oResults.childNodes; var a = 0; - for(var i in oResults) { + for(var i = 0; i < oResults.length; i++) { if(oResults[i].nodeName == 'A') { if(a == iCurrent) { oResults[i].setAttribute('class', 'active'); @@ -345,7 +345,7 @@ function mkSearchAddSearchResults(aSearchObjects, objType, val) { var objName, objSite; aSearchContents = ''; var numHits = 0; - for(var i in aSearchObjects){ + for(var i = 0; i < aSearchObjects.length; i++) { objSite = aSearchObjects[i][0]; objName = aSearchObjects[i][1]; diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 884af57..c337f2d 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -77,7 +77,7 @@ function registerEdgeListeners(obj) { else edges = [ obj ]; - for(var i in edges) { + for(var i = 0; i < edges.length; i++) { // It is possible to open other domains in the content frame - don't register // the event in that case. It is not permitted by most browsers! if(!contentFrameAccessible()) @@ -265,9 +265,11 @@ function snapinStopDrag(event) { function getDivChildNodes(node) { var children = []; - for(var i in node.childNodes) - if(node.childNodes[i].tagName === 'DIV') - children.push(node.childNodes[i]); + var childNodes = node.childNodes; + for(var i = 0; i < childNodes.length; i++) + if(childNodes[i].tagName === 'DIV') + children.push(childNodes[i]); + childNodes = null; return children; } @@ -277,7 +279,7 @@ function getSnapinList() { var l = []; var childs = getDivChildNodes(snapinDragging.parentNode); - for(var i in childs) { + for(var i = 0; i < childs.length; i++) { var child = childs[i]; // Skip // - non snapin objects @@ -318,7 +320,7 @@ function getSnapinTargetPos() { // Find the nearest snapin to current left/top corner of // the currently dragged snapin - for(var i in childs) { + for(var i = 0; i < childs.length; i++) { var child = childs[i]; if (!child.id || child.id.substr(0, 7) != 'snapin_' || child.id == snapinDragging.id)

13 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2011