[checkmk-commits] Better styling of Passwort entry and agent encryption configuration

Module: check_mk Branch: master Commit: 0584308e40236dba3037aecb6a3a06fac340ed77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0584308e40236d… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Feb 17 10:27:56 2017 +0100 Better styling of Passwort entry and agent encryption configuration Change-Id: If6df3d9ae685a0f322cce040725d3db11becaa52 --- web/htdocs/valuespec.py | 7 ++++--- web/plugins/wato/check_mk_configuration.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ba5cf36..c9dff2a 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3816,8 +3816,8 @@ class Password(TextAscii): html.password_input(varprefix, str(value), **kwargs) if self._is_stored_plain: - html.write("&nbsp;<span>%s</span>" % _("Please note that this password is stored in plain " - "text.")) + html.span(_("<br>Please note that this password needs to be<br>" + "stored in plain text on the Check_MK server.")) def value_to_text(self, value): @@ -3846,7 +3846,8 @@ class PasswordSpec(Password): html.icon_button("#", _(u"Show/Hide password"), "showhide", onclick="vs_toggle_hidden(this);") if self._is_stored_plain: - html.span(_("Please note that this password is stored in plain text.")) + html.span(_("<br>Please note that this password needs to be<br>" + "stored in plain text on the Check_MK server.")) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index d9f261c..2e0322e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2258,7 +2258,7 @@ register_rule(group, Dictionary( elements = [ ( "passphrase", PasswordSpec(title = _("Encryption secret"), allow_empty = False, hidden = True) ), - ( "use_regular", RadioChoice(title = _("Encryption for Agent"), + ( "use_regular", DropdownChoice(title = _("Encryption for Agent"), help = _("Choose if the agent agents encrypt packages. This controls whether " "baked agents encrypt their output and whether check_mk expects " "encrypted output. " @@ -2273,7 +2273,7 @@ register_rule(group, ( "disable", _("Disable (drop encrypted data)") ) ]) ), - ( "use_realtime", RadioChoice(title = _("Encryption for Realtime Updates"), + ( "use_realtime", DropdownChoice(title = _("Encryption for Realtime Updates"), help = _("Choose if realtime updates are sent/expected encrypted"), default_value = "enforce", choices = [