[PATCH] 733 webui: rename tooltip to title
- use title for input's elements 'title' attribute
- tooltip for Bootstrap's tooltip component
https://fedorahosted.org/freeipa/ticket/4471
[PATCH] 734 webui: tooltip support
Allow to set 'tooltip' attribute in spec. It displays info icon
with Bootstrap's tooltip near field's label.
https://fedorahosted.org/freeipa/ticket/4471
[PATCH] 735 webui: better authentication types description
Tooltips were added to User authentication types and Default user
objectclasses to describe their relationship and a meaning of
not-setting a value.
https://fedorahosted.org/freeipa/ticket/4471
--
Petr Vobornik
From fa44465303b0fe70ef3da3c6e8f8109cbda288bb Mon Sep 17 00:00:00 2001
From: Petr Vobornik pvobo...@redhat.com
Date: Thu, 24 Jul 2014 15:33:04 +0200
Subject: [PATCH] webui: better authentication types description
Tooltips were added to User authentication types and Default user
objectclasses to describe their relationship and a meaning of
not-setting a value.
https://fedorahosted.org/freeipa/ticket/4471
---
install/ui/src/freeipa/serverconfig.js | 7 ++-
install/ui/src/freeipa/user.js | 7 ++-
install/ui/test/data/ipa_init.json | 7 +++
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 89c89eda95f84d1c569b83e9a25b864e7b2f7215..d134c88824533ce83f8b0dc11ca3a059601b6f7d 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 337405050d14436f3c0526bb2970b471935fffd4..b595d06678edc3709103647a148db09c66e4b88c 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 8a482134d70976ecfe4748dd102351a64dbd4dd6..987f1270a46206b3ec882d40def59ee0e517b48b 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 1a8d9cad3427ee75e7774f67c2b4c08eaba8479e..15315de17a2959db581be0bfa0b0860445255e01 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),
+
