Revamped the wayf interface a bit.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@546 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/wayfconfig.xml b/src/conf/wayfconfig.xml
index 38c65f9..b5f80c1 100644 (file)
--- a/src/conf/wayfconfig.xml
+++ b/src/conf/wayfconfig.xml
@@ -3,9 +3,9 @@
        cacheType="COOKIES" 
        supportContact="mailto:shib-test@internet2.org" 
        logoLocation="images/internet2.gif">
-<!--   <HelpText>This is the help text.</HelpText>
-       <SearchResultEmptyText>This is the search result empty text.</SearchResultEmptyText>
--->
+       <HelpText>In order to fulfill the request for a web resource you have just attempted to access, information must be obtained from your identify provider. Please select the provider with which you are affiliated.</HelpText>
+       <SearchResultEmptyText>No provider was found that matches your search criteria, please try again.</SearchResultEmptyText>
+
        <SearchIgnore>
                <IgnoreText>Institution</IgnoreText>
                <IgnoreText>University</IgnoreText>

diff --git a/src/edu/internet2/middleware/shibboleth/wayf/WayfService.java b/src/edu/internet2/middleware/shibboleth/wayf/WayfService.java
index 08ec7d2..1cf82b5 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/wayf/WayfService.java
+++ b/src/edu/internet2/middleware/shibboleth/wayf/WayfService.java
@@ -252,8 +252,8 @@ public class WayfService extends HttpServlet {
                if (handleService == null) {
                        handleLookup(req, res);
                } else {
-                       if ((req.getParameter("noCache") == null)
-                               || !(req.getParameter("noCache").equalsIgnoreCase("TRUE"))) {
+                       if ((req.getParameter("cache") != null)
+                               && req.getParameter("cache").equalsIgnoreCase("TRUE")) {
                                WayfCacheFactory.getInstance(config.getCacheType(), wOptions).addHsToCache(handleService, req, res);
                        }
                        forwardToHS(req, res, handleService);

diff --git a/webApplication/wayf.css b/webApplication/wayf.css
new file mode 100644 (file)
index 0000000..05163a2
--- /dev/null
+++ b/webApplication/wayf.css
@@ -0,0 +1,104 @@
+body {
+       background-color: #CCCCCC;
+       text-align: center;
+       color: #000000;
+       text-align: left;
+}
+
+p {
+       font-size: 90%;
+}
+
+li {
+       font-size: 100%;
+       list-style-type: none;
+}
+
+h1 {
+       font-size: 135%;
+       font-weight: bold;
+       color: #FFFFFF;
+}
+
+h2 { 
+       font-size: 100%;
+       font-weight: bold;
+}
+
+h3 { 
+       font-size: 100%;
+       font-weight: normal;
+}
+
+span.option { 
+       font-size: 100%;
+       font-weight: bold;
+}
+
+.error {
+       font-size: 100%;
+       color: #990000;
+}
+
+.head {
+       max-width: 600px;
+       border-left-width: 2px;
+       border-right-width: 2px;
+       border-top-width: 2px;
+       border-bottom-width: 2px;
+       border-color: #000000;
+       border-style: solid;
+       background-color: #6688aa;
+       margin-top: 1em;
+       margin-bottom: 0;
+       margin-left: 1em;
+       margin-right: 1em;
+       padding-left: .75em;
+       padding-right: .75em;
+       padding-top: .5em;
+       padding-bottom: .5em;
+}
+
+.selector {
+       max-width: 600px;
+       border-left-width: 2px;
+       border-right-width: 2px;
+       border-top-width: 0;
+       border-bottom-width: 0;
+       border-color: #000000;
+       border-style: solid;
+       background-color: #FFFFFF;
+       margin-top: 0;
+       margin-bottom: 0;
+       margin-left: 1em;
+       margin-right: 1em;
+       padding: .75em;
+}
+
+.footer {
+       max-width: 600px;
+       border-left-width: 2px;
+       border-right-width: 2px;
+       border-top-width: 2px;
+       border-bottom-width: 2px;
+       border-color: #000000;
+       border-style: solid;
+       background-color: #FFFFFF;
+       margin-top: 0;
+       margin-bottom: 1em;
+       margin-left: 1em;
+       margin-right: 1em;
+       padding-left: .75em;
+       padding-right: .75em;
+       padding-top: .5em;
+       padding-bottom: .5em;
+}
+
+span.warning {
+       font-size: 80%;
+}
+span.incommon {
+       font-size: larger;
+       font-weight: bolder;
+       color: #FFFFFF;
+}

diff --git a/webApplication/wayf.jsp b/webApplication/wayf.jsp
index b8a3f6d..404221c 100755 (executable)
--- a/webApplication/wayf.jsp
+++ b/webApplication/wayf.jsp
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html 
-       PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
-       "DTD/xhtml1-strict.dtd">
-       <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
        <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
        <jsp:useBean id="originsets" scope="application" class="edu.internet2.middleware.shibboleth.wayf.OriginSet[]"/>
        <jsp:useBean id="requestURL" scope="request" class="java.lang.String"/>
@@ -17,73 +17,83 @@
        <logic:present name="searchresults" scope="request">
                <jsp:useBean id="searchresults" scope="request" class="edu.internet2.middleware.shibboleth.wayf.Origin[]"/>
        </logic:present>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-       <link rel="stylesheet" type="text/css" href="main.css" />
-       <title>Access Request</title>
-</head>
+               <link rel="stylesheet" title="normal" type="text/css" href="wayf.css" /><title>InCommon&#174;: Identity Provider Selection</title></head>
+       <body>
 
-<body>
+               <div class="head">
+                       <h1>Select an <span class="incommon">InCommon&#174;</span> identity provider</h1>
+               </div>
 
-<div class="head">
+               <div class="selector">
+                       <p class="text"><bean:write name="helpText" /></p>
 
-<img src="<bean:write name="logoLocation" />" alt="Logo" />
-<h1>Inter-institutional Access Request</h1>
-<p class="text"><bean:write name="helpText" /></p>
-</div>
+                       <div class="list">
 
-<div class="search">
+                               <h2>Choose from a list:</h2>
+                               <logic:iterate id="originset" name="originsets">
+                               <h3><jsp:getProperty name="originset" property="name" /></h3>
+                               <form method="get" action="<bean:write name="requestURL" />">
+                                       <p>
+                                       <input type="hidden" name="shire" value="<bean:write name="shire" />" />
+                                       <input type="hidden" name="target" value="<bean:write name="target" />" />
+                                       <input type="hidden" name="action" value="selection" />
+                                       <select name="origin">  
+                                               <logic:iterate id="origin" name="originset" property="origins">
+                                                       <option value="<jsp:getProperty name="origin" property="name" />">
+                                                               <jsp:getProperty name="origin" property="displayName" />
+                                                       </option>
+                                               </logic:iterate>
+                                       </select>
+                                               <input type="submit" value="Select" />
+                                               <input type="checkbox" checked="checked" name="cache" value="TRUE" /><span class="warning">Remember my selection on this computer.</span>
+                                               </p>
+                                       </form>
+                                       </logic:iterate>
 
-       <logic:present name="searchResultsEmpty" scope="request">
-               <p class="error"><bean:write name="searchResultEmptyText" /></p>
-       </logic:present>
-       
-       <logic:present name="searchresults" scope="request">
-               <ul>
-               <logic:iterate id="currResult" name="searchresults">
-                       <li>
-                       <a href="<bean:write name="requestURL" />?action=selection&amp;origin=<jsp:getProperty name="currResult" property="urlEncodedName" />&amp;shire=<bean:write name="encodedShire" />&amp;target=<bean:write name="encodedTarget" />"><jsp:getProperty name="currResult" property="displayName" /></a>
-                       </li>
-               </logic:iterate>
-               </ul>           
-       </logic:present>
-       <form method="get" action="<bean:write name="requestURL" />">
-               <p>
-                       <input type="hidden" name="shire" value="<bean:write name="shire" />" />
-                       <input type="hidden" name="target" value="<bean:write name="target" />" />
-                       <input type="hidden" name="action" value="search" />
-                       <input type="text" name="string" />
-                       <input type="submit" value="Search" />
-               </p>
-       </form>
-       
-</div>
-
-<div class="list">
+                               </div>
+                               <div class="search">
+                               <span class="option">or</span>
+                               <h2>Search by keyword:</h2>
 
-<logic:iterate id="originset" name="originsets">
-<h2><jsp:getProperty name="originset" property="name" /></h2>
-<form method="get" action="<bean:write name="requestURL" />">
-<p>
-<input type="hidden" name="shire" value="<bean:write name="shire" />" />
-<input type="hidden" name="target" value="<bean:write name="target" />" />
-<input type="hidden" name="action" value="selection" />
-<select name="origin">
-       <logic:iterate id="origin" name="originset" property="origins">
-               <option value="<jsp:getProperty name="origin" property="name" />">
-               <jsp:getProperty name="origin" property="displayName" />
-               </option>
-       </logic:iterate>
-</select>
-<input type="submit" value="Select" />
-</p>
-</form>
-</logic:iterate>
+                                       <form method="get" action="<bean:write name="requestURL" />">
+                                               <p>
+                                                       <input type="hidden" name="shire" value="<bean:write name="shire" />" />
+                                                       <input type="hidden" name="target" value="<bean:write name="target" />" />
+                                                       <input type="hidden" name="action" value="search" />
+                                                       <input type="text" name="string" />
+                                                       <input type="submit" value="Search" />
+                                               </p>
+                                       </form>
+                                       <logic:present name="searchResultsEmpty" scope="request">
+                                               <p class="error"><bean:write name="searchResultEmptyText" /></p>
+                                       </logic:present>
+                                       <logic:present name="searchresults" scope="request">
+                                               <h3>Search results:</h3>
+                                               <form method="get" action="<bean:write name="requestURL" />">
+                                                       <ul>
+                                                       <logic:iterate id="currResult" name="searchresults">
+                                                               <li>
+                                                               <input type="radio" name="origin" value="<jsp:getProperty name="currResult" property="name" />" /><jsp:getProperty name="currResult" property="displayName" />
+                                                               </li>
+                                                       </logic:iterate>
+                                                       </ul>
+                                                       <p>
+                                                               <input type="hidden" name="shire" value="<bean:write name="shire" />" />
+                                                               <input type="hidden" name="target" value="<bean:write name="target" />" />
+                                                               <input type="hidden" name="action" value="selection" />
+                                                               <input type="submit" value="Select" />
+                                                               <input type="checkbox" checked="checked" name="cache" value="TRUE" /><span class="warning">Remember my selection on this computer.</span>
+                                                       </p>
+                                               </form> 
+                                       </logic:present>
 
-</div>
+                               </div>
+                       </div>
+                       <div class="footer">
 
-<p class="text">Need assistance? Send mail to <a href="<bean:write name="supportContact" />"><bean:write name="supportContact" /></a> with description.</p>
+                               <p class="text">Need assistance? Send mail to <a href="mailto:shib-test@internet2.edu">shib-test@internet2.edu</a> with description.</p>
+                       </div>
 
 
-</body>
-</html>
\ No newline at end of file
+       </body></html>