summaryrefslogtreecommitdiffstats
path: root/install/ui
diff options
context:
space:
mode:
Diffstat (limited to 'install/ui')
-rw-r--r--install/ui/ipa.css37
-rw-r--r--install/ui/ipa.js4
-rw-r--r--install/ui/test/data/ipa_init.json2
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",