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

3 files changed, 37 insertions, 6 deletions

diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index c8a220e7..bc971dce 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -4,6 +4,7 @@
 *   Adam Young <ayoung@redhat.com>
 *   Endi Sukma Dewata <edewata@redhat.com>
 *   Kyle Baker <kybaker@redhat.com>
+*   Petr Vobornik <pvoborni@redhat.com>
 *
 * Copyright (C) 2010 Red Hat
 */
@@ -846,7 +847,6 @@ ul#viewtype li a {
 h1 {
     font-family: "Overpass Bold","Liberation Sans", Arial, sans-serif;
     font-size: 1.5em;
-    font-weight: normal;
     color: #555555;
     text-transform: uppercase;
     text-shadow: 1px 1px 0 #FFFFFF;
@@ -856,7 +856,6 @@ h1 {
 h2 {
     font-family: "Overpass Bold","Liberation Sans", Arial, sans-serif;
     font-size: 1.5em;
-    font-weight: normal;
     color: #333333;
     text-transform: uppercase;
     margin-left: 1em;
@@ -1351,9 +1350,23 @@ body.info-page  {
     background: url(images/static-background.png) repeat-x scroll left top #EDEDED;
 }
 
+.info-page p {
+    margin: 0.5em 0em 1em 0em;
+}
+
+.info-page h1, .info-page h2, .info-page h3 {
+    font-family: "Overpass", "Liberation Sans", Arial, sans-serif;
+    margin-left: 0px;
+    font-weight: normal;
+    color: #555555;
+}
+
 .info-page h1 {
-    color: #333333;
-    margin-bottom: 1.5em;
+    font-size: 2em;
+}
+
+.info-page h2 {
+    margin-top: 2em;
 }
 
 .info-page .container_1 {
@@ -1398,6 +1411,22 @@ body.info-page  {
     margin-right: 0px;
 }
 
+/* Browser config page */
+
+
+.info-page .browser-config h1,
+.info-page .browser-config h2,
+.info-page .browser-config h3,
+.info-page .browser-config.textblockkrb {
+    text-align: center;
+}
+
+.browser-config h2 {
+    margin-left: 0em;
+    margin-top: 2em;
+
+}
+
 /* ---- HBAC Test ---- */
 
 .hbac-test-header {
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>" +
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 0d94d9b0..8a1c9a1b 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -134,7 +134,7 @@
                     "login": {
                         "form_auth": "To login with username and password, enter them in the fields below 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='/ipa/config/unauthorized.html'>configured</a> the browser correctly, then click Login.",
+                        "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.",
                         "login": "Login",
                         "logout": "Logout",
                         "logout_error": "Logout error",