summaryrefslogtreecommitdiffstats
path: root/install/ui/ipa.js
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2012-10-01 17:36:42 +0200
committerRob Crittenden <rcritten@redhat.com>2012-10-04 18:08:26 -0400
commit696fce5c8d4e480c6a731686c8952a4e7ace575f (patch)
tree50c9de739c9eafe8dd68af102ea74f6210ae404f /install/ui/ipa.js
parent247a3a43b7fb9eac9af9497e61cdc9c964bee4ff (diff)
downloadfreeipa.git-696fce5c8d4e480c6a731686c8952a4e7ace575f.tar.gz
freeipa.git-696fce5c8d4e480c6a731686c8952a4e7ace575f.tar.xz
freeipa.git-696fce5c8d4e480c6a731686c8952a4e7ace575f.zip
Configuration pages changed to use new FF extension
browserconfig.html was changed to use new FF extension. The page is completely Firefox specific therefore the title was changed from 'Configure browser' to 'Firefox configuration'. Instruction to import CA cert in unauthorized.html are FF specific too, so they were moved to browserconfig.html. Unauthorized.html text was changed to distinguish FF config and other browsers. Now the page shows link for FF (browserconfig.html) and other browsers (ssbrowser.html). Ssbrowser.html should be enhanced by more configurations and browsers later [1]. Old configuration method was moved to ssbrowser.html. Unauthorized dialog in Web UI now links to http://../unauthorized.html instead of https. This change is done because of FF strange handling of extension installations from https sites [2]. Firefox allows ext. installation from https sites only when the certificate is signed by some build-in CA. To allow custom CAs an option in about:config has to be changed which don't help us at all because we wants to avoid manual changes in about:config. The design of browserconfig is inspired by Kyle Baker's design (2.1 Enhancements_v2.odt). It is not exactly the same. Highlighting of the steps wasn't used because in some cases we can switch some steps. Ticket: https://fedorahosted.org/freeipa/ticket/3094 [1] https://fedorahosted.org/freeipa/ticket/823 [2] https://bugzilla.mozilla.org/show_bug.cgi?id=688383
Diffstat (limited to 'install/ui/ipa.js')
-rw-r--r--install/ui/ipa.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index bd25aeae..45195bc4 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -1670,9 +1670,11 @@ IPA.unauthorized_dialog = function(spec) {
that.krb_auth_msg = spec.krb_auth_msg || IPA.get_message('login.krb_auth_msg',
" To login with Kerberos, please make sure you" +
" have valid tickets (obtainable via kinit) and " +
- "<a href='/ipa/config/unauthorized.html'>configured</a>" +
+ "<a href='http://${host}/ipa/config/unauthorized.html'>configured</a>" +
" the browser correctly, then click Login. ");
+ that.krb_auth_msg = that.krb_auth_msg.replace('${host}', window.location.hostname);
+
that.form_auth_failed = "<p><strong>Please re-enter your username or password</strong></p>" +
"<p>The password or username you entered is incorrect. " +
"Please try again (make sure your caps lock is off).</p>" +