diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2015-08-10 12:58:14 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-08-10 14:54:16 +0200 |
| commit | ebc7ab1efedb99bd7aa80f53d1f845c3bdce8278 (patch) | |
| tree | caa216f9292f588e9e02a0f81b29f3f07744fa90 | |
| parent | c8882f7d1c98a795195e7bd2e48323ce95edc858 (diff) | |
| download | freeipa-ebc7ab1efedb99bd7aa80f53d1f845c3bdce8278.tar.gz freeipa-ebc7ab1efedb99bd7aa80f53d1f845c3bdce8278.tar.xz freeipa-ebc7ab1efedb99bd7aa80f53d1f845c3bdce8278.zip | |
webui: add LDAP vs Kerberos behavior description to user auth types
https://fedorahosted.org/freeipa/ticket/4935
Reviewed-By: David Kupka <dkupka@redhat.com>
| -rw-r--r-- | install/ui/src/freeipa/serverconfig.js | 5 | ||||
| -rw-r--r-- | install/ui/src/freeipa/user.js | 5 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 4 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js index efe180569..70bb9574b 100644 --- a/install/ui/src/freeipa/serverconfig.js +++ b/install/ui/src/freeipa/serverconfig.js @@ -83,7 +83,10 @@ return { { label: '@i18n:authtype.type_radius', value: 'radius' }, { label: '@i18n:authtype.type_otp', value: 'otp' } ], - tooltip: '@i18n:authtype.config_tooltip' + tooltip: { + title: '@i18n:authtype.config_tooltip', + html: true + } }, { $type: 'checkbox', diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 0e828c16b..a920e088a 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -188,7 +188,10 @@ return { { label: '@i18n:authtype.type_radius', value: 'radius' }, { label: '@i18n:authtype.type_otp', value: 'otp' } ], - tooltip: '@i18n:authtype.user_tooltip' + tooltip: { + title: '@i18n:authtype.user_tooltip', + html: true + } }, { $type: 'entity_select', diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index ef1729505..b80e44ffe 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -49,12 +49,12 @@ "show_results": "Show Results" }, "authtype": { - "config_tooltip": "Implicit method (password) will be used if no method is chosen.", + "config_tooltip": "<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>", "type_otp": "Two factor authentication (password + OTP)", "type_password": "Password", "type_radius": "Radius", "type_disabled": "Disable per-user override", - "user_tooltip": "Per-user setting, overwrites the global setting if any option is checked." + "user_tooltip": "<p>Per-user setting, overwrites the global setting if any option is checked.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>", }, "buttons": { "about": "About", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index f97885cea..e1904d2d3 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -191,12 +191,12 @@ class i18n_messages(Command): "show_results": _("Show Results"), }, "authtype": { - "config_tooltip": _("Implicit method (password) will be used if no method is chosen."), + "config_tooltip": _("<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"), "type_otp": _("Two factor authentication (password + OTP)"), "type_password": _("Password"), "type_radius": _("Radius"), "type_disabled": _("Disable per-user override"), - "user_tooltip": _("Per-user setting, overwrites the global setting if any option is checked."), + "user_tooltip": _("<p>Per-user setting, overwrites the global setting if any option is checked.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"), }, "buttons": { "about": _("About"), |