Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64249 discussions

Check_MK Git: check_mk: Better layout of sidebar footer

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7614d76d7fd5c8cb0b5f4480e4942c1d841d8157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7614d76d7fd5c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 18:08:27 2012 +0200 Better layout of sidebar footer --- web/htdocs/js/sidebar.js | 2 +- web/htdocs/sidebar.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 48cf29a..0ec43e4 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -397,7 +397,7 @@ function setSidebarHeight() { if (height == 0) return; - oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 5) + 'px'; + oContent.style.height = (height - oHeader.clientHeight - oFooter.clientHeight - 0) + 'px'; oFooter = null; diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 1e9f0c8..a44d87b 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -93,7 +93,7 @@ body.side { position: absolute; bottom: 0; left: 0; - height: 50px; + height: 44px; width: 100%; z-index: 10; background-repeat: no-repeat; @@ -103,7 +103,7 @@ body.side { #side_footer img.iconbutton { position: relative; top: 10px; - left: 10px; + left: 9px; margin-right: 3px; }

12 years, 5 months

Check_MK Git: check_mk: Fixed dimensions of bread crump

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0144276185f3d656cddd75fe3fb96a3bd1a39f13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0144276185f3d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 18:04:23 2012 +0200 Fixed dimensions of bread crump --- web/htdocs/wato.css | 54 ++++++++++++-------------------------------------- web/htdocs/wato.py | 10 ++++++-- 2 files changed, 20 insertions(+), 44 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 94d3a83..826c4bf 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,6 +45,7 @@ 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; } .wato table.data th { @@ -259,8 +260,10 @@ table.validationerror img { /* Path to current folder at top of screen */ .wato div.folderpath { - margin-bottom: 10px; + margin-bottom: 8px; height: 30px; + position: relative; + left: 3px; } .wato div.folderpath ul { @@ -303,10 +306,16 @@ table.validationerror img { } .wato div.folderpath li select { - padding-top: 1px; - padding-bottom: 1px; + padding: 2px 0px 2px 4px; background-color: #6da1b8; - color: #000; + margin: 0; + color: #fff; + font-weight: normal; + font-size: 8pt; + border-style: none; + position: relative; + right: -6px; + z-index: 200; } .wato div.folderpath li:hover select { @@ -360,43 +369,6 @@ table.validationerror img { background-image: url('images/breadcrumb_r_hi.png'); } -/*.wato div.folderpath a, .wato div.folderpath b, .wato div.folderpath i { - float: left; -} - -.wato div.folderpath i { - margin: 0px 3px; - font-weight: bold; - font-style: normal; -} - -.wato div.folderpath a, -.wato div.folderpath b { - -moz-border-radius: 3px; - background-color: #8ab; - padding: 2px 9px; - color: #fff; - font-weight: normal; -} -.wato div.folderpath a { - text-decoration: none; -} -.wato div.folderpath a:hover { - color: #fff; - background-color: #9bc; -}*/ - -.wato select.folderpath { - background-color: #8ab; - -moz-border-radius: 3px; - padding: 2px 4px; - margin: 0; - color: #fff; - font-weight: normal; - font-size: 8pt; - border-style: none; -} - .wato div.floatfolder { position: relative; left:-14px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b165568..06fa96f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -317,7 +317,6 @@ def page_handler(): else: html.context_button(buttontext, make_link([("mode", target)])) html.end_context_buttons() - html.write("<br>") # Show outcome of action if html.has_user_errors(): @@ -10704,6 +10703,7 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo while folder: folders.append(folder) folder = folder.get(".parent") + subfolders = the_folder[".folders"] parts = [] for folder in folders[::-1]: @@ -10715,6 +10715,7 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo else: parts.append(the_folder["title"]) + # Render the folder path html.write("<div class=folderpath><ul>\n") num = 0 @@ -10724,11 +10725,14 @@ def render_folder_path(the_folder = 0, link_to_last = False, keepvarnames = ["mo else: bc_el_start(z_index = 100 + num) html.write('<div class=content>%s</div>\n' % part) - bc_el_end() + + bc_el_end(num == len(parts)-1 + and not ( + len(subfolders) > 0 and not link_to_last) + and "end" or "") num += 1 # Render the current folder when having subfolders - subfolders = the_folder[".folders"] if len(subfolders) > 0 and not link_to_last: bc_el_start(z_index = 100 + num) html.write("<div class=content><form method=GET name=folderpath>")

12 years, 5 months

Check_MK Git: check_mk: Adapted time filters of builtin views

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45a184028c9eeac10f172f1710807770fe5668b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45a184028c9eea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 17:39:29 2012 +0200 Adapted time filters of builtin views --- web/plugins/views/builtin.py | 101 +++++++++++++++--------------------------- web/plugins/views/filters.py | 5 ++- 2 files changed, 40 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=45a184028c…

12 years, 5 months

Check_MK Git: check_mk: Filter for times now accept ranges (from ... until)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d113085b3ac282432ac4d2b8b12deba85151491 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d113085b3ac28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 17:07:27 2012 +0200 Filter for times now accept ranges (from ... until) --- ChangeLog | 1 + web/htdocs/htmllib.py | 7 +- web/htdocs/views.css | 33 +++++++++-- web/htdocs/views.py | 41 ++++++++------ web/plugins/views/filters.py | 129 +++++++++++++++++++++++------------------- 5 files changed, 127 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4d113085b3…

12 years, 5 months

Check_MK Git: check_mk: Global settings: make boolean switches directly togglable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08a5e301ee06f39dd932d31e5ca1b3e76521adce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08a5e301ee06f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 26 16:21:43 2012 +0200 Global settings: make boolean switches directly togglable --- ChangeLog | 1 + web/htdocs/wato.css | 5 ++++ web/htdocs/wato.py | 57 ++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 310c645..0e5a18a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ WATO: * Reimplemented folder listing in host/folders module * Redesigned the breadcrumb navigation + * Global settings: make boolean switches directly togglable * FIX: fix page header after confirmation dialogs * FIX: Fixed umlaut problem in host aliases and ip addresses created by WATO * FIX: Fixed exception caused by validation problems during editing tags in WATO diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fb8422b..94d3a83 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -664,6 +664,11 @@ table.validationerror img { font-size: 8pt; } +.wato table.data.globalvars img.iconbutton { + width: 60px; + height: 16px; +} + /* configuration overview */ .wato table.configmodules { empty-cells: show; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8708765..b165568 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4688,26 +4688,46 @@ def mode_globalvars(phase): current_settings = load_configuration_settings() if phase == "action": - varname = html.var("_reset") + varname = html.var("_varname") + action = html.var("_action") if varname: domain, valuespec, need_restart = g_configvars[varname] def_value = default_values.get(varname, valuespec.canonical_value()) - c = wato_confirm( - _("Resetting configuration variable"), - _("Do you really want to reset the configuration variable <b>%s</b> " - "back to the default value of <b><tt>%s</tt></b>?") % - (varname, valuespec.value_to_text(def_value))) + if action == "reset" and not isinstance(valuespec, Checkbox): + c = wato_confirm( + _("Resetting configuration variable"), + _("Do you really want to reset the configuration variable <b>%s</b> " + "back to the default value of <b><tt>%s</tt></b>?") % + (varname, valuespec.value_to_text(def_value))) + else: + if not html.check_transaction(): + return + c = True # no confirmation for direct toggle if c: - del current_settings[varname] + if action == "reset": + del current_settings[varname] + msg = _("Resetted configuration variable %s to its default.") % varname + else: + if varname in current_settings: + current_settings[varname] = not current_settings[varname] + else: + current_settings[varname] = not def_value + msg = _("Changed Configuration variable %s to %s." % (varname, + current_settings[varname] and "on" or "off")) save_configuration_settings(current_settings) - msg = _("Resetted configuration variable %s to its default.") % varname log_pending(need_restart and SYNCRESTART or SYNC, None, "edit-configvar", msg) - return "globalvars", msg + if action == "_reset": + return "globalvars", msg + else: + return "globalvars" elif c == False: return "" else: return None + else: + return + groupnames = g_configvar_groups.keys() groupnames.sort() @@ -4737,17 +4757,30 @@ def mode_globalvars(phase): html.write('<td class=title><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) if not config.wato_hide_varnames: html.write('<td class=varname><tt>%s</tt></td>' % varname) + toggle_url = make_action_link([("mode", "globalvars"), + ("_action", "toggle"), ("_varname", varname)]) if varname in current_settings: html.write('<td class=inherited>%s</td>' % valuespec.value_to_text(defaultvalue)) - html.write('<td><b>%s</b></td>' % valuespec.value_to_text(current_settings[varname])) + html.write('<td>') + if isinstance(valuespec, Checkbox): + html.icon_button(toggle_url, _("Immediately toggle this setting"), + "snapin_switch_" + (current_settings[varname] and "on" or "off")) + else: + html.write('<b>%s</b>' % valuespec.value_to_text(current_settings[varname])) + html.write("</td>") else: html.write('<td><b>%s</b></td>' % valuespec.value_to_text(defaultvalue)) - html.write('<td></td>') + html.write('<td>') + if isinstance(valuespec, Checkbox): + html.icon_button(toggle_url, _("Immediately toggle this setting"), + "snapin_switch_" + (defaultvalue and "on" or "off")) + html.write('</td>') html.write("<td class=buttons>") # html.buttonlink(edit_url, _("Edit")) if varname in current_settings: - reset_url = make_action_link([("mode", "globalvars"), ("_reset", varname)]) + reset_url = make_action_link([("mode", "globalvars"), + ("_action", "reset"), ("_varname", varname)]) html.buttonlink(reset_url, _("Reset")) html.write("</td>")

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0607

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ab11a012edbcf8efbbdcfd943297ecd59f42d5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ab11a012edbcf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:51:49 2012 +0200 Updated bug entries #0607 --- .bugs/607 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.bugs/607 b/.bugs/607 index 0dcb48f..cf78e7e 100644 --- a/.bugs/607 +++ b/.bugs/607 @@ -15,3 +15,4 @@ Fehler muss wo anders liegen. Lars: Ich kann das bestätigen. Das ist offenbar ein Caching Problem. Ich habe gerade die start_url geändert und nach einigen Seitenaufrufen wieder auf den Default Wert zurückgesetzt. Jetzt lädt aber immer noch die zwischendurch gesetzte URL. +Ein "omd restart apache" behebt das Problem.

12 years, 5 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: 11a7070ecbe4d1de82fabc2277648cb5e46feac1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11a7070ecbe4d1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 16:26:34 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0696, #0697, #0607

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3be400fe0eb1a9cc3a6c73d16633a07e6b24a85c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3be400fe0eb1a9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 25 12:51:16 2012 +0200 Updated bug entries #0696, #0697, #0607 --- .bugs/607 | 6 +++++- .bugs/696 | 9 +++++++++ .bugs/697 | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/.bugs/607 b/.bugs/607 index 660fb24..0dcb48f 100644 --- a/.bugs/607 +++ b/.bugs/607 @@ -3,7 +3,7 @@ Component: wato State: open Date: 2012-01-27 14:46:10 Targetversion: 1.2.0 -Class: nastiness +Class: bug Das Ändern der Einstellung: wato_activation_method über Wato erfordert einen Apache restart damit es funktioniert. Wato führt diesen jedoch nicht aus. @@ -11,3 +11,7 @@ Apache restart damit es funktioniert. Wato führt diesen jedoch nicht aus. Mathias: Das kann eigentlich nicht so sein. Änderungen in multisite.mk brauchen nie einen Neustart. WATO kann auch keinen Neustart von Apache machen. Der Fehler muss wo anders liegen. + +Lars: Ich kann das bestätigen. Das ist offenbar ein Caching Problem. Ich habe gerade +die start_url geändert und nach einigen Seitenaufrufen wieder auf den Default Wert +zurückgesetzt. Jetzt lädt aber immer noch die zwischendurch gesetzte URL. diff --git a/.bugs/696 b/.bugs/696 new file mode 100644 index 0000000..7d1e74a --- /dev/null +++ b/.bugs/696 @@ -0,0 +1,9 @@ +Title: WATO host/folder move to: Visualize folder tree +Component: wato +State: open +Date: 2012-04-25 12:44:55 +Targetversion: 1.2.0 +Class: nastiness + +The display text in the dropdown fields has to visualize the folder hierarchy. +At the moment there is only a plain list shown in the dropdown field. diff --git a/.bugs/697 b/.bugs/697 new file mode 100644 index 0000000..141900d --- /dev/null +++ b/.bugs/697 @@ -0,0 +1,9 @@ +Title: WATO host/folders - <form> must not be nested +Component: wato +State: open +Date: 2012-04-25 12:47:08 +Targetversion: 1.2.0 +Class: bug + +It is not allowed to have nested forms. The search host form must be moved outside the +host table form.

12 years, 5 months

Check_MK Git: check_mk: Remove unused variable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fe4ba9d37d7d365feb20a4dae9be6a53dd4e526 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fe4ba9d37d7d3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 25 15:53:03 2012 +0200 Remove unused variable --- .bugs/681 | 10 ++++++++++ web/htdocs/wato.py | 1 - 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/.bugs/681 b/.bugs/681 new file mode 100644 index 0000000..70ff811 --- /dev/null +++ b/.bugs/681 @@ -0,0 +1,10 @@ +Title: load_plugins should raise error if plugin is broken +Component: multisite +State: open +Date: 2012-04-25 10:45:52 +Targetversion: 1.2.0 +Class: nastiness + +When loading plugins (e.g. WATO rule_specs), and there is a syntax +or other error in the plugin, an Exception should be raised. +Currently the plugin is silently ignored. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index fe2801f..e89a814 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8210,7 +8210,6 @@ def mode_edit_hosttag(phase): html.write("</td></tr>") # Choices - num_choices = 16 html.write("<tr><td class=legend>") html.write(_("Choices") + "<br><i>" + _("The first choice of a tag group will be its default value. "

12 years, 5 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: b876e5ee16f309e1b02384b993d5a4efae6f06b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b876e5ee16f309… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 25 15:53:19 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits