Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64283 discussions

Check_MK Git: check_mk: Remove underline from links in tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 693251b2d40a9444e6427c1c040da49fc7f99d0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=693251b2d40a94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:43:59 2012 +0200 Remove underline from links in tables --- web/htdocs/pages.css | 8 ++++++++ web/htdocs/status.css | 3 +++ web/htdocs/views.css | 3 +++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1e6dd0c..1a26870 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -267,6 +267,14 @@ table.data tr.data td { vertical-align: middle; } +table.data a { + text-decoration: none; + color: black; +} +table.data tr.data td a:hover { + text-decoration: underline; +} + table.data tr.data td.checkbox { width: 20px; text-align: center; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 67fb770..1b93c68 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -286,6 +286,9 @@ table.data td.count { font-weight: bold; font-family: sans-serif; } +table.data .state0 *, table.data .state2 *, table.data .state3 * { + color: white; +} table.data td.number { text-align: right; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 3799fb2..9dfc07b 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -145,6 +145,9 @@ div.empty_columnswitcher { float: left; } +div.view_form { + margin-bottom: 10px; +} /*-------------------------------------------------------------------------.

12 years, 4 months

Check_MK Git: check_mk: Changed styling of data tables

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 159fd56f0f9d924a0765151e121b48d4a65f9b55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=159fd56f0f9d92… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:59:31 2012 +0200 Changed styling of data tables (omit horizontal borders) --- web/htdocs/pages.css | 3 ++- web/htdocs/status.css | 4 ++-- web/htdocs/wato.css | 2 +- web/htdocs/wato.py | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 1a26870..31f98e5 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -261,7 +261,8 @@ table.data th.tablegap { } table.data tr.data td { - border: 1px solid #bbb; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; padding: 2px 4px; height: 22px; vertical-align: middle; diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 1b93c68..350f3c6 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -225,8 +225,8 @@ tr.even1 { background-color: #ffa; } tr.odd2 { background-color: #fcc; } tr.even2 { background-color: #faa; } -tr.odd3 { background-color: #fda; } -tr.even3 { background-color: #fea; } +tr.odd3 { background-color: #ffe0a0; } +tr.even3 { background-color: #ffefaf; } /* Row headers in single dataset layout */ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 6b9791d..e64873c 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -45,7 +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; */ + box-shadow: 0 0 3px #334488; width: auto; } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 51ad0db..87016d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1164,9 +1164,9 @@ def show_hosts(folder): # Helper function for showing bulk actions. This is needed at the bottom # of the table of hosts and - if there are more than just a few - also # at the top of the table. - def bulk_actions(at_least_one_imported, top, colspan): + def bulk_actions(at_least_one_imported, top, colspan, odd): # bulk actions - html.write('<tr class="data odd0">') + html.write('<tr class="data %s0">' % odd) html.write('<td>') html.jsbutton('_markall', _('X'), 'javascript:toggle_all_rows();') html.write("</td><td class=bulksearch colspan=2>") @@ -1228,7 +1228,7 @@ def show_hosts(folder): # list shows more than 10 rows if more_than_ten_items and \ (config.may("wato.edit_hosts") or config.may("wato.manage_hosts")): - bulk_actions(at_least_one_imported, True, colspan) + bulk_actions(at_least_one_imported, True, colspan, "even") # Header line html.write("<tr><th class=left></th><th></th><th>" @@ -1349,7 +1349,7 @@ def show_hosts(folder): html.write("</tr>\n") if config.may("wato.edit_hosts") or config.may("wato.manage_hosts"): - bulk_actions(at_least_one_imported, False, colspan) + bulk_actions(at_least_one_imported, False, colspan, odd) html.write("</table>\n") html.hidden_fields()

12 years, 4 months

Check_MK Git: check_mk: Better layout for checkbox button

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08b7603aa6406de29bf479cd3b0a008524e688a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b7603aa6406d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:26:39 2012 +0200 Better layout for checkbox button --- web/htdocs/js/checkmk.js | 35 +++++++++++++++++++++++++---------- web/htdocs/views.py | 13 +++++++++++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d467597..7267e72 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1626,21 +1626,36 @@ function view_toggle_form(oButton, idForm) { } -/* Switch number of view columns, refresh and checkboxes */ +/* Switch number of view columns, refresh and checkboxes. If the + choices are missing, we do a binary toggle. */ gColumnSwitchTimeout = null; function view_switch_option(oDiv, viewname, option, choices) { var current_title = oDiv.firstChild.innerHTML; - var new_choice = choices[0]; // in case not contained in choices - for (var c=0; c<choices.length; c++) { - choice = choices[c]; - val = choice[0]; - title = choice[1]; - if (current_title == title) { - var new_choice = choices[(c+1) % choices.length]; - break; + if (choices) { + var new_choice = choices[0]; // in case not contained in choices + for (var c=0; c<choices.length; c++) { + choice = choices[c]; + val = choice[0]; + title = choice[1]; + if (current_title == title) { + var new_choice = choices[(c+1) % choices.length]; + break; + } } + oDiv.firstChild.innerHTML = "" + new_choice[1]; } - oDiv.firstChild.innerHTML = "" + new_choice[1]; + else { + if (oDiv.className.indexOf('down') != -1) { + new_value = false; + oDiv.className = 'columnswitcher'; + } + else { + new_value = true; + oDiv.className = 'columnswitcher down'; + } + new_choice = [ new_value, '' ]; + } + get_url_sync("ajax_set_viewoption.py?view_name=" + viewname + "&option=" + option + "&value=" + new_choice[0]); if (option == "refresh") diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 1040912..4785f85 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1535,6 +1535,16 @@ def view_option_switcher(view, option, choices): 'onclick="view_switch_option(this, \'%s\', \'%s\', %r);"><div>%s</div></div>' % ( view["name"], option, choices, title)) +def view_option_toggler(view, option, title): + vo = view_options(view["name"]) + value = vo.get(option, view.get(option, False)) + html.begin_context_buttons() # just to be sure + html.write('<div class="columnswitcher %s"' + 'onclick="view_switch_option(this, \'%s\', \'%s\');"><div>%s</div></div>' % ( + value and "down" or "", view["name"], option, title)) + + + # Will be called when the user presses the upper button, in order # to persist the new setting - and to make it active before the # browser reload of the DIV containing the actual status data is done. @@ -1594,8 +1604,7 @@ def show_context_links(thisview, active_filters, show_filters, display_options, if 'C' in display_options: if command_form: toggle_button("commands", False, "commands", _("Execute commands on hosts, services and other objects")) - choices = [ [ False, 'O' ], [ True, 'X' ] ] - view_option_switcher(thisview, "show_checkboxes", choices) + view_option_toggler(thisview, "show_checkboxes", "X") else: empty_toggle_button() empty_toggle_button()

12 years, 4 months

Check_MK Git: check_mk: Fixed layout problems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 215764dc7fa779900fd14f83503531f92b3382ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=215764dc7fa779… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:33:30 2012 +0200 Fixed layout problems --- web/htdocs/htmllib.py | 4 ++-- web/htdocs/pages.css | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 884c09e..c4b1808 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -839,8 +839,8 @@ class html: if self.req.header_sent: self.bottom_focuscode() corner_text = "" - # if self.browser_reload: - # corner_text += _("refresh: %s secs") % self.browser_reload + if self.browser_reload: + corner_text += _("refresh: %s secs") % self.browser_reload if self.render_headfoot: si = self.render_status_icons() self.write("<table class=footer><tr>" diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 0bf7d7f..1e6dd0c 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -271,6 +271,10 @@ table.data tr.data td.checkbox { width: 20px; text-align: center; } +table.data tr.data td.checkbox input { + margin: 0px; +} + table.data th input.checkgroup { height: 12px; width: 16px;

12 years, 4 months

Check_MK Git: check_mk: Redesign of views filter bar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0acf2ee8202108c073ad1f0bcfea018038531a5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0acf2ee8202108… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 18:17:01 2012 +0200 Redesign of views filter bar --- ChangeLog | 1 + web/htdocs/images/columnswitcher.png | Bin 702 -> 741 bytes web/htdocs/images/columnswitcher_down.png | Bin 671 -> 648 bytes web/htdocs/images/columnswitcher_hi.png | Bin 720 -> 748 bytes web/htdocs/images/icon_commands.png | Bin 0 -> 2981 bytes web/htdocs/images/icon_filter.png | Bin 0 -> 3885 bytes web/htdocs/images/icon_painteroptions.png | Bin 0 -> 5111 bytes web/htdocs/js/checkmk.js | 65 ++++---- web/htdocs/sidebar.css | 2 +- web/htdocs/views.css | 165 +++++-------------- web/htdocs/views.py | 267 +++++++++++------------------ web/plugins/views/filters.py | 2 +- 12 files changed, 179 insertions(+), 323 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0acf2ee820…

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0752

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fd7406828ccff2616bcc8f902654fc37666f6ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fd7406828ccff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 20 15:58:39 2012 +0200 Updated bug entries #0752 --- .bugs/752 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/752 b/.bugs/752 new file mode 100644 index 0000000..1969811 --- /dev/null +++ b/.bugs/752 @@ -0,0 +1,9 @@ +Title: Opera: Globes are only displayed half +Component: multisite +State: open +Date: 2012-05-20 15:58:01 +Targetversion: 1.2.0 +Class: bug + +Only the right half of the actual data is being displayed. +Maybe Opera has problems with negative values somewhere.

12 years, 4 months

Check_MK Git: check_mk: Views: move edit button into context button area

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 670628cc7535e7f33f8ad3a659f7aadc737c8909 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=670628cc7535e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 19 12:46:25 2012 +0200 Views: move edit button into context button area --- web/htdocs/views.py | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 99b196a..6fcc20a 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -548,7 +548,7 @@ def page_edit_view(): "view that has the same link name as a builtin view, then your " "view will override that (shadowing it).")) - forms.section(_("Datasource")) + forms.section(_("Datasource"), simple=True) datasource_title = multisite_datasources[datasourcename]["title"] html.write("%s: <b>%s</b><br>\n" % (_('Datasource'), datasource_title)) html.hidden_field("datasource", datasourcename) @@ -585,7 +585,7 @@ def page_edit_view(): html.write(_(" seconds")) html.help(_("Leave this empty or at 0 for now automatic reload.")) - forms.section(_("Audible alarm sounds")) + forms.section(_("Audible alarm sounds"), simple=True) html.checkbox("play_sounds", False, label=_("Play alarm sounds")) html.help(_("If enabled and the view shows at least one host or service problem " "the a sound will be played by the browser. Please consult the %s for details.") @@ -692,10 +692,10 @@ def page_edit_view(): ("pergroup", _("once per group")), ("repeat", _("repeat every 20'th row")) ]) - forms.section(_('Sortable by user')) + forms.section(_('Sortable by user'), simple=True) html.checkbox('user_sortable', True, label=_("Make view sortable by user")) - forms.section(_('Checkboxes')) + forms.section(_('Checkboxes'), simple=True) html.checkbox('show_checkboxes', False, label=_("Show checkboxes for selecting rows")) forms.end() @@ -1314,7 +1314,7 @@ def render_view(view, rows, datasource, group_painters, painters, has_done_actions = False if show_buttons and 'B' in display_options: - show_context_links(view, hide_filters) + show_context_links(view, hide_filters, display_options) # User errors in filters html.show_user_errors() @@ -1399,18 +1399,6 @@ def render_view(view, rows, datasource, group_painters, painters, html.write("<td class=gap> </td>\n") - # Customize/Edit view button - if 'E' in display_options and config.may("edit_views"): - backurl = htmllib.urlencode(html.makeuri([])) - html.write('<td class="right" onmouseover="hover_tab(this);" onmouseout="unhover_tab(this);">') - if view["owner"] == config.user_id: - html.write('<a href="edit_view.py?load_view=%s&back=%s">%s</a>\n' % - (view["name"], backurl, _('Edit'))) - else: - html.write('<a href="edit_view.py?clonefrom=%s&load_view=%s&back=%s">%s</a>\n' % - (view["owner"], view["name"], backurl, _('Edit'))) - html.write('</td>') - html.write("</tr>") html.write("</table><table class=navi><tr>\n") @@ -1641,7 +1629,7 @@ def view_linktitle(view): return t -def show_context_links(thisview, active_filters): +def show_context_links(thisview, active_filters, display_options): # html.begin_context_buttons() called automatically by html.context_button() # That way if no button is painted we avoid the empty container execute_hooks('buttons-begin') @@ -1665,6 +1653,16 @@ def show_context_links(thisview, active_filters): if not view.get("mobile"): html.context_button(linktitle, url=uri, icon=icon, id=buttonid, bestof=config.context_buttons_to_show) + # Customize/Edit view button + if 'E' in display_options and config.may("edit_views"): + backurl = htmllib.urlencode(html.makeuri([])) + if thisview["owner"] == config.user_id: + url = "edit_view.py?load_view=%s&back=%s" % (thisview["name"], backurl) + else: + url = "edit_view.py?clonefrom=%s&load_view=%s&back=%s" % \ + (thisview["owner"], thisview["name"], backurl) + html.context_button(_("Edit View"), url, "edit", id="edit", bestof=config.context_buttons_to_show) + execute_hooks('buttons-end') html.end_context_buttons()

12 years, 4 months

Check_MK Git: check_mk: First step in redesign of view options

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b33de3e8ca3bcb47b27b220589955153729265c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b33de3e8ca3bcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 19 18:24:25 2012 +0200 First step in redesign of view options --- web/htdocs/htmllib.py | 11 +- web/htdocs/images/columnswitcher.png | Bin 0 -> 702 bytes web/htdocs/images/columnswitcher_down.png | Bin 0 -> 671 bytes web/htdocs/images/columnswitcher_hi.png | Bin 0 -> 720 bytes web/htdocs/js/checkmk.js | 26 ++++ web/htdocs/pages.css | 4 + web/htdocs/views.css | 25 ++++ web/htdocs/views.py | 186 ++++++++++++++++++----------- web/plugins/pages/shipped.py | 1 + 9 files changed, 178 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b33de3e8ca…

12 years, 4 months

Check_MK Git: check_mk: Minor layout improvement in forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ea051329ae40e46a62820b96d79c82f40c0c45c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ea051329ae40e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat May 19 12:07:14 2012 +0200 Minor layout improvement in forms --- web/htdocs/forms.py | 7 ++++--- web/htdocs/pages.css | 17 +++++++++++++++-- web/htdocs/wato.css | 4 ++-- web/htdocs/wato.py | 39 ++++++++++++++++++++++----------------- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 484c975..02dc244 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -131,13 +131,14 @@ def container(): (not g_section_isopen and "none" or "")) g_section_open = True -def section(title = None, checkbox = None, id = ""): +def section(title = None, checkbox = None, id = "", simple=False): global g_section_open if g_section_open: html.write('</td></tr>') if id: id = ' id="%s"' % id - html.write('<tr style="display: %s"%s><td class=legend>' % (not g_section_isopen and "none" or "", id)) + html.write('<tr style="display: %s"%s><td class="legend%s">' % + (not g_section_isopen and "none" or "", id, simple and " simple" or "")) if title: html.write('<div class="title%s">%s<span class="dots">%s</span></div>' % (checkbox and " withcheckbox" or "", title, "."*100)) @@ -151,7 +152,7 @@ def section(title = None, checkbox = None, id = ""): html.write('</div>') html.write('</td>') - html.write('<td class=content>') + html.write('<td class="content%s">' % (simple and " simple" or "")) g_section_open = True def end(): diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 50418a3..6647502 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -518,15 +518,24 @@ table.nform > tbody > tr > td { height: 27px; } +table.nform > tbody > tr > td.simple { + vertical-align: top; + height: 18px; +} + table.nform td.legend { text-align: left; /* font-weight: bold; */ width: 240px; padding-right: 8px; vertical-align: top; - padding-top: 11px; + padding-top: 8px; padding-left: 10px; } +table.nform td.legend.simple { + padding-top: 5px; +} + table.nform td.legend div.title { float: left; overflow: hidden; @@ -548,6 +557,10 @@ table.nform td.legend div.checkbox { table.nform td.content { padding-left: 10px; padding-right: 10px; + padding-bottom: 10px; +} +table.nform td.content.simple { + padding-bottom: 0px; } table.nform td.buttons { @@ -558,7 +571,7 @@ table.nform tr.top td { } table.nform tr.bottom td { - height: 10px; + height: 5px; } /*-------------------------------------------------------------------------. diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 1cb7d5f..6b9791d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -776,9 +776,9 @@ div.varname { max-width: 350px; } -.wato div.globalvars td { +/*.wato div.globalvars td { height: 20px; -} +}*/ /* Table in page "Global variables" */ .wato table.data.globalvars { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a96106f..51ad0db 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1905,10 +1905,11 @@ def mode_edithost(phase, new, cluster): # host name forms.header(_("General Properties")) - forms.section(_("Hostname")) if hostname and mode == "edit": + forms.section(_("Hostname"), simple=True) html.write(hostname) else: + forms.section(_("Hostname")) html.text_input("host") html.set_focus("host") @@ -5187,7 +5188,13 @@ def mode_globalvars(phase): edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) title = '<a href="%s">%s</a>' % (edit_url, valuespec.title()) - forms.section(title) + + if varname in current_settings: + to_text = valuespec.value_to_text(current_settings[varname]) + else: + to_text = valuespec.value_to_text(defaultvalue) + simple = isinstance(valuespec, Checkbox) or "\n" not in to_text + forms.section(title, simple=simple) toggle_url = make_action_link([("mode", "globalvars"), ("_action", "toggle"), ("_varname", varname)]) @@ -5197,16 +5204,14 @@ def mode_globalvars(phase): # "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) "snapin_switch_" + (current_settings[varname] and "on" or "off")) else: - html.write('<a href="%s">%s</a>' % - (edit_url, valuespec.value_to_text(current_settings[varname]))) + html.write('<a href="%s">%s</a>' % (edit_url, to_text)) else: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), # "snapin_greyswitch_" + (defaultvalue and "on" or "off")) "snapin_switch_" + (defaultvalue and "on" or "off")) else: - html.write('<a href="%s">%s</a>' % - (edit_url, valuespec.value_to_text(defaultvalue))) + html.write('<a href="%s">%s</a>' % (edit_url, to_text)) forms.end() html.write('</div>') @@ -5496,7 +5501,7 @@ def mode_edit_group(phase, what): html.begin_form("group") forms.header(_("Properties")) - forms.section(_("Name")) + forms.section(_("Name"), simple = not new) html.help(_("The name of the group is used as an internal key. It cannot be " "changed later. It is also visible in the status GUI.")) if new: @@ -5885,7 +5890,7 @@ def mode_edit_timeperiod(phase): forms.header(_("Timeperiod")) # Name - forms.section(_("Internal name")) + forms.section(_("Internal name"), simple = not new) if new: html.text_input("name") html.set_focus("name") @@ -6399,7 +6404,7 @@ def mode_edit_site(phase): # ID forms.header(_("Basic settings")) - forms.section(_("Site ID")) + forms.section(_("Site ID"), simple = not new) if new: html.text_input("id", siteid) html.set_focus("id") @@ -6414,7 +6419,7 @@ def mode_edit_site(phase): html.help(_("An alias or description of the site")) # Disabled - forms.section(_("Disable")) + forms.section(_("Disable"), simple=True) html.checkbox("disabled", site.get("disabled", False), label = _("Disable this connection")) html.help( _("If you disable a connection, then it will not be shown in the " "status display and no replication will be done.")) @@ -6445,7 +6450,7 @@ def mode_edit_site(phase): "performed.")) # Persistent connections - forms.section(_("Persistent Connection")) + forms.section(_("Persistent Connection"), simple=True) html.checkbox("persist", site.get("persist", False), label=_("Use persistent connections")) html.help(_("If you enable persistent connections then Multisite will try to keep open " "the connection to the remote sites. This brings a great speed up in high-latency " @@ -6514,7 +6519,7 @@ def mode_edit_site(phase): "that URL will be fetched by the Apache server of the local " "site itself, whilst the URL-Prefix is used by your local Browser.")) - forms.section(_("SSL")) + forms.section(_("SSL"), simple=True) html.checkbox("insecure", site.get("insecure", False), label = _('Ignore SSL certificate errors')) html.help( _('This might be needed to make the synchronization accept problems with ' 'SSL certificates when using an SSL secured connection.')) @@ -7514,7 +7519,7 @@ def mode_edit_user(phase): forms.header(_("Identity")) # ID - forms.section(_("Username")) + forms.section(_("Username"), simple = not new) if new: html.text_input("userid", userid) html.set_focus("userid") @@ -7570,7 +7575,7 @@ def mode_edit_user(phase): "a webservice without any further configuration.")) # Locking - forms.section(_("Disable password")) + forms.section(_("Disable password"), simple=True) html.checkbox("locked", user.get("locked", False), label = _("disable the login to this account")) html.help(_("Disabling the password will prevent a user from logging in while " "retaining the original password. Notifications are not affected " @@ -7617,7 +7622,7 @@ def mode_edit_user(phase): forms.header(_("Notifications"), isopen=False) - forms.section(_("Enabling")) + forms.section(_("Enabling"), simple=True) html.checkbox("notifications_enabled", user.get("notifications_enabled", True), label = _("enable notifications")) html.help(_("Notifications are sent out " @@ -8078,7 +8083,7 @@ def mode_edit_role(phase): # ID forms.header(_("Basic Properties")) - forms.section(_("Internal ID")) + forms.section(_("Internal ID"), simple = "builtin" in role) if role.get("builtin"): html.write("%s (%s)" % (id, _("builtin role"))) html.hidden_field("id", id) @@ -10257,7 +10262,7 @@ def page_user_profile(): html.write('<div class=wato>') forms.header(_("Personal Settings")) - forms.section(_("Name")) + forms.section(_("Name"), simple=True) html.write(config.user_id) if config.may('edit_profile'):

12 years, 4 months

Check_MK Git: check_mk: Use dynamic items in rule editor for hosts and items

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2f88f9125573200226981b015a809da867275075 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f88f912557320… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 18 17:21:13 2012 +0200 Use dynamic items in rule editor for hosts and items --- ChangeLog | 2 + web/htdocs/check_mk.css | 25 ++++++++++++++ web/htdocs/pages.css | 1 + web/htdocs/wato.py | 84 ++++++++++------------------------------------- 4 files changed, 46 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67a9bf4..52f994d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,8 @@ * New layout and new internal implementation of input forms * New layout for view overview and view editor * Split up host search in two distinct pages + * Use dynamic items in rule editor for hosts and items (making use + of ListOfStrings()) * FIX: audit log was not shown if no entry for today existed * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 416c201..8c12bcc 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -137,6 +137,28 @@ select.icon option { input.buttonlink { padding: 1px; font-size: 8pt; +} + +input.button { + border-color: #86A9B8 #22404D #22414D #86A9B8; + border-radius: 5px 5px 5px 5px; + border-style: solid; + border-width: 1px; + box-shadow: 0 0 1.5px #000000; + margin-left: 5px; + padding: 2px 6px; + background-color: #497E95; + color: white; +} + +input.button:hover { + background-color: #6da1b8; + text-decoration: none; +} +input.button:active { + border-color: #22414d #86a9b8 #86a9b8 #22404d; + background-color: #3b6678; + box-shadow: inset 0 0 0.5px #444444; } a.button { @@ -443,6 +465,9 @@ div.listofstrings.horizontal > div { float: left; margin-right: 2px; } +div.listofstrings.horizontal > div:last-child { + float: none; +} table.listchoice { cell-spacing: 0px; diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index bec54c3..50418a3 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -635,6 +635,7 @@ div.help { font-weight: normal; text-align: left; color: black; + display: inline-block; } table.data div.help { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 732dded..a96106f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9705,17 +9705,7 @@ def get_rule_conditions(ruleset): else: negate = html.get_checkbox("negate_hosts") nr = 0 - host_list = [] - while True: - var = "host_%d" % nr - host = html.var(var) - if nr > config.wato_num_itemspecs and not host: - break - if host: - if negate: - host = "!" + host - host_list.append(host) - nr += 1 + host_list = ListOfStrings().from_html_vars("hostlist") # append ALL_HOSTS to negated host lists if len(host_list) > 0 and host_list[0][0] == '!': host_list += ALL_HOSTS @@ -9734,16 +9724,8 @@ def get_rule_conditions(ruleset): itemspec = ListChoice(choices = itemenum, columns = 3) item_list = [ x+"$" for x in itemspec.from_html_vars("item") ] else: - nr = 0 - item_list = [] - while True: - var = "item_%d" % nr - item = html.var(var, "").strip() - if nr > config.wato_num_itemspecs and not item: - break - if item: - item_list.append(item) - nr += 1 + item_list = ListOfStrings().from_html_vars("itemlist") + if len(item_list) == 0: raise MKUserError("item_0", _("Please specify at least one %s or " "this rule will never match.") % ruleset["itemname"]) @@ -9857,29 +9839,13 @@ def mode_edit_rule(phase): div_id, not checked and "none" or "")) negate_hosts = len(host_list) > 0 and host_list[0].startswith("!") - html.write("<table class=itemlist>") - num_cols = 3 - for nr in range(config.wato_num_itemspecs): - x = nr % num_cols - if x == 0: - html.write("<tr>") - if nr < len(host_list) and host_list[nr] != ALL_HOSTS[0]: - host_name = host_list[nr].strip("!") - else: - host_name = "" - html.write("<td>") - html.text_input("host_%d" % nr, host_name) - html.write("</td>") - if x == num_cols - 1: - html.write("</tr>") - while x < num_cols - 1: - html.write("<td></td>") - if x == num_cols - 1: - html.write("</tr>") - x += 1 - html.write("</table>") - html.checkbox("negate_hosts", negate_hosts) - html.write(" " + _("<b>Negate:</b> make Rule apply for <b>all but</b> the above hosts") + "\n") + explicit_hosts = [ h.strip("!") for h in host_list if h != ALL_HOSTS[0] ] + ListOfStrings( + orientation = "horizontal", + valuespec = TextAscii(size = 30)).render_input("hostlist", explicit_hosts) + + html.checkbox("negate_hosts", negate_hosts, label = + _("<b>Negate:</b> make Rule apply for <b>all but</b> the above hosts")) html.write("</div>") html.help(_("You can enter a number of explicit host names that rule should or should " "not apply to here. Leave this option disabled if you want the rule to " @@ -9914,9 +9880,9 @@ def mode_edit_rule(phase): checked = html.get_checkbox("explicit_services") if checked == None: # read from rule itself checked = len(item_list) == 0 or item_list[0] != "" - div_id = "itemlist" - html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id) - html.write(" " + _("Specify explicit values")) + div_id = "item_list" + html.checkbox("explicit_services", checked, onclick="valuespec_toggle_option(this, %r)" % div_id, + label = _("Specify explicit values")) html.write('<div id="%s" style="display: %s; padding: 0px;">' % ( div_id, not checked and "none" or "")) itemenum = rulespec["itemenum"] @@ -9925,25 +9891,11 @@ def mode_edit_rule(phase): itemspec = ListChoice(choices = itemenum, columns = 3) itemspec.render_input("item", value) else: - html.write("<table class=itemlist>") - num_cols = 3 - for nr in range(config.wato_num_itemspecs): - x = nr % num_cols - if x == 0: - html.write("<tr>") - html.write("<td>") - item = nr < len(item_list) and item_list[nr] or "" - html.text_input("item_%d" % nr, item) - html.write("</td>") - if x == num_cols - 1: - html.write("</tr>") - while x < num_cols - 1: - html.write("<td></td>") - if x == num_cols - 1: - html.write("</tr>") - x += 1 - html.write("</table>") - html.write(_("The entries here are regular expressions to match the beginning. " + ListOfStrings( + orientation = "horizontal", + valuespec = TextAscii(size = 30)).render_input("itemlist", item_list) + + html.help(_("The entries here are regular expressions to match the beginning. " "Add a <tt>$</tt> for an exact match. An arbitrary substring is matched " "with <tt>.*</tt>")) html.write("</div>")

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