IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

webui: add LDAP vs Kerberos behavior description to user auth types

Browse Source 
https://fedorahosted.org/freeipa/ticket/4935

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Petr Vobornik
2015-08-10 12:58:14 +02:00
committed by Jan Cholasta
parent c8882f7d1c
commit ebc7ab1efe
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
install/ui/src/freeipa/serverconfig.js
View File

@@ -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',

5
install/ui/src/freeipa/user.js
View File

@@ -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',

4
install/ui/test/data/ipa_init.json
View File

@@ -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",

4
ipalib/plugins/internal.py
View File

@@ -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"),