Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64173 discussions

Check_MK Git: check_mk: Updated bug entries #0601

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 416a9b412e36808b3cff3ee37086daa413baf7a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416a9b412e3680… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 17 11:45:14 2012 +0100 Updated bug entries #0601 --- .bugs/601 | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/.bugs/601 b/.bugs/601 new file mode 100644 index 0000000..6f86b24 --- /dev/null +++ b/.bugs/601 @@ -0,0 +1,20 @@ +Title: Checkboxes in views and brower back in disharmony +Component: multisite +State: open +Date: 2012-01-17 11:43:07 +Targetversion: 1.2.0 +Class: bug + +Tested on IE8, but might be browser independent. +The following steps produce the problem: + +1. Open a view and activate checkboxes +2. Check one service +3. Select "Downtime 2hours" +4. When the question "Are you sure?" comes press the + browser "Back" button + -> The one service is still being displayed as + checks. Good. But internally it seems unchecked. +5. Now again select a command. + -> Now the command will be applied to *all* + services instead of the one.

12 years, 8 months

Check_MK Git: check_mk: new valuespec RadioChoice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5dc344efec14f7d4568c821e0a30138fb0b0d1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5dc344efec14f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 17 10:56:53 2012 +0100 new valuespec RadioChoice --- web/htdocs/valuespec.py | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e498133..4edad63 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -562,6 +562,43 @@ class DropdownChoice(ValueSpec): raise MKUserError(varprefix, _("Invalid value %s, must be in %s") % ", ".join([v for (v,t) in self._choices])) +# The same logic as the dropdown choice, but rendered +# as a group of radio buttons. +# columns == None or unset -> separate with " " +class RadioChoice(DropdownChoice): + def __init__(self, **kwargs): + DropdownChoice.__init__(self, **kwargs) + self._columns = kwargs.get("columns") + + def render_input(self, varprefix, value): + html.begin_radio_group() + if self._columns != None: + html.write("<table class=radiochoice>") + html.write("<tr>") + + for n, entry in enumerate(self._choices): + if self._columns != None: + html.write("<td>") + if len(entry) > 2: # icon! + label = '<img class=icon align=absmiddle src="images/icon_%s.png" title="%s">' % \ + ( entry[2], entry[1].encode("utf-8")) + else: + label = entry[1] + html.radiobutton(varprefix, str(n), value == entry[0], label) + if self._columns != None: + html.write("</td>") + if (n+1) % self._columns == 0 and (n+1) < len(self._choices)-1: + html.write("<tr></tr>") + else: + html.write(" ") + if self._columns != None: + mod = len(self._choices) % self._columns + if mod: + html.write("<td></td>" * (self._columns - mod - 1)) + html.write("</tr></table>") + html.end_radio_group() + + # A list of checkboxes representing a list of values class ListChoice(ValueSpec):

12 years, 8 months

