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: improved info msgs on login/token sync/reset pwd pages

Browse Source 
- 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>
This commit is contained in:
Petr Vobornik 2014-07-24 18:32:25 +02:00
parent a94fc09b57
commit cba5247f99
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/ui/src/freeipa/widgets/LoginScreen.js
View File

@ -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) {

6
install/ui/src/freeipa/widgets/LoginScreenBase.js
View File

@ -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;

2
install/ui/src/freeipa/widgets/SyncOTPScreen.js
View File

@ -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);

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

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

5
ipalib/plugins/internal.py
View File

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