diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2011-10-06 14:30:26 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-06 23:24:12 -0500 |
commit | a0470afdcddcfcdade802b6cf04c43898f52421d (patch) | |
tree | 337928b2233423b28ba4050bdc4e977b10d4af52 | |
parent | a85bb7fa9e5a03b391d684e2850bfe4663f94e21 (diff) | |
download | freeipa-a0470afdcddcfcdade802b6cf04c43898f52421d.tar.gz freeipa-a0470afdcddcfcdade802b6cf04c43898f52421d.tar.xz freeipa-a0470afdcddcfcdade802b6cf04c43898f52421d.zip |
Fixed links to images in config and migration pages
https://fedorahosted.org/freeipa/ticket/1932
Description of problem:
Title is missing while configuring browser for the first time.
Actual results:
There is no title on this screen. I noticed it only on step 8 and later so I am not sure if title is also missing earlier at step 6 or not.
Expected results:
Title "Identity Management" is always present.
Fixed:
* modified paths to images
* fixed padding in ssbrowser.html
* moved browser icons to ui folder
* deleted unused images in html and migration folders (they are already in ui folder, and weren't deployed)
whitespaces
-rw-r--r-- | install/html/browserconfig.html | 2 | ||||
-rw-r--r-- | install/html/hbac-deny-remove.html | 2 | ||||
-rw-r--r-- | install/html/ipa_error.css | 3 | ||||
-rw-r--r-- | install/html/ipalogo.png | bin | 2492 -> 0 bytes | |||
-rw-r--r-- | install/html/ssbrowser.html | 36 | ||||
-rw-r--r-- | install/html/unauthorized.html | 2 | ||||
-rw-r--r-- | install/migration/Static-Background.png | bin | 183 -> 0 bytes | |||
-rw-r--r-- | install/migration/centered-bg.png | bin | 4122 -> 0 bytes | |||
-rw-r--r-- | install/migration/error.html | 25 | ||||
-rw-r--r-- | install/migration/index.html | 27 | ||||
-rw-r--r-- | install/migration/invalid.html | 27 | ||||
-rw-r--r-- | install/migration/ipa_migration.css | 22 | ||||
-rw-r--r-- | install/migration/ipalogo.png | bin | 2492 -> 0 bytes | |||
-rw-r--r-- | install/ui/Makefile.am | 2 | ||||
-rw-r--r-- | install/ui/centered-bg.png | bin | 8199 -> 4122 bytes | |||
-rw-r--r-- | install/ui/firefox-icon.png (renamed from install/html/firefox-icon.png) | bin | 6107 -> 6107 bytes | |||
-rw-r--r-- | install/ui/ie-icon.png (renamed from install/html/ie-icon.png) | bin | 5265 -> 5265 bytes |
17 files changed, 71 insertions, 77 deletions
diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html index 5375ff912..f2ed81604 100644 --- a/install/html/browserconfig.html +++ b/install/html/browserconfig.html @@ -23,7 +23,7 @@ <div class="container_1"> <div class="header-logo"> - <img src="../ui/ipalogo.png" /> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> </div> <div class="textblockkrb" style="display: none;"> diff --git a/install/html/hbac-deny-remove.html b/install/html/hbac-deny-remove.html index 987819cd2..fccaafd08 100644 --- a/install/html/hbac-deny-remove.html +++ b/install/html/hbac-deny-remove.html @@ -16,7 +16,7 @@ <div class="container_1"> <div class="header-logo"> - <img src="../ui/ipalogo.png" /> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> </div> <div class="textblockkrb"> <h1>Removal of HBAC Deny Rules.</h1> diff --git a/install/html/ipa_error.css b/install/html/ipa_error.css index 90e19a4db..fef0ef6db 100644 --- a/install/html/ipa_error.css +++ b/install/html/ipa_error.css @@ -644,7 +644,8 @@ form#login { text-align: left; margin-top: 5em; font-size: 1.1em; - padding-left: 3em; + padding-left: 3em; + padding-right: 3em; } .textblockkrb ul li { diff --git a/install/html/ipalogo.png b/install/html/ipalogo.png Binary files differdeleted file mode 100644 index 62185c1b0..000000000 --- a/install/html/ipalogo.png +++ /dev/null diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html index 49e02e7aa..3e2bd19a9 100644 --- a/install/html/ssbrowser.html +++ b/install/html/ssbrowser.html @@ -5,23 +5,23 @@ <title>IPA: Identity Policy Audit</title> <script type="text/javascript" src="../ui/jquery.js"></script> - <link rel="stylesheet" type="text/css" href="jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="ipa_error.css" /> </head> <body id="header-bg"> - - <div class="container_1"> + + <div class="container_1"> <div class="header-logo"> - <img src="../ui/ipalogo.png" /> - </div> - <div class="textblockkrb"> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> + </div> + <div class="textblockkrb"> <h3>Browser Kerberos Setup</h3> - <img alt="Internet Explorer" src="ie-icon.png"><h5>Internet Explorer Configuration</h5> + <img alt="Internet Explorer" src="../ui/ie-icon.png"><h5>Internet Explorer Configuration</h5> <p>Once you are able to log into the workstation with your kerberos key you are now able to use that ticket in Internet Explorer. </p> - + <strong>Login to the Windows machine using an account of your Kerberos realm (administrative domain)</strong><br> - <strong>In Internet Explorer, click Tools, and then click Internet Options.</strong> + <strong>In Internet Explorer, click Tools, and then click Internet Options.</strong> <br> <ul> <li> 1. Click the Security tab </li> @@ -38,15 +38,15 @@ <li> Visit a kerberized web site using IE (You must use the fully-qualified Domain Name in the URL)</li> <li><strong> You are all set. </strong></li> </ul> - + <br> - - <img alt="Firefox" src="firefox-icon.png"><h5>Firefox Configuration</h5> - + + <img alt="Firefox" src="../ui/firefox-icon.png"><h5>Firefox Configuration</h5> + <p>You can configure Firefox to use Kerberos for Single Sign-on. The following instructions will guide you in configuring your web browser <br> to send your Kerberos credentials to the appropriate Key Distribution Center which enables Single Sign-on. </p> - - <ul><li> 1. In the address bar of Firefox, type <tt>about:config</tt> to display the list of current configuration options.</li> + + <ul><li> 1. In the address bar of Firefox, type <tt>about:config</tt> to display the list of current configuration options.</li> <li> 2. In the Filter field, type <tt>negotiate</tt> to restrict the list of options. </li> <li> 3. Double-click the <tt>network.negotiate-auth.trusted-uris</tt> entry to display the Enter string value dialog box. </li> <li> 4. Enter the name of the domain against which you want to authenticate, for example, <tt>.example.com.</tt> </li> @@ -54,10 +54,10 @@ <br> <li><strong> You are all set. </strong></li> </ul> - - + + </div> - + </div> </body> diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html index eeb47caaf..345fc6c96 100644 --- a/install/html/unauthorized.html +++ b/install/html/unauthorized.html @@ -25,7 +25,7 @@ <div class="container_1"> <div class="header-logo"> - <img src="../ui/ipalogo.png" /> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> </div> <div class="textblockkrb"> diff --git a/install/migration/Static-Background.png b/install/migration/Static-Background.png Binary files differdeleted file mode 100644 index b8c28931e..000000000 --- a/install/migration/Static-Background.png +++ /dev/null diff --git a/install/migration/centered-bg.png b/install/migration/centered-bg.png Binary files differdeleted file mode 100644 index 9e606a815..000000000 --- a/install/migration/centered-bg.png +++ /dev/null diff --git a/install/migration/error.html b/install/migration/error.html index fc61ea2f1..3d58efe76 100644 --- a/install/migration/error.html +++ b/install/migration/error.html @@ -4,31 +4,28 @@ <meta charset="utf-8"> <title>IPA: Identity Policy Audit</title> - <script type="text/javascript" src="develop.js"></script> - <script type="text/javascript" src="webui.js"></script> - - <link rel="stylesheet" type="text/css" href="jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> <body id="header-bg"> - - <div class="container_1"> + + <div class="container_1"> <div class="header-logo"> - <img src="ipalogo.png" /> - </div> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> + </div> <br> <br> <div id="formwindow"> <h4>We're Sorry</h4> <div class="formcontent"> <p> - <strong>There was a problem with your request. Please, try again later.</strong> - </p> - <p> - <label>If the problem persists, contact your administrator.</label> - </p> - </div> + <strong>There was a problem with your request. Please, try again later.</strong> + </p> + <p> + <label>If the problem persists, contact your administrator.</label> + </p> + </div> </div> </div> diff --git a/install/migration/index.html b/install/migration/index.html index c626e2415..d61cd61c4 100644 --- a/install/migration/index.html +++ b/install/migration/index.html @@ -4,27 +4,24 @@ <meta charset="utf-8"> <title>IPA: Identity Policy Audit</title> - <script type="text/javascript" src="develop.js"></script> - <script type="text/javascript" src="webui.js"></script> - - <link rel="stylesheet" type="text/css" href="jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> <body id="header-bg"> - - <div class="container_1"> + + <div class="container_1"> <div class="header-logo"> - <img src="ipalogo.png" /> - </div> - <div class="textblock"> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> + </div> + <div class="textblock"> <h3>Password Migration</h3> - <p>If you have been sent here by your administrator, your personal - information is being migrated to a new identity management solution + <p>If you have been sent here by your administrator, your personal + information is being migrated to a new identity management solution (IPA).</p> - <p>Please, enter your credentials in the form below to complete the - process. Upon successful login your kerberos account will be - activated.</p> + <p>Please, enter your credentials in the form below to complete the + process. Upon successful login your kerberos account will be + activated.</p> </div> <div id="formwindow"> <h4>Login</h4> @@ -42,7 +39,7 @@ <div class="formbutton"> <input name="submit" value="Migrate" type="submit" /> </div> - + </form> </div> </div> diff --git a/install/migration/invalid.html b/install/migration/invalid.html index 91de79fb9..11f1eb215 100644 --- a/install/migration/invalid.html +++ b/install/migration/invalid.html @@ -4,27 +4,24 @@ <meta charset="utf-8"> <title>IPA: Identity Policy Audit</title> - <script type="text/javascript" src="develop.js"></script> - <script type="text/javascript" src="webui.js"></script> - - <link rel="stylesheet" type="text/css" href="jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="..ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> <body id="header-bg"> - - <div class="container_1"> + + <div class="container_1"> <div class="header-logo"> - <img src="ipalogo.png" /> - </div> - <div class="textblock"> + <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> + </div> + <div class="textblock"> <h3>Password Migration</h3> - <p>If you have been sent here by your administrator, your personal - information is being migrated to a new identity management solution + <p>If you have been sent here by your administrator, your personal + information is being migrated to a new identity management solution (IPA).</p> - <p>Please, enter your credentials in the form below to complete the - process. Upon successful login your kerberos account will be - activated.</p> + <p>Please, enter your credentials in the form below to complete the + process. Upon successful login your kerberos account will be + activated.</p> </div> <div id="formwindow"> <h4>Login</h4> @@ -49,7 +46,7 @@ <div class="formbutton"> <input name="submit" value="Migrate" type="submit" /> </div> - + </form> </div> </div> diff --git a/install/migration/ipa_migration.css b/install/migration/ipa_migration.css index e4b6de48d..ed4f58d5d 100644 --- a/install/migration/ipa_migration.css +++ b/install/migration/ipa_migration.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; @@ -546,15 +546,15 @@ span.main-separator{ /* Migration */ body#header-bg { - background: url("Static-Background.png") repeat-x scroll left top #EDEDED; + background: url("../ui/Static-Background.png") repeat-x scroll left top #EDEDED; } - + .container_1 { margin-left: auto; margin-right: auto; width: 960px; - background: url("centered-bg.png") no-repeat scroll 0 7em transparent; - min-height: 40em; + background: url("../ui/centered-bg.png") no-repeat scroll 0 7em transparent; + min-height: 40em; } #formwindow { @@ -582,7 +582,7 @@ body#header-bg { } .# { - background: url("ipalogo.png") no-repeat scroll left top transparent; + background: url("../ui/ipalogo.png") no-repeat scroll left top transparent; border: none; float: left; height: 36px; @@ -651,7 +651,7 @@ form#login { .textblockkrb ul li { list-style-type: none; padding: .15em; - + } @@ -661,7 +661,7 @@ h3 { font-size: 1.5em; font-weight: normal; text-transform: uppercase; -} +} h5 { color: #333333; @@ -674,9 +674,9 @@ h5 { margin-top: -3em; } - - - + + + /* Search */ .search-controls { diff --git a/install/migration/ipalogo.png b/install/migration/ipalogo.png Binary files differdeleted file mode 100644 index 62185c1b0..000000000 --- a/install/migration/ipalogo.png +++ /dev/null diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index 8d2d817b2..2c97d3724 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -31,11 +31,13 @@ app_DATA = \ facet-tab_off.png \ facet-tab_on.png \ favicon.ico \ + firefox-icon.png \ group.js \ hbac.js \ host.js \ hostgroup.js \ hover-tab.png \ + ie-icon.png \ import.png \ index.html \ ipa.css \ diff --git a/install/ui/centered-bg.png b/install/ui/centered-bg.png Binary files differindex 17a5bae35..9e606a815 100644 --- a/install/ui/centered-bg.png +++ b/install/ui/centered-bg.png diff --git a/install/html/firefox-icon.png b/install/ui/firefox-icon.png Binary files differindex ca149a42a..ca149a42a 100644 --- a/install/html/firefox-icon.png +++ b/install/ui/firefox-icon.png diff --git a/install/html/ie-icon.png b/install/ui/ie-icon.png Binary files differindex 52f7a83f2..52f7a83f2 100644 --- a/install/html/ie-icon.png +++ b/install/ui/ie-icon.png |