Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Fixed styling issues after latest changes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b9c33da8192b91a8dee275c3926560cfe701b394 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9c33da8192b91… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:47:13 2012 +0200 Fixed styling issues after latest changes --- web/htdocs/pages.css | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0e0cba3..f52f65c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -235,7 +235,7 @@ table.data { width: 100%; } -table.data td { +table.data { color: black; } @@ -347,10 +347,10 @@ tr.groupheader td { margin: 0px; padding-top: 2px; font-weight: bold; - color: white; + color: #fff; } tr.groupheader a { - color: #000; + color: #fff; text-decoration: none; }

12 years, 4 months

Check_MK Git: check_mk: Fixed styling issues after latest changes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 713dea7f17c4fe616eb4be5a03c6193b7b4ce482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=713dea7f17c4fe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:48:16 2012 +0200 Fixed styling issues after latest changes --- web/htdocs/views.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 35b13f3..1d9f48d 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -173,6 +173,7 @@ div.optiondial { background-position: 1px -1px; overflow: hidden; box-shadow: 0px 0px 1px #000; + color: #000; } div.optiondial div {

12 years, 4 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: 8558b970a3de4c9a8f7d5694c9e822463488a85e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8558b970a3de4c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:48:23 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fix further styling problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 38d3d7689c225b26153dc9666ce9c27628234568 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38d3d7689c225b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 12:45:39 2012 +0200 Fix further styling problems --- web/htdocs/pages.css | 2 +- web/htdocs/wato.css | 1 - web/htdocs/wato.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index db04937..7d87cc2 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -295,7 +295,7 @@ table.data a { text-decoration: none; color: black; } -table.data tr.data td a:hover { +table.data a:hover { text-decoration: underline; } diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index e64873c..554e749 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,7 +45,6 @@ Boston, MA 02110-1301 USA. /* Tables in WATO are not size to 100% per default */ .wato table.data { - box-shadow: 0 0 3px #334488; width: auto; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 337b39a..ffa9bea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3746,7 +3746,7 @@ def render_audit_log(log, what, with_filename = False): if what == 'audit': display_paged(times) - htmlcode += '<table class="wato auditlog %s">' % what + htmlcode += '<table class="data wato auditlog %s">' % what even = "even" for t, linkinfo, user, action, text in log: even = even == "even" and "odd" or "even"

12 years, 4 months

Check_MK Git: check_mk: Fixed minor layout problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2be6f41f9e2bee9e55ed6e48c65c2ee9a00f2df8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2be6f41f9e2bee… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 12:41:08 2012 +0200 Fixed minor layout problems --- web/htdocs/pages.css | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0e0cba3..db04937 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -397,10 +397,9 @@ input[type=text],input[type=text] { height: 18px; padding: 2px 3px; vertical-align: middle; -/* top: -2px; */ } select { - height: 22px; + height: 24px; } input[type=radio] { @@ -584,8 +583,9 @@ table.nform tr.heading > td:hover { } table.nform > tbody > tr > td { - vertical-align: middle; - height: 27px; + vertical-align: middle; + height: 27px; + color: black; } table.nform > tbody > tr > td.simple {

12 years, 4 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: 7ba42ce7341f915829661683d0c2478172c9f490 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba42ce7341f91… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 12:36:13 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: fix table layout for views ( gaps where missing sometimes)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b69a782ce64ab82780ccf09a597410d32cd1f6c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b69a782ce64ab8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 12:35:59 2012 +0200 FIX: fix table layout for views (gaps where missing sometimes) --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 23 ++++++++-------- web/htdocs/status.css | 3 ++ web/htdocs/views.css | 33 +++++------------------ web/plugins/views/layouts.py | 58 +++++++++++++++-------------------------- 5 files changed, 44 insertions(+), 74 deletions(-) diff --git a/ChangeLog b/ChangeLog index efa0f20..28cc69c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * FIX: show toggle button for checkboxes in deactivated state * FIX: fix repeated stacked refresh when toggling columns * FIX: disable checkbox button in non-checkboxable layouts + * FIX: fix table layout for views (gaps where missing sometimes) Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index a30c98c..dc382ef 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1006,33 +1006,34 @@ function real_style(obj, attr, ieAttr) { return st; } -function find_checkbox(elem) { - // Find the checkbox of this element to gather the number of cells +function find_checkbox(oTd) { + // Find the checkbox of this oTdent to gather the number of cells // to highlight after the checkbox // 1. Go up to the row // 2. search backwards for the next checkbox // 3. loop the number of columns to highlight - var childs = elem.parentNode.childNodes; + var allTds = oTd.parentNode.childNodes; var found = false; var checkbox = null; - for(var a = childs.length - 1; a >= 0 && checkbox === null; a--) { + for(var a = allTds.length - 1; a >= 0 && checkbox === null; a--) { if(found === false) { - if(childs[a] == elem) { + if(allTds[a] == oTd) { /* that's me */ found = true; } - continue; + else + continue; } // Found the clicked column, now walking the cells backward from the // current cell searching for the next checkbox - var elems = childs[a].childNodes; - for(var x = 0; x < elems.length; x++) { - if(elems[x].tagName === 'INPUT' && elems[x].type == 'checkbox') { - checkbox = elems[x]; + var oTds = allTds[a].childNodes; + for(var x = 0; x < oTds.length; x++) { + if(oTds[x].tagName === 'INPUT' && oTds[x].type == 'checkbox') { + checkbox = oTds[x]; break; } } - elems = null; + oTds = null; } return checkbox; } diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 350f3c6..bebe26a 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -219,6 +219,9 @@ td.statex { /* zero count */ tr.odd0 { background-color: #eee; } tr.even0 { background-color: #ddd; } +tr.odd0 { background-color: #eee; } +tr.even0 { background-color: #ddd; } + tr.odd1 { background-color: #ffc; } tr.even1 { background-color: #ffa; } diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 35b13f3..aaac1d8 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -218,32 +218,6 @@ div.view_form { | Styles used by layouts of the views (plugins/views/layouts.py) | '-------------------------------------------------------------------------*/ -div.tableshadow { - background-image: url("images/tableshadow.png"); - background-repeat: repeat; - padding: 1px 1px 1px 1px; - border-style: none; -} - -td.shadowtop, td.shadowbottom { - background-image: url("images/tableshadow.png"); - background-repeat: repeat; - height: 1px; - border-style: none; - border-width: 0px; - padding: 0; -} -td.shadowleft, td.shadowright { - background-image: url("images/tableshadow.png"); - background-repeat: repeat; - width: 1px; - border-style: none; - border-width: 0px; - padding: 0; -} -td.shadowright { - width: 1px; -} td.fillup { background-color: #eee; @@ -253,6 +227,13 @@ td.groupheader { padding: 0; } +td.gap { + background-image: url("images/contentframe_background.jpg"); + background-attachment: fixed; + background-repeat: repeat; + width: 5px; +} + /* boxed layout */ table.boxlayout { border-spacing: 0px; diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index b5d9585..592a8c4 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -67,7 +67,6 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns, _ig for row in rows: register_events(row) # needed for playing sounds - # html.write('<div class="tableshadow left">\n') html.write('<table class="data single">\n') rownum = 0 odd = "odd" @@ -171,7 +170,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show painted = paint(p, rows[0][1]) html.write("</tr></table>\n") - html.write("<div class=tableshadow><table class=data>") + html.write("<table class=data>") trclass = None def show_header_line(): @@ -211,7 +210,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show paint(p, row) html.write("</tr>\n") - html.write("</table></div>\n") + html.write("</table>\n") init_rowselect() # render table @@ -296,7 +295,7 @@ def render_tiled(rows, view, group_painters, painters, _ignore_num_columns, show html.write("<tr><td class=\"tl %s\">" % (rendered[1][0],)) if show_checkboxes: - render_checkbox(view, row, len(painters) - 1) + 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" % \ @@ -332,9 +331,9 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ repeat_heading_every = 20 # in case column_headers is "repeat" - html.write("<table class=data>\n") + html.write("<table class='data table'>\n") last_group = None - trclass = None + odd = "even" column = 1 group_open = False num_painters = len(painters) @@ -352,6 +351,9 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ for p in painters: paint_header(view, p) + if n < num_columns: + html.write('<td class=gap></td>') + html.write("</tr>\n") if len(group_painters) == 0 and view.get("column_headers") != "off": @@ -382,12 +384,9 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ if this_group != last_group: if column != 1: # not a the beginning of a new line for i in range(column-1, num_columns): + html.write('<td class=gap></td>') html.write("<td class=fillup colspan=%d></td>" % num_painters) html.write("</tr>\n") - html.write("<tr>\n") - for x in range(0, num_columns): - html.write("<td colspan=%d class=shadowbottom></td>\n" % num_painters) - html.write("</tr>\n") column = 1 # paint group header @@ -404,23 +403,6 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ html.write("</tr></table></td></tr>\n") - # paint top, left and right shadows - group_rows = count_group_members(row, rows[index:]) - rowspan = group_rows / num_columns - if group_rows % num_columns: - rowspan += 1 - if view.get("column_headers") == "repeat": - rowspan += rowspan / repeat_heading_every - rowspan += 3 - html.write("<tr>\n") - for x in range(0, num_columns): - if x > 0: - html.write("<td rowspan=%d class=tablegap></td>\n" % rowspan) - html.write("<td rowspan=%d class=shadowleft></td>\n" % rowspan) - html.write("<td colspan=%d class=shadowtop></td>\n" % num_painters) - html.write("<td rowspan=%d class=shadowright></td>\n" % rowspan) - html.write("</tr>\n") - # Table headers if view.get("column_headers") != "off": show_header_line() @@ -450,27 +432,29 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ state = row.get("service_state", 0) else: state = 0 - if trclass == "odd": - trclass = "even" - else: - trclass = "odd" - html.write('<tr class="data %s%d">' % (trclass, state)) + + odd = odd == "odd" and "even" or "odd" + html.write('<tr class="data %s %s%d">' % (num_columns > 1 and "multicolumn" or "", odd, state)) + + # Not first columns: Create one empty column as separator + else: + html.write('<td class=gap></td>') + if show_checkboxes: - render_checkbox_td(view, row, num_painters - 1) + render_checkbox_td(view, row, num_painters) + for p in painters: paint(p, row) + column += 1 index += 1 if group_open: for i in range(column-1, num_columns): + html.write('<td class=gap></td>') html.write("<td class=fillup colspan=%d></td>" % num_painters) html.write("</tr>\n") - html.write("<tr>\n") - for x in range(0, num_columns): - html.write("<td colspan=%d class=shadowbottom></td>\n" % num_painters) - html.write("</tr>\n") html.write("</table>\n") init_rowselect()

12 years, 4 months

Check_MK Git: check_mk: Linux: Modified cluster section to allow pacemaker/ corosync clusters without heartbeat

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 57a699e549c7258334a5ddc99894677a54457054 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57a699e549c725… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 11:12:16 2012 +0200 Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat --- ChangeLog | 1 + agents/check_mk_agent.linux | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78d00f8..1da5ffa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ of nodes in state OK. Checks & Agents: + * Linux: Modified cluster section to allow pacemaker/corosync clusters without heartbeat * AIX: convert NIC check to lnx_if (now being compatible with if/if64) * AIX: new check for CPU utilization (using section lparstat_aix) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index c851aad..2b03e46 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -341,16 +341,15 @@ if which lpstat > /dev/null 2>&1; then fi # Heartbeat monitoring +# Different handling for heartbeat clusters with and without CRM +# for the resource state +if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then + echo '<<<heartbeat_crm>>>' + crm_mon -1 -r | grep -v ^$ | sed 's/^ //; /^\sResource Group:/,$ s/^\s//; s/^\s/_/g' +fi if which cl_status > /dev/null 2>&1; then - # Different handling for heartbeat clusters with and without CRM - # for the resource state - if [ -S /var/run/heartbeat/crm/cib_ro -o -S /var/run/crm/cib_ro ]; then - echo '<<<heartbeat_crm>>>' - crm_mon -1 -r | grep -v ^$ | sed '/^\sResource Group:/,$ s/^\s//; s/^\s/_/g' - else - echo '<<<heartbeat_rscstatus>>>' - cl_status rscstatus - fi + echo '<<<heartbeat_rscstatus>>>' + cl_status rscstatus echo '<<<heartbeat_nodes>>>' for NODE in $(cl_status listnodes); do

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed layout problem of "new special rule" button in rule editor

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c01996a3b59e5c180b8cf12d2f8226285432cb27 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c01996a3b59e5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:26:13 2012 +0200 FIX: Fixed layout problem of "new special rule" button in rule editor --- web/htdocs/wato.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ee700c..337b39a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9201,16 +9201,27 @@ def mode_rulesets(phase): def create_new_rule_form(rulespec, hostname = None, item = None): html.begin_form("new_rule") - html.write(_("Create a new rule: ")) + + html.write('<table>') if hostname: - title = _("Exception rule for host %s" % hostname) + label = _("Host %s" % hostname) + ty = _('Host') if item != NO_ITEM and rulespec["itemtype"]: - title += _(" and %s '%s'") % (rulespec["itemname"], item) + label += _(" and %s '%s'") % (rulespec["itemname"], item) + ty = rulespec["itemname"] + + title = _("Create %s specific rule for: ") % ty + html.write('<tr><td>') html.button("_new_host_rule", title) - html.write(_("or") + " ") + html.write('</td><td style="vertical-align:middle">') + html.write(label) + html.write('</td></tr>\n') + + html.write('<tr><td>') html.button("_new_rule", _("Create rule in folder: ")) + html.write('</td><td>') html.select("folder", folder_selection(g_root_folder)) - html.write("\n") + html.write('</td></tr></table>\n') html.hidden_fields() html.end_form()

12 years, 4 months

Check_MK Git: check_mk: Changed font color specification (

by git＠mathias-kettner.de

hopefully this does not destroy too much) User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: b612f66fcfb4a40d5be4b88a8ebdab9c12ecbce6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b612f66fcfb4a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 12:35:54 2012 +0200 Changed font color specification (hopefully this does not destroy too much) --- ChangeLog | 1 + web/htdocs/check_mk.css | 3 --- web/htdocs/pages.css | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee5e4f..9fd4acf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ WATO: * FIX: fix folding problems with dependent host tags * FIX: Detecting duplicate tag ids between regular tags and auxtags + * FIX: Fixed layout problem of "new special rule" button in rule editor Multisite: * FIX: remove refresh button from dashboard. diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index f27e3fd..410920e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -62,9 +62,6 @@ th { body { color: white; } -td { - color: black; -} /* Default font size for the complete Multisite GUI */ button, input, td, th, select, textarea { diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index dd0de35..0e0cba3 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -235,6 +235,11 @@ table.data { width: 100%; } +table.data td { + color: black; +} + + table.data th { font-weight: normal; border-left: 1px solid #ccc;

12 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012