diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-07-24 15:33:04 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-08-21 10:47:08 +0200 |
| commit | 27128bd8f50cebb8fc3b8a86b642ca0e272d2024 (patch) | |
| tree | eff1d3b912a5f9597388a0c68670623803dc17cf | |
| parent | 19bef5bd01b2490e11ffaead12066c2ad0e0e885 (diff) | |
| download | freeipa-27128bd8f50cebb8fc3b8a86b642ca0e272d2024.tar.gz freeipa-27128bd8f50cebb8fc3b8a86b642ca0e272d2024.tar.xz freeipa-27128bd8f50cebb8fc3b8a86b642ca0e272d2024.zip | |
webui: better authentication types description
Tooltips were added to "User authentication types" and "Default user
authentication types" to describe their relationship and a meaning of
not-setting a value.
https://fedorahosted.org/freeipa/ticket/4471
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
| -rw-r--r-- | install/ui/src/freeipa/serverconfig.js | 7 | ||||
| -rw-r--r-- | install/ui/src/freeipa/user.js | 7 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 7 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 7 |
4 files changed, 26 insertions, 2 deletions
diff --git a/install/ui/src/freeipa/serverconfig.js b/install/ui/src/freeipa/serverconfig.js index 89c89eda9..d134c8882 100644 --- a/install/ui/src/freeipa/serverconfig.js +++ b/install/ui/src/freeipa/serverconfig.js @@ -77,7 +77,12 @@ return { $type: 'checkboxes', name: 'ipauserauthtype', flags: ['w_if_no_aci'], - options: ['password', 'radius', 'otp'] + options: [ + { label: '@i18n:authtype.type_password', value: 'password' }, + { label: '@i18n:authtype.type_radius', value: 'radius' }, + { label: '@i18n:authtype.type_otp', value: 'otp' } + ], + tooltip: '@i18n:authtype.config_tooltip' }, { $type: 'checkbox', diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index 337405050..b595d0667 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -153,7 +153,12 @@ return { $type: 'checkboxes', name: 'ipauserauthtype', flags: ['w_if_no_aci'], - options: ['password', 'radius', 'otp'] + options: [ + { label: '@i18n:authtype.type_password', value: 'password' }, + { label: '@i18n:authtype.type_radius', value: 'radius' }, + { label: '@i18n:authtype.type_otp', value: 'otp' } + ], + tooltip: '@i18n:authtype.user_tooltip' } ] }, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 28ec80b24..7f268de8d 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -48,6 +48,13 @@ "removed": "${count} item(s) removed", "show_results": "Show Results" }, + "authtype": { + "config_tooltip": "Implicit method (password) will be used if no method is chosen.", + "type_otp": "Two factor authentication (password + OTP)", + "type_password": "Password", + "type_radius": "Radius", + "user_tooltip": "Per-user setting, overwrites the global setting if any option is checked." + }, "buttons": { "about": "About", "add": "Add", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 4162b9105..9311a7263 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -190,6 +190,13 @@ class i18n_messages(Command): "removed": _("${count} item(s) removed"), "show_results": _("Show Results"), }, + "authtype": { + "config_tooltip": _("Implicit method (password) will be used if no method is chosen."), + "type_otp": _("Two factor authentication (password + OTP)"), + "type_password": _("Password"), + "type_radius": _("Radius"), + "user_tooltip": _("Per-user setting, overwrites the global setting if any option is checked."), + }, "buttons": { "about": _("About"), "add": _("Add"), |