[checkmk-commits] Standardised titles of 'Rule Properties'

Module: check_mk Branch: master Commit: 69dbae9e367669da6d916d411ade305d8962bae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69dbae9e367669… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Mon Jan 15 21:01:22 2018 +0100 Standardised titles of 'Rule Properties' Change-Id: I75329abfdfe95aba13bcd9f18b0e9ce800b22d9c --- web/htdocs/wato.py | 6 +++--- web/plugins/wato/bi.py | 13 +++++++------ web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f928306..3e4fe68 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7819,7 +7819,7 @@ def vs_notification_rule(userid = None): ] return Dictionary( - title = _("General Properties"), + title = _("Rule Properties"), elements = rule_option_elements() + section_override + generic_rule_match_conditions() @@ -7899,7 +7899,7 @@ def vs_notification_rule(userid = None): "match_checktype", "bulk", "contact_users", "contact_groups", "contact_emails", "contact_match_macros", "contact_match_groups" ], headers = [ - ( _("General Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), + ( _("Rule Properties"), [ "description", "comment", "disabled", "docu_url", "allow_disable" ] ), ( _("Notification Method"), [ "notify_plugin", "notify_method", "bulk" ] ),] + contact_headers + [ @@ -17293,7 +17293,7 @@ syslog_facilities = [ def vs_rule_options(disabling=True): return Dictionary( - title = _("Rule Options"), + title = _("Rule Properties"), optional_keys = False, render = "form", elements = rule_option_elements(disabling), diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index bd35fe8..048918c 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -1700,7 +1700,7 @@ class ModeBIEditRule(ModeBI): elements = [ ( "id", TextAscii( - title = _("Unique Rule ID"), + title = _("Rule ID"), help = _("The ID of the rule must be a unique text. It will be used as an internal key " "when rules refer to each other. The rule IDs will not be visible in the status " "GUI. They are just used within the configuration."), @@ -1716,14 +1716,15 @@ class ModeBIEditRule(ModeBI): "top level nodes this title must be unique. You can insert " "rule parameters like <tt>$FOO$</tt> or <tt>$BAR$</tt> here."), allow_empty = False, - size = 64, + size = 80, ), ), ( "comment", - TextUnicode( + TextAreaUnicode( title = _("Comment"), help = _("An arbitrary comment of this rule for you."), - size = 64, + cols = 80, + rows = 4, ), ), ( "params", @@ -1792,12 +1793,12 @@ class ModeBIEditRule(ModeBI): ] return Dictionary( - title = _("General Properties"), + title = _("Rule Properties"), optional_keys = False, render = "form", elements = elements, headers = [ - ( _("General Properties"), [ "id", "title", "comment", "params", "disabled" ]), + ( _("Rule Properties"), [ "id", "title", "docu_url", "comment", "params", "disabled" ]), ( _("Child Node Generation"), [ "nodes" ] ), ( _("Aggregation Function"), [ "aggregation", "state_messages" ], ), ] diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 1d43378..375b126 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -288,7 +288,7 @@ def vs_mkeventd_rule(rule_pack): help = _("A unique ID of this rule. Each event will remember the rule " "it was classified with by its rule ID."), allow_empty = False, - size = 12, + size = 24, )), ] + rule_option_elements()