Checkmk git commits June 2012

checkmk-commits@lists.checkmk.com

2 participants
296 discussions

Check_MK Git: check_mk: Better implementation of narrow forms (

by git＠mathias-kettner.de

like Commands) 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: ad8e87a8d5226f9bd374b32102053f296609dd49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad8e87a8d5226f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 19:16:55 2012 +0200 Better implementation of narrow forms (like Commands) --- web/htdocs/forms.py | 4 ++-- web/htdocs/pages.css | 9 +++++++++ web/htdocs/valuespec.py | 3 ++- web/htdocs/views.css | 9 --------- web/htdocs/views.py | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 60fcec9..99f3efa 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -112,7 +112,7 @@ def strip_bad_chars(x): else: return s.translate(None, "'&;<>\"") -def header(title, isopen = True, table_id = ""): +def header(title, isopen = True, table_id = "", narrow = False): global g_header_open global g_section_open global g_section_isopen @@ -126,7 +126,7 @@ def header(title, isopen = True, table_id = ""): table_id = ' id="%s"' % table_id else: table_id = '' - html.write('<table %s class=nform>' % table_id) + html.write('<table %s class="nform%s">' % (table_id, narrow and " narrow" or "")) fold_id = strip_bad_chars(title) g_section_isopen = html.begin_foldable_container( html.form_name and html.form_name or "nform", fold_id, isopen, title, indent="nform") diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index ce03d08..5bc4414 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -626,6 +626,15 @@ table.nform td.legend.simple { padding-top: 5px; } +table.nform.narrow td.legend { + height: 18px; +} + +table.nform.narrow td.content { + height: 18px; + padding-bottom: 2px; +} + table.nform td.legend div.title { float: left; overflow: hidden; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 76c3906..599995b 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1666,6 +1666,7 @@ class Dictionary(ValueSpec): self._columns = kwargs.get("columns", 1) # possible: 1 or 2 self._render = kwargs.get("render", "normal") # also: "form" -> use forms.section() + self._form_narrow = kwargs.get("form_narrow", False) # used if render == "form" self._headers = kwargs.get("headers") def render_input(self, varprefix, value): @@ -1714,7 +1715,7 @@ class Dictionary(ValueSpec): self.render_input_form_header(varprefix, value, self.title(), None) def render_input_form_header(self, varprefix, value, title, sections): - forms.header(title) + forms.header(title, narrow=self._form_narrow) for param, vs in self._elements: if sections and param not in sections: continue diff --git a/web/htdocs/views.css b/web/htdocs/views.css index d28c7af..e6c4f57 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -222,15 +222,6 @@ div.view_form { margin-bottom: 10px; } -#commands table.nform td.legend { - height: 18px; -} - -#commands table.nform td.content { - height: 18px; - padding-bottom: 2px; -} - /*-------------------------------------------------------------------------. | _ _ | | | | __ _ _ _ ___ _ _| |_ ___ | diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 7c2000b..8e35f9e 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1996,7 +1996,7 @@ def show_command_form(is_open, datasource): html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars # html.write('<table class="form">') - forms.header(_("Commands")) + forms.header(_("Commands"), narrow=True) # Commands are defined in plugins/views/commands.py. Iterate # over all command definitions and render HTML input fields.

12 years, 3 months

Check_MK Git: check_mk: New helper function in html for adding variables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 062bab9f39cf5d54ae16ccd6b8b09422f39cbff8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=062bab9f39cf5d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 19:04:22 2012 +0200 New helper function in html for adding variables --- web/htdocs/htmllib.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a18ab72..f9c679f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -971,6 +971,12 @@ class html: else: return [] + # Adds a variable to listvars and also set it + def add_var(self, varname, value): + self.req.listvars.setdefault(varname, []) + self.req.listvars[varname].append(value) + self.req.vars[varname] = value + def set_var(self, varname, value): if value == None: self.del_var(varname)

12 years, 3 months

Check_MK Git: check_mk: Swapped icons for rule match and previous rule match (makes for sense)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab6310918b5cdc0cce082f4d22e000a129c350cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6310918b5cdc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 14:21:32 2012 +0200 Swapped icons for rule match and previous rule match (makes for sense) --- ChangeLog | 1 + web/htdocs/images/icon_rulematch.png | Bin 4152 -> 2992 bytes web/htdocs/images/icon_rulepmatch.png | Bin 2992 -> 4152 bytes 3 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7cf0d3..249d6f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ WATO: * FIX: Fixed "select all" button in hosts & folders for IE * Optically mark modified variables in global settings + * Swapped icons for rule match and previous rule match (makes for sense) Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/images/icon_rulematch.png b/web/htdocs/images/icon_rulematch.png index 5707ba9..caa0efe 100644 Binary files a/web/htdocs/images/icon_rulematch.png and b/web/htdocs/images/icon_rulematch.png differ diff --git a/web/htdocs/images/icon_rulepmatch.png b/web/htdocs/images/icon_rulepmatch.png index caa0efe..5707ba9 100644 Binary files a/web/htdocs/images/icon_rulepmatch.png and b/web/htdocs/images/icon_rulepmatch.png differ

12 years, 3 months

Check_MK Git: check_mk: ValueSpec Dict: fixed validation case

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 963971dba153b0e20f60594703bb06820428981b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=963971dba153b0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 14:21:01 2012 +0200 ValueSpec Dict: fixed validation case --- web/htdocs/valuespec.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2b9a4c0..76c3906 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1801,7 +1801,7 @@ class Dictionary(ValueSpec): vp = varprefix + "_p_" + param vs.validate_value(value[param], vp) elif not self._optional_keys or param in self._required_keys: - raise MKUserError(varprefix, _("The entry %s is missing") % vp.title()) + raise MKUserError(varprefix, _("The entry %s is missing") % vs.title()) # Base class for selection of a Nagios element out

12 years, 3 months

Check_MK Git: check_mk: ValueSpec ElementSelection: allow label and none-selection

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 016fd7c3537c87caed2246c3b87f98c26ce028a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=016fd7c3537c87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 11:21:28 2012 +0200 ValueSpec ElementSelection: allow label and none-selection --- web/htdocs/valuespec.py | 3 +++ web/htdocs/wato.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a80f9ef..2b9a4c0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1814,6 +1814,7 @@ class ElementSelection(ValueSpec): def __init__(self, **kwargs): ValueSpec.__init__(self, **kwargs) self._loaded_at = None + self._label = kwargs.get("label") def load_elements(self): if self._loaded_at != id(html): @@ -1833,6 +1834,8 @@ class ElementSelection(ValueSpec): if len(self._elements) == 0: html.write(_("There are not defined any elements for this selection yet.")) else: + if self._label: + html.write("%s " % self._label) html.sorted_select(varprefix, self._elements.items(), value) def value_to_text(self, value): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5e5be3e..b9e22dd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5680,12 +5680,17 @@ class GroupSelection(ElementSelection): def __init__(self, what, **kwargs): ElementSelection.__init__(self, **kwargs) self._what = what + # Allow to have "none" entry with the following title + self._no_selection = kwargs.get("no_selection") def get_elements(self): all_groups = load_group_information() this_group = all_groups.get(self._what, {}) # replace the title with the key if the title is empty - return dict([ (k, t and t or k) for (k, t) in this_group.items() ]) + elements = [ (k, t and t or k) for (k, t) in this_group.items() ] + if self._no_selection: + elements.append((None, self._no_selection)) + return dict(elements) class CheckTypeGroupSelection(ElementSelection):

12 years, 3 months

Check_MK Git: check_mk: Optically mark modified variables in global settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d253c9997b254b758b42934eff36639ed6caaf1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d253c9997b254b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 11:21:09 2012 +0200 Optically mark modified variables in global settings --- ChangeLog | 1 + web/htdocs/wato.css | 9 ++++++++- web/htdocs/wato.py | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32192bf..e7cf0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ WATO: * FIX: Fixed "select all" button in hosts & folders for IE + * Optically mark modified variables in global settings Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 46c844c..9921f5e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -758,11 +758,18 @@ div.varname { text-decoration: none; color: black; } - .wato div.globalvars a:hover { text-decoration: underline; } +.wato div.globalvars a.modified { + border-radius: 5px 5px 5px 5px; + box-shadow: 3px 3px 5px #A2BECD inset; + margin-left: -5px; + padding: 0 5px; +} + + .wato div.globalvars td.content img.iconbutton { width: 60px; height: 16px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 85da7fb..5e5be3e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5270,10 +5270,10 @@ def mode_globalvars(phase): if varname in current_settings: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), - # "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) - "snapin_switch_" + (current_settings[varname] and "on" or "off")) + "snapin_switch_" + (current_settings[varname] and "on" or "off"), + cssclass="modified") else: - html.write('<a href="%s">%s</a>' % (edit_url, to_text)) + html.write('<a class=modified href="%s">%s</a>' % (edit_url, to_text)) else: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"),

12 years, 3 months

Check_MK Git: check_mk: Change empty value for ElementSelection from None to ""

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37fe20df5bb9ce812566a76c739805fbfd0fa907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37fe20df5bb9ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Jun 3 12:20:50 2012 +0200 Change empty value for ElementSelection from None to "" --- web/htdocs/wato.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b9e22dd..d73a59d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5689,7 +5689,9 @@ class GroupSelection(ElementSelection): # replace the title with the key if the title is empty elements = [ (k, t and t or k) for (k, t) in this_group.items() ] if self._no_selection: - elements.append((None, self._no_selection)) + # Beware: ElementSelection currently can only handle string + # keys, so we cannot take 'None' as a value. + elements.append(('', self._no_selection)) return dict(elements)

12 years, 3 months

Check_MK Git: check_mk: FIX: preselected "refresh" option did not reflect view settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebdb2f48101114605beadca4e626915bb3812540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebdb2f48101114… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 2 16:28:17 2012 +0200 FIX: preselected "refresh" option did not reflect view settings --- ChangeLog | 6 ++++-- web/htdocs/views.py | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93992a3..32192bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.2.0b6 +1.2.0: Multisite: * FIX: Fixed layout of some dropdown fields in view filters * Make heading in each page clickable -> reload page @@ -7,9 +7,11 @@ * FIX: Fixed "select all" button for IE * FIX: Context links added by hooks are now hidden by the display option "B" again + * FIX: preselected "refresh" option did not reflect view settings + but was simply the first available option - usually 30. WATO: - * IX: Fixed "select all" button in hosts & folders for IE + * FIX: Fixed "select all" button in hosts & folders for IE Core: * FIX: Fixed "make_utf is not defined" error when having custom diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c14eac0..7c2000b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1534,7 +1534,13 @@ def view_linktitle(view): def view_optiondial(view, option, choices, help): vo = view_options(view["name"]) - value = vo.get(option, view.get(option, choices[0][0])) + # Darn: The option "refresh" has the name "browser_reload" in the + # view definition + if option == "refresh": + von = "browser_reload" + else: + von = option + value = vo.get(option, view.get(von, choices[0][0])) title = dict(choices).get(value, value) html.begin_context_buttons() # just to be sure # Remove unicode strings

12 years, 3 months

Check_MK Git: check_mk: WATO: New conveniance snapin for accessing WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a8bbd22c2915f11be259aa20c15106b1de73a4fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8bbd22c2915f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Jun 2 11:17:34 2012 +0200 WATO: New conveniance snapin for accessing WATO --- web/htdocs/images/button_auditlog_hi.png | Bin 0 -> 3861 bytes web/htdocs/images/button_auditlog_lo.png | Bin 0 -> 3836 bytes web/htdocs/images/button_backup_hi.png | Bin 0 -> 3316 bytes web/htdocs/images/button_backup_lo.png | Bin 0 -> 3986 bytes web/htdocs/images/button_configuration_hi.png | Bin 0 -> 4064 bytes web/htdocs/images/button_configuration_lo.png | Bin 0 -> 4401 bytes web/htdocs/images/button_contactgroups_hi.png | Bin 0 -> 4105 bytes web/htdocs/images/button_contactgroups_lo.png | Bin 0 -> 4963 bytes web/htdocs/images/button_folder_hi.png | Bin 0 -> 3034 bytes web/htdocs/images/button_folder_lo.png | Bin 0 -> 3806 bytes web/htdocs/images/button_home_hi.png | Bin 0 -> 3373 bytes web/htdocs/images/button_home_lo.png | Bin 0 -> 3261 bytes web/htdocs/images/button_hostgroups_hi.png | Bin 0 -> 4005 bytes web/htdocs/images/button_hostgroups_lo.png | Bin 0 -> 4708 bytes web/htdocs/images/button_hosttag_hi.png | Bin 0 -> 2766 bytes web/htdocs/images/button_hosttag_lo.png | Bin 0 -> 3395 bytes web/htdocs/images/button_roles_hi.png | Bin 0 -> 3702 bytes web/htdocs/images/button_roles_lo.png | Bin 0 -> 4550 bytes web/htdocs/images/button_rulesets_hi.png | Bin 0 -> 3673 bytes web/htdocs/images/button_rulesets_lo.png | Bin 0 -> 4217 bytes web/htdocs/images/button_servicegroups_hi.png | Bin 0 -> 4005 bytes web/htdocs/images/button_servicegroups_lo.png | Bin 0 -> 4708 bytes web/htdocs/images/button_sites_hi.png | Bin 0 -> 4542 bytes web/htdocs/images/button_sites_lo.png | Bin 0 -> 5597 bytes web/htdocs/images/button_timeperiods_hi.png | Bin 0 -> 3863 bytes web/htdocs/images/button_timeperiods_lo.png | Bin 0 -> 4812 bytes web/htdocs/images/button_users_hi.png | Bin 0 -> 4511 bytes web/htdocs/images/button_users_lo.png | Bin 0 -> 5593 bytes web/plugins/sidebar/wato.py | 40 ++++++++++++++++++++++-- 29 files changed, 36 insertions(+), 4 deletions(-) diff --git a/web/htdocs/images/button_auditlog_hi.png b/web/htdocs/images/button_auditlog_hi.png new file mode 100644 index 0000000..85fb30b Binary files /dev/null and b/web/htdocs/images/button_auditlog_hi.png differ diff --git a/web/htdocs/images/button_auditlog_lo.png b/web/htdocs/images/button_auditlog_lo.png new file mode 100644 index 0000000..7f9d3ef Binary files /dev/null and b/web/htdocs/images/button_auditlog_lo.png differ diff --git a/web/htdocs/images/button_backup_hi.png b/web/htdocs/images/button_backup_hi.png new file mode 100644 index 0000000..62a6c62 Binary files /dev/null and b/web/htdocs/images/button_backup_hi.png differ diff --git a/web/htdocs/images/button_backup_lo.png b/web/htdocs/images/button_backup_lo.png new file mode 100644 index 0000000..4164108 Binary files /dev/null and b/web/htdocs/images/button_backup_lo.png differ diff --git a/web/htdocs/images/button_configuration_hi.png b/web/htdocs/images/button_configuration_hi.png new file mode 100644 index 0000000..cd27661 Binary files /dev/null and b/web/htdocs/images/button_configuration_hi.png differ diff --git a/web/htdocs/images/button_configuration_lo.png b/web/htdocs/images/button_configuration_lo.png new file mode 100644 index 0000000..6d3b2ce Binary files /dev/null and b/web/htdocs/images/button_configuration_lo.png differ diff --git a/web/htdocs/images/button_contactgroups_hi.png b/web/htdocs/images/button_contactgroups_hi.png new file mode 100644 index 0000000..f67f685 Binary files /dev/null and b/web/htdocs/images/button_contactgroups_hi.png differ diff --git a/web/htdocs/images/button_contactgroups_lo.png b/web/htdocs/images/button_contactgroups_lo.png new file mode 100644 index 0000000..87fafd9 Binary files /dev/null and b/web/htdocs/images/button_contactgroups_lo.png differ diff --git a/web/htdocs/images/button_folder_hi.png b/web/htdocs/images/button_folder_hi.png new file mode 100644 index 0000000..e46268a Binary files /dev/null and b/web/htdocs/images/button_folder_hi.png differ diff --git a/web/htdocs/images/button_folder_lo.png b/web/htdocs/images/button_folder_lo.png new file mode 100644 index 0000000..f7314b3 Binary files /dev/null and b/web/htdocs/images/button_folder_lo.png differ diff --git a/web/htdocs/images/button_home_hi.png b/web/htdocs/images/button_home_hi.png new file mode 100644 index 0000000..4e7d5db Binary files /dev/null and b/web/htdocs/images/button_home_hi.png differ diff --git a/web/htdocs/images/button_home_lo.png b/web/htdocs/images/button_home_lo.png new file mode 100644 index 0000000..05fbf05 Binary files /dev/null and b/web/htdocs/images/button_home_lo.png differ diff --git a/web/htdocs/images/button_hostgroups_hi.png b/web/htdocs/images/button_hostgroups_hi.png new file mode 100644 index 0000000..e3b7593 Binary files /dev/null and b/web/htdocs/images/button_hostgroups_hi.png differ diff --git a/web/htdocs/images/button_hostgroups_lo.png b/web/htdocs/images/button_hostgroups_lo.png new file mode 100644 index 0000000..40f1169 Binary files /dev/null and b/web/htdocs/images/button_hostgroups_lo.png differ diff --git a/web/htdocs/images/button_hosttag_hi.png b/web/htdocs/images/button_hosttag_hi.png new file mode 100644 index 0000000..2e9852e Binary files /dev/null and b/web/htdocs/images/button_hosttag_hi.png differ diff --git a/web/htdocs/images/button_hosttag_lo.png b/web/htdocs/images/button_hosttag_lo.png new file mode 100644 index 0000000..5b8f1ac Binary files /dev/null and b/web/htdocs/images/button_hosttag_lo.png differ diff --git a/web/htdocs/images/button_roles_hi.png b/web/htdocs/images/button_roles_hi.png new file mode 100644 index 0000000..b461088 Binary files /dev/null and b/web/htdocs/images/button_roles_hi.png differ diff --git a/web/htdocs/images/button_roles_lo.png b/web/htdocs/images/button_roles_lo.png new file mode 100644 index 0000000..5eae512 Binary files /dev/null and b/web/htdocs/images/button_roles_lo.png differ diff --git a/web/htdocs/images/button_rulesets_hi.png b/web/htdocs/images/button_rulesets_hi.png new file mode 100644 index 0000000..59712c8 Binary files /dev/null and b/web/htdocs/images/button_rulesets_hi.png differ diff --git a/web/htdocs/images/button_rulesets_lo.png b/web/htdocs/images/button_rulesets_lo.png new file mode 100644 index 0000000..baac6ad Binary files /dev/null and b/web/htdocs/images/button_rulesets_lo.png differ diff --git a/web/htdocs/images/button_servicegroups_hi.png b/web/htdocs/images/button_servicegroups_hi.png new file mode 100644 index 0000000..42d4326 Binary files /dev/null and b/web/htdocs/images/button_servicegroups_hi.png differ diff --git a/web/htdocs/images/button_servicegroups_lo.png b/web/htdocs/images/button_servicegroups_lo.png new file mode 100644 index 0000000..40f1169 Binary files /dev/null and b/web/htdocs/images/button_servicegroups_lo.png differ diff --git a/web/htdocs/images/button_sites_hi.png b/web/htdocs/images/button_sites_hi.png new file mode 100644 index 0000000..6fd0583 Binary files /dev/null and b/web/htdocs/images/button_sites_hi.png differ diff --git a/web/htdocs/images/button_sites_lo.png b/web/htdocs/images/button_sites_lo.png new file mode 100644 index 0000000..b5f28c4 Binary files /dev/null and b/web/htdocs/images/button_sites_lo.png differ diff --git a/web/htdocs/images/button_timeperiods_hi.png b/web/htdocs/images/button_timeperiods_hi.png new file mode 100644 index 0000000..1a6f7ef Binary files /dev/null and b/web/htdocs/images/button_timeperiods_hi.png differ diff --git a/web/htdocs/images/button_timeperiods_lo.png b/web/htdocs/images/button_timeperiods_lo.png new file mode 100644 index 0000000..3b77e47 Binary files /dev/null and b/web/htdocs/images/button_timeperiods_lo.png differ diff --git a/web/htdocs/images/button_users_hi.png b/web/htdocs/images/button_users_hi.png new file mode 100644 index 0000000..cb4d4fc Binary files /dev/null and b/web/htdocs/images/button_users_hi.png differ diff --git a/web/htdocs/images/button_users_lo.png b/web/htdocs/images/button_users_lo.png new file mode 100644 index 0000000..681ed2d Binary files /dev/null and b/web/htdocs/images/button_users_lo.png differ diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index be085a2..ff0ff77 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -34,19 +34,26 @@ import config, wato # | \_/\_/_/ \_\_| \___/ | # | | # +----------------------------------------------------------------------+ -def render_wato(): +def render_wato(mini): if not config.wato_enabled: html.write(_("WATO is disabled in <tt>multisite.mk</tt>.")) elif not config.may("wato.use"): html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) return False - iconlink(_("Main Menu"), "wato.py", "home") + if mini: + html.icon_button("wato.py", _("Main Menu"), "home", target="main") + else: + iconlink(_("Main Menu"), "wato.py", "home") for mode, title, icon, permission, help in wato.modules: if "." not in permission: permission = "wato." + permission if config.may(permission) or config.may("wato.seeall"): - iconlink(title, "wato.py?mode=%s" % mode, icon) + url = "wato.py?mode=%s" % mode + if mini: + html.icon_button(url, title, icon, target="main") + else: + iconlink(title, url, icon) num_pending = wato.api.num_pending_changes() if num_pending: @@ -56,9 +63,34 @@ def render_wato(): sidebar_snapins["admin"] = { "title" : _("WATO · Configuration"), "description" : _("Direct access to WATO - the web administration GUI of Check_MK"), - "render" : render_wato, + "render" : lambda: render_wato(False), + "refresh" : 60, # refresh pending changes, if other user modifies something + "allowed" : [ "admin", "user" ], +} + +sidebar_snapins["admin_mini"] = { + "title" : _("WATO · Quickaccess"), + "description" : _("Access to WATO modules with only icons (saves space)"), + "render" : lambda: render_wato(True), "refresh" : 60, # refresh pending changes, if other user modifies something "allowed" : [ "admin", "user" ], + "styles": """ +#snapin_admin_mini { + padding-top: 6px; +} +#snapin_admin_mini img { + margin-right: 3.9px; + margin-bottom: 4px; + width: 18px; + height: 18px; + position: relative; + left: 3px; +} + +#snapin_admin_mini div.footnotelink { + margin-top: -14px; +} +""", }

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0729

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 06011b5ced51671a2e5a660808a544a73c8a7e33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06011b5ced5167… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jun 1 21:44:46 2012 +0200 Updated bug entries #0729 --- .bugs/729 | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/729 b/.bugs/729 index a60815e..3f73a8d 100644 --- a/.bugs/729 +++ b/.bugs/729 @@ -1,8 +1,10 @@ Title: Its not no longer possible to modify views Component: multisite -State: open +Class: bug +State: done Date: 2012-05-31 13:15:37 Targetversion: 1.2.0 -Class: bug Any view field that is not previously set, IE, any field that is currently set to “Don’t Use” can not be changed. The drop down menu is disabled…. + +2012-06-01 21:44:15: changed state open -> done

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2012