diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2011-08-05 14:58:02 +0200 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2011-08-08 13:49:26 -0400 |
| commit | b9365746723421971d61fab86ed2bc3782cf2140 (patch) | |
| tree | f2d2369f08748954c8f89df6559e71fe84dbce4f | |
| parent | d08dcb40e1db63d4b40d911bb15a656f0dcbf8ae (diff) | |
| download | freeipa-b9365746723421971d61fab86ed2bc3782cf2140.tar.gz freeipa-b9365746723421971d61fab86ed2bc3782cf2140.tar.xz freeipa-b9365746723421971d61fab86ed2bc3782cf2140.zip | |
Redirection after changing browser configuration
https://fedorahosted.org/freeipa/ticket/1502
Added redirection link.
CSS styling of configuration page.
Some CSS cleaning.
| -rw-r--r-- | install/html/browserconfig.html | 8 | ||||
| -rw-r--r-- | install/html/ipa_error.css | 17 | ||||
| -rw-r--r-- | install/share/preferences.html.template | 29 |
3 files changed, 40 insertions, 14 deletions
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html index 308537ad5..f7ddedfca 100644 --- a/install/html/browserconfig.html +++ b/install/html/browserconfig.html @@ -8,7 +8,6 @@ <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="ipa_error.css" /> - <script type="text/javascript"> $(document).ready(function() { if (navigator.userAgent.indexOf("Firefox") != -1 || @@ -18,8 +17,6 @@ } }); </script> - - </head> <body id="header-bg"> @@ -32,11 +29,10 @@ <h1>Configure Browser</h1> <p> Click the below button to configure your browser </p> <object data="jar:/ipa/errors/configure.jar!/preferences.html" - type="text/html"><\/object> + type="text/html" class="browser-config"></object> </div> <div class="textblockkrb"> - <p>Once you have configured your browser, - <a href="/ipa/ui">click here to return to the Web UI</a></p> + <p><a href="/ipa/ui">Return to the Web UI</a></p> </div> </div> diff --git a/install/html/ipa_error.css b/install/html/ipa_error.css index a4d9c50e8..90e19a4db 100644 --- a/install/html/ipa_error.css +++ b/install/html/ipa_error.css @@ -34,7 +34,7 @@ body{ background-image:url("../ui/outer-bg.png"); - background-repeat:repeat-x; + background-repeat:repeat-x; background-position:left top; background-color:#F9F9F9; border-width: 0; @@ -548,7 +548,7 @@ span.main-separator{ body#header-bg { background: url("../ui/Static-Background.png") repeat-x scroll left top #EDEDED; } - + .container_1 { margin-left: auto; margin-right: auto; @@ -645,13 +645,11 @@ form#login { margin-top: 5em; font-size: 1.1em; padding-left: 3em; - } .textblockkrb ul li { list-style-type: none; padding: .15em; - } @@ -661,7 +659,7 @@ h3 { font-size: 1.5em; font-weight: normal; text-transform: uppercase; -} +} h5 { color: #333333; @@ -672,11 +670,14 @@ h5 { margin-bottom: 3em; margin-left: 5em; margin-top: -3em; +} +/* Browser configuration */ + +object.browser-config { + width: 100%; } - - - + /* Search */ .search-controls { diff --git a/install/share/preferences.html.template b/install/share/preferences.html.template index ef657e96c..621301f1a 100644 --- a/install/share/preferences.html.template +++ b/install/share/preferences.html.template @@ -2,10 +2,33 @@ <html> <head> <title>Automatically set browser preferences</title> + <style type="text/css"> + body { + font-family:"Liberation Sans",Arial,Sans; + font-size:11px; + } + .textblock { + text-align: left; + margin-top: 1.0em; + font-size: 1.1em; + } + a { + color: #1D85D5; + font-weight: normal; + text-decoration: none; + text-transform: none; + } + </style> </head> <body> <form action="undefined" method="get"> <input type=button onclick="setPreferences()" name="prefs" value="Configure Firefox"> +<div id="success" class="textblock" style="display:none;"> + <p>Browser configured.</p> + <p> + <a href="/ipa/ui" id="redirect_link" target="_top">Click here to return to the Web UI.</a> + </p> +</div> </form> <script type="text/javascript"> @@ -40,6 +63,12 @@ netscape.security.PrivilegeManager.disablePrivilege(privilege); alert("Successfully configured Firefox for single sign-on."); + + var redirect_link = document.getElementById('redirect_link'); + redirect_link.href = "https://" + location.hostname + location.port + "/ipa/ui"; + + var successDiv = document.getElementById('success'); + successDiv.style['display'] = "block"; } catch (e) { alert("Unable to apply recommended settings.\n\n" + "Click on the Certificate Authority link and select trust for all, " + |