diff options
author | Adam Young <ayoung@redhat.com> | 2011-01-25 14:44:42 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-01-25 16:47:09 -0500 |
commit | fd1e78d2b2285ab8635d638c425459a14ae21de0 (patch) | |
tree | c21aad3ca732d9cf8df18feee534cc1afec8e160 | |
parent | 02803be1ba39e7c9e642f9a45889d196ff3598dc (diff) | |
download | freeipa-fd1e78d2b2285ab8635d638c425459a14ae21de0.tar.gz freeipa-fd1e78d2b2285ab8635d638c425459a14ae21de0.tar.xz freeipa-fd1e78d2b2285ab8635d638c425459a14ae21de0.zip |
error handling style
modifying the directories so they find the assets in the right locations
-rw-r--r-- | freeipa.spec.in | 10 | ||||
-rw-r--r-- | install/html/Makefile.am | 4 | ||||
-rw-r--r-- | install/html/browserconfig.html | 45 | ||||
-rw-r--r-- | install/html/centered-bg.png | bin | 4122 -> 0 bytes | |||
-rw-r--r-- | install/html/ipa_error.css | 26 | ||||
-rw-r--r-- | install/html/ssbrowser.html | 6 | ||||
-rw-r--r-- | install/html/unauthorized.html | 55 | ||||
-rw-r--r-- | install/migration/Makefile.am | 2 | ||||
-rw-r--r-- | install/ui/Makefile.am | 1 | ||||
-rw-r--r-- | install/ui/Static-Background.png (renamed from install/html/Static-Background.png) | bin | 183 -> 183 bytes |
10 files changed, 106 insertions, 43 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index ecbd2685e..19b03f67e 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -240,6 +240,10 @@ ln -s ../../../..%{_sysconfdir}/ipa/html/ssbrowser.html \ %{buildroot}%{_usr}/share/ipa/html/ssbrowser.html ln -s ../../../..%{_sysconfdir}/ipa/html/unauthorized.html \ %{buildroot}%{_usr}/share/ipa/html/unauthorized.html +ln -s ../../../..%{_sysconfdir}/ipa/html/browserconfig.html \ + %{buildroot}%{_usr}/share/ipa/html/browserconfig.html +ln -s ../../../..%{_sysconfdir}/ipa/html/ipa_error.css \ + %{buildroot}%{_usr}/share/ipa/html/ipa_error.css # So we can own our Apache configuration mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/ @@ -351,12 +355,14 @@ fi %{_usr}/share/ipa/*.template %dir %{_usr}/share/ipa/html %{_usr}/share/ipa/html/ssbrowser.html +%{_usr}/share/ipa/html/browserconfig.html %{_usr}/share/ipa/html/unauthorized.html +%{_usr}/share/ipa/html/ipa_error.css %dir %{_usr}/share/ipa/migration %{_usr}/share/ipa/migration/error.html %{_usr}/share/ipa/migration/index.html %{_usr}/share/ipa/migration/invalid.html -%{_usr}/share/ipa/migration/migration.css +%{_usr}/share/ipa/migration/ipa_migration.css %{_usr}/share/ipa/migration/migration.py* %dir %{_usr}/share/ipa/ui %{_usr}/share/ipa/ui/index.html @@ -371,7 +377,9 @@ fi %dir %{_sysconfdir}/ipa %dir %{_sysconfdir}/ipa/html %config(noreplace) %{_sysconfdir}/ipa/html/ssbrowser.html +%config(noreplace) %{_sysconfdir}/ipa/html/ipa_error.css %config(noreplace) %{_sysconfdir}/ipa/html/unauthorized.html +%config(noreplace) %{_sysconfdir}/ipa/html/browserconfig.html %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/httpd/conf.d/ipa.conf diff --git a/install/html/Makefile.am b/install/html/Makefile.am index df2e9a5e7..46e8683c8 100644 --- a/install/html/Makefile.am +++ b/install/html/Makefile.am @@ -3,7 +3,9 @@ NULL = appdir = $(IPA_SYSCONF_DIR)/html app_DATA = \ ssbrowser.html \ - unauthorized.html \ + browserconfig.html \ + unauthorized.html \ + ipa_error.css \ $(NULL) EXTRA_DIST = \ diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html new file mode 100644 index 000000000..308537ad5 --- /dev/null +++ b/install/html/browserconfig.html @@ -0,0 +1,45 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> + <title>IPA: Identity Policy Audit</title> + + <script type="text/javascript" src="../ui/jquery.js"></script> + <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 || + navigator.userAgent.indexOf("SeaMonkey") != -1) + { + $('.textblockkrb').css('display','block'); + } + }); + </script> + + +</head> + +<body id="header-bg"> + + <div class="container_1"> + <div class="header-logo"> + <img src="../ui/ipalogo.png" /> + </div> + <div class="textblockkrb" style="display:none;"> + <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> + </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> + </div> + </div> + +</body> + +</html> diff --git a/install/html/centered-bg.png b/install/html/centered-bg.png Binary files differdeleted file mode 100644 index 9e606a815..000000000 --- a/install/html/centered-bg.png +++ /dev/null diff --git a/install/html/ipa_error.css b/install/html/ipa_error.css index abd850d61..763b354b8 100644 --- a/install/html/ipa_error.css +++ b/install/html/ipa_error.css @@ -8,11 +8,11 @@ */ -@font-face {font-family: "FreeWay"; src:url("FreeWay.otf");} -@font-face {font-family: "FreeWayBold"; src:url("FreeWay-Bold.otf");} +@font-face {font-family: "FreeWay"; src:url("../ui/FreeWay.otf");} +@font-face {font-family: "FreeWayBold"; src:url("../ui/FreeWay-Bold.otf");} body{ - background-image:url("outer-bg.png"); + background-image:url("../ui/outer-bg.png"); background-repeat:repeat-x; background-position:left top; background-color:#F9F9F9; @@ -231,7 +231,7 @@ span.attrhint { padding-top: 2em; margin: 0; border: none; - background-image: url("Mainnav-background.png"); + background-image: url("../ui/Mainnav-background.png"); -moz-border-radius: 0; } @@ -254,7 +254,7 @@ span.attrhint { } .ui-widget-content .ui-icon { - background-image: url("ui-icons_222222_256x240.png"); + background-image: url("../ui/ui-icons_222222_256x240.png"); background-color: #e2e2e2; } @@ -269,7 +269,7 @@ span.attrhint { } .ui-widget-header { - background: url("modal-background.png") repeat scroll 50% 50% #1f9123; + background: url("../ui/modal-background.png") repeat scroll 50% 50% #1f9123; border: 1px solid #244c16; color: #EEEEEE; font-weight: bold; @@ -296,7 +296,7 @@ span.attrhint { .tabs1 .ui-tabs-nav li { -moz-border-radius: 0 !important; - background-image: url("Mainnav-offtab.png"); + background-image: url("../ui/Mainnav-offtab.png"); margin: 0; border-width: 0; text-align: center; @@ -305,7 +305,7 @@ span.attrhint { .tabs1 .ui-tabs-nav li.ui-tabs-selected { padding: 0 0; - background-image: url("Mainnav-ontab.png"); + background-image: url("../ui/Mainnav-ontab.png"); text-align: center; margin: 0; } @@ -342,7 +342,7 @@ span.attrhint { padding: 0.3em 6em 0 4em; margin: 0; height: 2.4em; - background-image: url("Subnav-background.png"); + background-image: url("../ui/Subnav-background.png"); } .tabs2 .ui-tabs-nav li { @@ -423,7 +423,7 @@ span.main-separator{ padding-left: 0; position: fixed; width: 18em; - background-image:url("panel-background.png"); + background-image:url("../ui/panel-background.png"); background-repeat:no-repeat; background-position:right; } @@ -525,14 +525,14 @@ 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; + background: url("../ui/centered-bg.png") no-repeat scroll 0 7em transparent; min-height: 40em; } @@ -561,7 +561,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; diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html index e30e8547f..49e02e7aa 100644 --- a/install/html/ssbrowser.html +++ b/install/html/ssbrowser.html @@ -4,9 +4,7 @@ <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> - + <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="ipa_error.css" /> </head> @@ -15,7 +13,7 @@ <div class="container_1"> <div class="header-logo"> - <img src="ipalogo.png" /> + <img src="../ui/ipalogo.png" /> </div> <div class="textblockkrb"> <h3>Browser Kerberos Setup</h3> diff --git a/install/html/unauthorized.html b/install/html/unauthorized.html index 44a3e92de..b7111d1d3 100644 --- a/install/html/unauthorized.html +++ b/install/html/unauthorized.html @@ -4,38 +4,47 @@ <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> + <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" /> + + <script type="text/javascript"> + $(document).ready(function() { + $("#import-cert-auth-link").click(function(){ + $("#first-time").css("display","none"); + $("#next-link").css("display","block"); + return true; + }); + + }); + + </script> </head> <body id="header-bg"> - - <div class="container_1"> + + <div class="container_1"> <div class="header-logo"> - <img src="ipalogo.png" /> - </div> - <div class="textblockkrb"> - <h3>Kerberos Authentication Failed</h3> - <p><strong>Unable to verify your Kerberos credentials.</strong> Please make sure that you have valid Kerberos tickets (obtainable via kinit), and that you - <br> -have <a href="/ipa/errors/ssbrowser.html">configured your browser correctly</a>. If you are still unable to access the IPA Web interface, please - contact the helpdesk on for additional assistance. </p> - - <p>Import the <a href="/ipa/errors/ca.crt">IPA Certificate Authority</a>. </p> - - <p>You can automatically configure your browser to work with Kerberos by importing the Certificate Authority<br> - above and clicking on the Configure Browser button. </p> - - <p><strong>Reload this page after importing the Certificate Authority</strong></p> - + <img src="../ui/ipalogo.png" /> </div> - + <div class="textblockkrb"> + <h1>Unable to verify your Kerberos credentials.</h1><p> Please make sure that you have valid Kerberos tickets (obtainable via <b>kinit</b>), and that you have configured your browser correctly. </p> + <b>If this is your first time</b> + <div id="first-time"> + <ul> + <li><a id="import-cert-auth-link" href="/ipa/errors/ca.crt" >Click here to Import the IPA Certificate Authority</a>. </li> + <li>Make sure you select <b>all three</b> checkboxes </li> + <li>Click the <b>OK</b> Button</li> + </ul> + </div> + <div id="next-link" style="display:none;"> + . <p> <a href="browserconfig.html"> Next Step:</a></p> + </div> + </div> + </div> </body> </html> - diff --git a/install/migration/Makefile.am b/install/migration/Makefile.am index 201a807cd..aa5713640 100644 --- a/install/migration/Makefile.am +++ b/install/migration/Makefile.am @@ -5,7 +5,7 @@ app_DATA = \ error.html \ index.html \ invalid.html \ - migration.css \ + ipa_migration.css \ migration.py \ $(NULL) diff --git a/install/ui/Makefile.am b/install/ui/Makefile.am index b8b192db3..88dd6b165 100644 --- a/install/ui/Makefile.am +++ b/install/ui/Makefile.am @@ -12,6 +12,7 @@ app_DATA = \ add.js \ associate.js \ caution.png \ + centered-bg.png \ check.png \ ipa_logo_180x50.png \ ipa.js \ diff --git a/install/html/Static-Background.png b/install/ui/Static-Background.png Binary files differindex b8c28931e..b8c28931e 100644 --- a/install/html/Static-Background.png +++ b/install/ui/Static-Background.png |