Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Fix folding when special chars are contained in titles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d9888d3fac20654dac7bd585ea32fbd4e1407f6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9888d3fac2065… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:22:02 2012 +0200 Fix folding when special chars are contained in titles --- web/htdocs/forms.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 8d71bb2..8151ea9 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -98,7 +98,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, # New functions for painting forms def strip_bad_chars(x): - return "".join([c for c in x if c > ' ' and c < 'z' and c not in ["'", '"']]) + return "".join([c for c in x if c > ' ' and c < 'z']).translate(None, "'&;<>\"") def header(title, isopen = True, table_id = ""): global g_header_open

12 years, 1 month

Check_MK Git: check_mk: Fixed layout nastiness in binary rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 05d27978a528fcb5183360d19f87b0c3f893ae48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05d27978a528fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 12:35:30 2012 +0200 Fixed layout nastiness in binary rules --- web/htdocs/wato.css | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 00ef5ab..46c844c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -512,7 +512,8 @@ table.validationerror img { width: 20px; height: 20px; } -.wato table.ruleeditor img { +.wato table.ruleeditor img, +.wato img.ruleyesno { width: 22px; height: 22px; position: relative;

12 years, 1 month

Check_MK Git: check_mk: Minor styling fix

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7050407748c635077bf5bdc91c2a6cbf93364426 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7050407748c635… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 29 11:21:43 2012 +0200 Minor styling fix --- web/htdocs/sidebar.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 18b9372..b11f718 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -156,7 +156,7 @@ div.snapin div.head.closed { /* close button on header */ div.snapin div.closesnapin { float: right; - margin-right: 10px; + margin-right: 12px; margin-top: 11px; line-height: 0px; height: 8px;

12 years, 1 month

Check_MK Git: check_mk: ValueSpec DropdownChoice: understand label

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2eab34abfbc813f959f5111c89d62d29f36da6a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2eab34abfbc813… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 27 21:08:59 2012 +0200 ValueSpec DropdownChoice: understand label --- web/htdocs/valuespec.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index cde37d2..d00b6ff 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -730,11 +730,14 @@ class DropdownChoice(ValueSpec): ValueSpec.__init__(self, **kwargs) self._choices = kwargs["choices"] self._help_separator = kwargs.get("help_separator") + self._label = kwargs.get("label") def canonical_value(self): return self._choices[0][0] def render_input(self, varprefix, value): + if self._label: + html.write("%s " % self._label) # Convert values from choices to keys defval = "0" options = []

12 years, 1 month

Check_MK Git: check_mk: Minor styling update in single dataset layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f98a5f13c57886fb3d547068d71aa4a1cd07b5ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f98a5f13c57886… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 28 15:20:49 2012 +0200 Minor styling update in single dataset layout --- web/htdocs/views.css | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index cbfe9de..e27e3d0 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -338,14 +338,15 @@ table.data.single { padding: 0; border-collapse: collapse; empty-cells: show; - width: auto; } table.data.single tr.data td { padding-bottom: 4px; - padding: 2px 5px 2px 5px; + padding: 4px 5px 2px 5px; text-align: left; - vertical-align: middle; + height: 16px; + line-height: 14px; + vertical-align: top; } table.data.single tr.data td.left { width: 10%;

12 years, 1 month

Check_MK Git: check_mk: Fixed typos

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d6cfdf4c7136928fafed773917c2f998bab549f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d6cfdf4c71369… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue May 29 09:38:14 2012 +0200 Fixed typos --- web/plugins/views/builtin.py | 2 +- web/plugins/views/datasources.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 3360473..b673523 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -230,7 +230,7 @@ multisite_builtin_views.update({ }, 'downtimes': {'column_headers': 'pergroup', 'datasource': 'downtimes', - 'description': 'All host- und service-downtimes', + 'description': 'All host- and service-downtimes', 'group_painters': [('downtime_what', None)], 'hard_filters': [], 'hard_filtervars': [('is_service_scheduled_downtime_depth', diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py index 81d28a1..1357c39 100644 --- a/web/plugins/views/datasources.py +++ b/web/plugins/views/datasources.py @@ -113,7 +113,7 @@ multisite_datasources["merged_servicegroups"] = { } multisite_datasources["comments"] = { - "title" : _("Host- und Servicecomments"), + "title" : _("Host- and Servicecomments"), "table" : "comments", "infos" : [ "comment", "host", "service" ], "keys" : [ "comment_id", "comment_type" ],

12 years, 1 month

Check_MK Git: check_mk: Mini layout fix in single view layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c4d8aa8fa76bf32470a902f3acffa046768ac88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c4d8aa8fa76bf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 25 16:54:07 2012 +0200 Mini layout fix in single view layout --- web/htdocs/views.css | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 4303b74..cbfe9de 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -339,7 +339,6 @@ table.data.single { border-collapse: collapse; empty-cells: show; width: auto; - box-shadow: 1px 1px 3px #000000; } table.data.single tr.data td {

12 years, 1 month

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, 1 month

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, 1 month

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, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
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