diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2014-07-24 18:32:25 +0200 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2014-08-20 19:28:06 +0200 |
commit | cba5247f99bca6eb8ed73b73f20cb9e9b3a45e91 (patch) | |
tree | 297cdf7cb813852c692e708ad29e9f88431beb3f | |
parent | a94fc09b5747ff5ffc632d95b330470ed78ee0f5 (diff) | |
download | freeipa-cba5247f99bca6eb8ed73b73f20cb9e9b3a45e91.tar.gz freeipa-cba5247f99bca6eb8ed73b73f20cb9e9b3a45e91.tar.xz freeipa-cba5247f99bca6eb8ed73b73f20cb9e9b3a45e91.zip |
webui: improved info msgs on login/token sync/reset pwd pages
- add info icons to distinguish and classify the messages.
- add info text for OTP fields
- fix login instruction inaccuracy related to position of login button
https://fedorahosted.org/freeipa/ticket/4470
Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
-rw-r--r-- | install/ui/src/freeipa/widgets/LoginScreen.js | 6 | ||||
-rw-r--r-- | install/ui/src/freeipa/widgets/LoginScreenBase.js | 6 | ||||
-rw-r--r-- | install/ui/src/freeipa/widgets/SyncOTPScreen.js | 2 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 5 | ||||
-rw-r--r-- | ipalib/plugins/internal.py | 5 |
5 files changed, 17 insertions, 7 deletions
diff --git a/install/ui/src/freeipa/widgets/LoginScreen.js b/install/ui/src/freeipa/widgets/LoginScreen.js index 87938f9c0..13100fa31 100644 --- a/install/ui/src/freeipa/widgets/LoginScreen.js +++ b/install/ui/src/freeipa/widgets/LoginScreen.js @@ -50,9 +50,9 @@ define(['dojo/_base/declare', expired_msg: "Your session has expired. Please re-login.", - form_auth_msg: "To login with username and password, enter them in the fields below, then click Login.", + form_auth_msg: "<i class=\"fa fa-info-circle\"></i> To login with <strong>username and password</strong>, enter them in the corresponding fields, then click Login.", - kerberos_msg: " To login with Kerberos, please make sure you" + + kerberos_msg: "<i class=\"fa fa-info-circle\"></i> To login with <strong>Kerberos</strong>, please make sure you" + " have valid tickets (obtainable via kinit) and " + "<a href='http://${host}/ipa/config/unauthorized.html'>configured</a>" + " the browser correctly, then click Login. ", @@ -298,7 +298,7 @@ define(['dojo/_base/declare', }, set_reset_aside_text: function() { - this.set('aside', ''); + this.set('aside', "<p>"+this.otp_info_msg+"<p/>"); }, constructor: function(spec) { diff --git a/install/ui/src/freeipa/widgets/LoginScreenBase.js b/install/ui/src/freeipa/widgets/LoginScreenBase.js index 819f832a0..2d14bb95a 100644 --- a/install/ui/src/freeipa/widgets/LoginScreenBase.js +++ b/install/ui/src/freeipa/widgets/LoginScreenBase.js @@ -60,6 +60,9 @@ define(['dojo/_base/declare', caps_warning_msg: "Warning: CAPS LOCK key is on", + otp_info_msg: "<i class=\"fa fa-info-circle\"></i> <strong>One-Time-Password(OTP):</strong> \ + Generate new OTP code for each OTP field.", + /** * Details builder * @property {IPA.details_builder} @@ -331,6 +334,9 @@ define(['dojo/_base/declare', constructor: function(spec) { spec = spec || {}; declare.safeMixin(this, spec); + + this.otp_info_msg = text.get(spec.otp_info_msg || '@i18n:password.otp_info', + this.otp_info_msg); } }); return LoginScreenBase; diff --git a/install/ui/src/freeipa/widgets/SyncOTPScreen.js b/install/ui/src/freeipa/widgets/SyncOTPScreen.js index 13c47ae88..f7e4fedab 100644 --- a/install/ui/src/freeipa/widgets/SyncOTPScreen.js +++ b/install/ui/src/freeipa/widgets/SyncOTPScreen.js @@ -179,6 +179,8 @@ define(['dojo/_base/declare', constructor: function(spec) { spec = spec || {}; + this.aside = "<p>" + this.otp_info_msg + "</p>"; + this.sync_fail = text.get(spec.sync_fail || '@i18n:password.otp_sync_fail', this.sync_fail); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 8a482134d..28ec80b24 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -141,9 +141,9 @@ "pad": "PAD" }, "login": { - "form_auth": "To login with username and password, enter them in the fields below then click Login.", + "form_auth": "<i class=\"fa fa-info-circle\"></i> To login with <strong>username and password</strong>, enter them in the corresponding fields, then click Login.", "header": "Logged In As", - "krb_auth_msg": "To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and <a href='http://${host}/ipa/config/unauthorized.html'>configured</a> the browser correctly, then click Login.", + "krb_auth_msg": "<i class=\"fa fa-info-circle\"></i> To login with <strong>Kerberos</strong>, please make sure you have valid tickets (obtainable via kinit) and <a href='http://${host}/ipa/config/unauthorized.html'>configured</a> the browser correctly, then click Login.", "login": "Login", "logout": "Logout", "logout_error": "Logout error", @@ -517,6 +517,7 @@ "new_password": "New Password", "new_password_required": "New password is required", "otp": "OTP", + "otp_info": "<i class=\"fa fa-info-circle\"></i> <strong>One-Time-Password(OTP):</strong> Generate new OTP code for each OTP field.", "otp_long": "One-Time-Password", "otp_sync_fail": "Token synchronization failed", "otp_sync_invalid": "The username, password or token codes are not correct", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 1a8d9cad3..4162b9105 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -283,9 +283,9 @@ class i18n_messages(Command): "pad": _("PAD"), }, "login": { - "form_auth": _("To login with username and password, enter them in the fields below then click Login."), + "form_auth": _("<i class=\"fa fa-info-circle\"></i> To login with <strong>username and password</strong>, enter them in the corresponding fields, then click Login."), "header": _("Logged In As"), - "krb_auth_msg": _("To login with Kerberos, please make sure you have valid tickets (obtainable via kinit) and <a href='http://${host}/ipa/config/unauthorized.html'>configured</a> the browser correctly, then click Login."), + "krb_auth_msg": _("<i class=\"fa fa-info-circle\"></i> To login with <strong>Kerberos</strong>, please make sure you have valid tickets (obtainable via kinit) and <a href='http://${host}/ipa/config/unauthorized.html'>configured</a> the browser correctly, then click Login."), "login": _("Login"), "logout": _("Logout"), "logout_error": _("Logout error"), @@ -662,6 +662,7 @@ class i18n_messages(Command): "new_password": _("New Password"), "new_password_required": _("New password is required"), "otp": _("OTP"), + "otp_info": _("<i class=\"fa fa-info-circle\"></i> <strong>One-Time-Password(OTP):</strong> Generate new OTP code for each OTP field."), "otp_long": _("One-Time-Password"), "otp_sync_fail": _("Token synchronization failed"), "otp_sync_invalid": _("The username, password or token codes are not correct"), |