Check_MK Git: check_mk: Forms: switch to hoverable help

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 979ec47a0260432733a0379b230e2ef47f6e4eee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=979ec47a026043… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 16:19:38 2012 +0100 Forms: switch to hoverable help --- web/htdocs/forms.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index c39dc64..8775414 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -27,7 +27,7 @@ from lib import * -def edit_dictionary(entries, value, focus=None): +def edit_dictionary(entries, value, focus=None, hover_help=True): new_value = value.copy() if html.check_transaction(): messages = [] @@ -48,8 +48,12 @@ def edit_dictionary(entries, value, focus=None): html.write("<table class=form>\n") first = True for name, vs in entries: - html.write("<tr><td class=legend>%s" % vs.title()) - if vs.help(): + + html.write("<tr><td ") + if vs.help() and hover_help: + html.write('title="%s" ' % vs.help().replace('"', """)) + html.write("class=legend>%s" % vs.title()) + if vs.help() and not hover_help: html.write("<br><i>%s</i>" % vs.help()) html.write("</td><td class=content>") if name in value:

12 years, 8 months

Check_MK Git: check_mk: New valuespec for http urls

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9c484cd2cab8f66a721459b9dcf8af93efec51ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c484cd2cab8f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 15:34:02 2012 +0100 New valuespec for http urls --- web/htdocs/valuespec.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 02bd5b5..e498133 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import math, os, time, re +import math, os, time, re, urlparse from lib import * # Abstract base class of all value declaration classes. @@ -300,6 +300,44 @@ class EmailAddress(TextAscii): def value_to_text(self, value): return '<a href="mailto:%s">%s</a>' % (value, value) +# Valuespec for a HTTP Url (not HTTPS), that +# automatically adds http:// to the value +class HTTPUrl(TextAscii): + def __init__(self, **kwargs): + TextAscii.__init__(self, **kwargs) + self._target= kwargs.get("target") + + def validate_value(self, value, varprefix): + TextAscii.validate_value(self, value, varprefix) + if value: + if not value.startswith("http://"): + raise MKUserError(varprefix, _("The URL must begin with http://")) + + def from_html_vars(self, varprefix): + value = TextAscii.from_html_vars(self, varprefix) + if value: + if not "://" in value: + value = "http://" + value + return value + + def value_to_text(self, url): + if not url.startswith("http://"): + url = "http://" + url + try: + parts = urlparse.urlparse(url) + if parts.path in [ '', '/' ]: + text = parts.netloc + else: + text = url[7:] + except: + text = url[7:] + + # Remove trailing / if the url does not contain + # any path component + return '<a %shref="%s">%s</a>' % ( + (self._target and 'target="%s" ' % self._target or ""), + url, text) + class TextUnicode(TextAscii): def __init__(self, **kwargs):

12 years, 8 months

Check_MK Git: check_mk: Fix styling of empty icon button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f18bb1538db42df094fa123cc6fe3324ab21a761 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f18bb1538db42d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 15:08:24 2012 +0100 Fix styling of empty icon button --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 83c6576..148749f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -331,7 +331,7 @@ class html: '</a>\n' % (url, help, icon)) def empty_icon_button(self): - self.write('<img class="icon trans" src="images/trans.png">') + self.write('<img class="iconbutton trans" src="images/trans.png">\n') def jsbutton(self, varname, text, onclick, style=''): if style:

12 years, 8 months

Check_MK Git: check_mk: Fix styling for empty_icon_button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 514d7b3309c5fa267812d631da613ce9c37d5165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=514d7b3309c5fa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 15:04:07 2012 +0100 Fix styling for empty_icon_button --- web/htdocs/htmllib.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index dddf9b2..83c6576 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -331,7 +331,7 @@ class html: '</a>\n' % (url, help, icon)) def empty_icon_button(self): - self.write('<img class=trans src="images/trans.png">') + self.write('<img class="icon trans" src="images/trans.png">') def jsbutton(self, varname, text, onclick, style=''): if style:

12 years, 8 months

Check_MK Git: check_mk: Added new bug

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5d06f259e8b6ff7defda3e8164bc189a15aa02b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d06f259e8b6ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 13:14:01 2012 +0100 Added new bug --- .bugs/600 | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/.bugs/600 b/.bugs/600 new file mode 100644 index 0000000..5512ebc --- /dev/null +++ b/.bugs/600 @@ -0,0 +1,14 @@ +Title: Login page shown (IE) while being logged in +Component: multisite +State: open +Date: 2012-01-16 13:06:47 +Targetversion: 1.2.0 +Class: bug + +Test on IE: We use cookie based login and are logged in. +Now we enter http://192.168.56.1/walks/ in the URL field +of IE and hit enter -> the login form is being show. +Now we can simply click "Login" without entering any data +and are logged in. + +The login form should not be shown in the first place here!

12 years, 8 months

Check_MK Git: check_mk: FIX: fix hitting enter in host search form on IE

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8cc4939a20cf74355ce86fbf74dce6457a20c5e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cc4939a20cf74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 13:14:17 2012 +0100 FIX: fix hitting enter in host search form on IE --- ChangeLog | 1 + web/htdocs/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4fe79f..1d1f3db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -196,6 +196,7 @@ Multisite: * FIX: detail view of host was missing column headers * FIX: fix problem on IE with background color 'white' + * FIX: fix hitting enter in host search form on IE Checks & Agents: * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 85382d1..1a665f7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1237,7 +1237,7 @@ def show_view(view, show_heading = False, show_buttons = True, painter_options.sort() # Fetch data. Some views show data only after pressing [Search] - if (only_count or (not view["mustsearch"]) or html.var("search")): + if (only_count or (not view["mustsearch"]) or html.var("filled_in") == "filter"): # names for additional columns (through Stats: headers) add_columns = datasource.get("add_columns", []) @@ -1330,7 +1330,7 @@ def render_view(view, rows, datasource, group_painters, painters, # Filter-button if 'F' in display_options and len(show_filters) > 0: - filter_isopen = html.var("search", "") == "" and view["mustsearch"] + filter_isopen = html.var("filled_in") != "filter" and view["mustsearch"] # Show warning-icon if some filter is set label = _("Filter") if html.var("filled_in") == "filter":

12 years, 8 months

Check_MK Git: check_mk: FIX: fix problem on IE with background color "white "

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 373162baf4be30802b8fc7ebca3938bf2e762b81 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=373162baf4be30… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 12:56:19 2012 +0100 FIX: fix problem on IE with background color "white" --- ChangeLog | 1 + web/htdocs/js/checkmk.js | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b9b9a2..f4fe79f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,6 +195,7 @@ 1.1.12p7: Multisite: * FIX: detail view of host was missing column headers + * FIX: fix problem on IE with background color 'white' Checks & Agents: * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index e908f9e..d33e94c 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1017,6 +1017,9 @@ function highlight_row(elem, on) { function highlight_elem(elem, on) { // Find all elements below "elem" with a defined background-color and change it var bg_color = real_style(elem, 'background-color', 'backgroundColor'); + if (bg_color == 'white') + bg_color = "#ffffff"; + if(on) { elem['hover_orig_bg'] = bg_color; elem.style.backgroundColor = lightenColor(elem['hover_orig_bg'], -20);

12 years, 8 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: c1326f9138d6f75db5b0566d3338ba0ce01f666b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1326f9138d6f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 16 09:57:40 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits