Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64329 discussions

Check_MK Git: check_mk: Make page headers clickable for reload

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e958e872824544e75889dee2bb9cef1124427421 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e958e872824544… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 16:50:15 2012 +0200 Make page headers clickable for reload --- ChangeLog | 1 + web/htdocs/htmllib.py | 5 ++++- web/htdocs/pages.css | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b937f4..d277058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.0b6 Multisite: * FIX: Fixed layout of some dropdown fields in view filters + * Make heading in each page clickable -> reload page Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 820c78f..a18ab72 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -807,7 +807,10 @@ class html: login_text += ')' else: login_text = _("not logged in") - self.write('<table class=header><tr><td width="*" class=heading>%s</td>' % title) + self.write('<table class=header><tr><td width="*" class=heading>') + self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' + 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % + (_("Reloading..."), title)) self.write('<td width=240 class=right>%s   <b id=headertime>%s</b>' % (login_text, time.strftime("%H:%M"))) self.help_visible = config.load_user_file("help", False) # cache for later usage diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 5c6ecae..3e9a738 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -98,6 +98,11 @@ body.main table.header td.heading { max-width: 100px; } +body.main table.header td.heading a, +body.main table.header td.heading a:hover { + text-decoration: none; +} + body.main table.header td.right { text-align: right; font-size: 10pt;

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed "make_utf is not defined"

by git＠mathias-kettner.de

error when having custom timeperiods defined in WATO 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: 79e8618d5b608276191c2cab9fc22213d926710a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e8618d5b6082… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 16:47:28 2012 +0200 FIX: Fixed "make_utf is not defined" error when having custom timeperiods defined in WATO --- ChangeLog | 8 ++++++++ modules/check_mk.py | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ede25ed..8b937f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1.2.0b6 + Multisite: + * FIX: Fixed layout of some dropdown fields in view filters + + Core: + * FIX: Fixed "make_utf is not defined" error when having custom + timeperiods defined in WATO + 1.2.0b5: Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) diff --git a/modules/check_mk.py b/modules/check_mk.py index 7f33d18..7fd3af7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2011,7 +2011,7 @@ def create_nagios_config_timeperiods(outfile): tp = timeperiods[name] outfile.write("define timeperiod {\n timeperiod_name\t\t%s\n" % name) if "alias" in tp: - outfile.write(" alias\t\t\t\t%s\n" % make_utf(tp["alias"])) + outfile.write(" alias\t\t\t\t%s\n" % make_utf8(tp["alias"])) for key, value in tp.items(): if key not in [ "alias", "exclude" ]: times = ",".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ])

12 years, 4 months

Check_MK Git: check_mk: Fixed some more filter styling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52416d05fb0e1a0fe93482d988956dc71a5b7b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52416d05fb0e1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 16:43:20 2012 +0200 Fixed some more filter styling --- web/htdocs/views.css | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index e5ec5ef..4303b74 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -97,13 +97,20 @@ div.floatfilter .content { padding-left: 4px; text-align: left; } -div.floatfilter .content select { +div.floatfilter .content > select { width: 300px; } -div.floatfilter .content select#opthostgroup, -div.floatfilter .content select#optservicegroup { +div.floatfilter .content > select#opthostgroup, +div.floatfilter .content > select#optservice_contactgroup, +div.floatfilter .content > select#opthost_contactgroup, +div.floatfilter .content > select#optservicegroup { width: 240px; } + +div.floatfilter .content .filtertime select { + width: 136px; +} + div.floatfilter.double .content { height: 72px; }

12 years, 4 months

Check_MK Git: check_mk: Now really fixed make mrproper

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 124deaba0684cf1fc7538998ba6e4e6c9e1093e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=124deaba0684cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:48:31 2012 +0200 Now really fixed make mrproper --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c51bafe..0067e9f 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,7 @@ clean: find -name "*~" | xargs rm -f mrproper: - git clean -xfd .bugs + git clean -xfd -e .bugs || git clean -xfd check: @set -e ; for checkfile in *.HS ; do \

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: 08f0ed2310458dc3542bcd2d6f2bc5ffd3695f8f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08f0ed2310458d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:48:59 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: Makefile ---

12 years, 4 months

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

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0c298906f6b44c031e162dc96dcec150278363b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c298906f6b44c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:46:40 2012 +0200 Merge branch 'master' of /var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fixed make mrproper

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 064eee6f237ca561f5e6c2686df18b7fe69f19bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=064eee6f237ca5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:44:45 2012 +0200 Fixed make mrproper --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 384913f..925d366 100644 --- a/Makefile +++ b/Makefile @@ -184,6 +184,8 @@ clean: mrproper: git clean -xfd .bugs + rm -f *.rpm *.tar.gz *.deb *.exe + check: @set -e ; for checkfile in *.HS ; do \

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: 7e4875e4173c4443310b82219a2e3fee113a1a6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e4875e4173c44… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:42:25 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: minor layout fixes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f9c49c564f8b40d451e47f6545a74c2687193137 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9c49c564f8b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 15:42:16 2012 +0200 minor layout fixes --- web/htdocs/pages.css | 16 +++++++++++----- web/plugins/views/layouts.py | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 62c8683..5c6ecae 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -247,7 +247,6 @@ table.data .checkbox_hover { table.data th { font-weight: normal; - border-left: 1px solid #ccc; border-right: 1px solid #ccc; background-color: #999; padding: 2px 2px; @@ -255,6 +254,9 @@ table.data th { color: #fff; vertical-align: middle; } +table.data th:last-child { + border-right-style: none; +} /* Two-lined header, for example in WATO: ChangeLog->Site Status */ table.data tr.dualheader th { @@ -289,12 +291,14 @@ table.data th.tablegap { } table.data tr.data td { - border-left: 1px solid #ccc; border-right: 1px solid #ccc; padding: 2px 4px; height: 22px; vertical-align: middle; } +table.data tr.data td:last-child { + border-right-style: none; +} table.data a { text-decoration: none; @@ -344,7 +348,7 @@ table.data td.singleicon { table.groupheader { margin: 0px; border: 0px; - padding: 0px; + padding: 6px 0px 3px 0px; } tr.groupheader td { @@ -365,9 +369,11 @@ tr.groupheader a:hover { /* state in group header must have fixed width */ .groupheader td.state { - width: 50px; + border: 1px solid #000000; + border-radius: 5px 5px 5px 5px; + box-shadow: 1px 1px 2px #444444; padding: 2px 5px; - border: 1px solid #fff; + width: 50px; } img.iconbutton { diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 592a8c4..8418616 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -162,7 +162,7 @@ def render_grouped_boxes(rows, view, group_painters, painters, num_columns, show # render one group def render_group(header, rows): - html.write("<table class=groupheader><tr class=groupheader>") + html.write("<table class=groupheader cellspacing=0 cellpadding=0 border=0><tr class=groupheader>") painted = False for p in group_painters: if painted: @@ -393,7 +393,7 @@ def render_grouped_list(rows, view, group_painters, painters, num_columns, show_ group_open = True visible_row_number = 0 html.write("<tr class=groupheader>") - html.write("<td class=groupheader colspan=%d><table class=groupheader><tr>" % + html.write("<td class=groupheader colspan=%d><table class=groupheader cellspacing=0 cellpadding=0 border=0><tr>" % (num_painters * (num_columns + 2) + (num_columns - 1))) painted = False for p in group_painters:

12 years, 4 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5118122f795028b84f949a437e08ddbe7ad95f91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5118122f795028… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 25 15:32:51 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b519b9..ede25ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core: * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) * FIX: fix configuration of passive checks via custom_checks + * Added NOTIFICATIONTYPE to host/service mail bodies WATO: * Site management: "disabled" only applies to Livestatus now

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits