diff options
Diffstat (limited to 'src/main/webapp/wayf.jsp')
| -rwxr-xr-x[-rw-r--r--] | src/main/webapp/wayf.jsp | 202 |
1 files changed, 28 insertions, 174 deletions
diff --git a/src/main/webapp/wayf.jsp b/src/main/webapp/wayf.jsp index e30fc38..7b76dd5 100644..100755 --- a/src/main/webapp/wayf.jsp +++ b/src/main/webapp/wayf.jsp @@ -1,15 +1,11 @@ <?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"> -<%@ page contentType="text/html;charset=UTF-8" %> <html> <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> -<%request.setCharacterEncoding("UTF-8");%> -<%response.setCharacterEncoding("UTF-8");%> - <logic:present name="showComments" scope="Request"> <!-- TO CONFIGURE THIS FOR A SPECIFIC SITE @@ -39,23 +35,8 @@ 1.3 discovery protocol and need to be specified as parameters to the WAYF entityID, return, returnIDParam are all part of the - SAML Discovery protocol. - - ---> -</logic:present> + SAML Discovery protocol -<logic:notPresent name="entityID" scope="request"> -<logic:notPresent name="shire" scope="request"> - -<jsp:forward page = "wayferror.jsp"/> -</logic:notPresent> -</logic:notPresent> - - -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE In addition to the above. The WAYF may also supply the following to the jsp. @@ -115,27 +96,7 @@ "cache" preserve any selection in the _saml_idp cookie. A value of "session" makes the cookie last for the browser session, "perm" gives it the lifetime specified in the - configuration file. - - The tabindex is hard wired. Fortunately the standard allows us to - have duplicate numbers and says the order is the order things - get emitted. We use these numbers - - 10 - Recently used sites hyperlinks - 20 - <clear button for above> - 25 - AutoSuggestion - 30 Federation selection - 40 IdP within Selection - 50 Select button - 60 How long to remember selector - 70 Search entry - 80 Search Button - 90 List of search results - 100 Select search result - 110 How long to remember search results - 120 Hyperlink to admin user. - ---> + configuration file. --> </logic:present> @@ -159,14 +120,15 @@ Select an identity provider <!--CONFIG--> The Service you are trying to reach requires that you -authenticate with your home organization, enter the name below. +authenticate with your home institution, please select it from the +list below. </p> <logic:present name="cookieList" scope="request"> <h2> -Recently used organizations: +Recently used institutions: </h2> @@ -178,7 +140,6 @@ Recently used organizations: simulating the user having specified a permanent cookie --> </logic:present> - <logic:iterate id="site" name="cookieList"> <p class="text"> <logic:present name="entityID" scope="request"> @@ -187,7 +148,7 @@ Recently used organizations: <bean:define id="ei" name="entityID" /> <bean:define id="re" name="returnX"/> - <a tabindex="10" href="<bean:write name="requestURL" />?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDxParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> + <a href="<bean:write name="requestURL" />?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDxParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> </a> </logic:present> @@ -195,7 +156,7 @@ Recently used organizations: <bean:define id="targ" name="target" /> <bean:define id="shire" name="shire" /> <bean:define id="pid" name="providerId" /> - <a tabindex="10" href="<bean:write name="requestURL" />?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=<bean:write name="time" />&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> + <a href="<bean:write name="requestURL" />?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=<bean:write name="time" />&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> </a> @@ -213,7 +174,6 @@ Recently used organizations: </logic:present> <form method="get" action="ClearCache.wayf" > - <div> <logic:notPresent name="entityID" scope="request"> <input type="hidden" name="shire" value="<bean:write name="shire" />" /> <input type="hidden" name="target" value="<bean:write name="target" />" /> @@ -227,58 +187,16 @@ Recently used organizations: <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> - <input tabindex="20" type="submit" value="Clear" /> - </div> + <input type="submit" value="Clear" /> </form> - </logic:present> <!-- Previous Selections --> - -<logic:present name="showComments" scope="Request"> - -<!-- PROGRAMMING NOTE - - Add the "instant search" dialogue. - -</logic:present> + </logic:present> <div class="list"> - <logic:present name="sites" scope="request"> - <h2> - Enter institution name: - </h2> - <form autocomplete="OFF" action=""> - <div> - <logic:notPresent name="entityID" scope="request"> - <input type="hidden" name="shire" value="<bean:write name="shire" />" /> - <input type="hidden" name="target" value="<bean:write name="target" />" /> - <input type="hidden" name="providerId" value="<bean:write name="providerId" />" /> - <logic:present name="time" scope="request"> - <input type="hidden" name="time" value="<bean:write name="time" />" /> - </logic:present> - </logic:notPresent> - <logic:present name="entityID" scope="request"> - <input type="hidden" name="entityID" value="<bean:write name="entityID" />" /> - <input type="hidden" name="returnX" value="<bean:write name="returnX" />" /> - <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> - </logic:present> - <input type="hidden" id="enterOrigin" name="origin" value="unspec" /> - <input type="hidden" id="enterType" name="action" value="search" /> - <input type="text" id="enterText" name="string" value="" tabindex="25" size="54"/> - <input type="submit" id="enterSubmit" value="Search"/> - <input type="hidden" name="cache" value="perm"/> - </div> - </form> - </logic:present> - - <h2> -<logic:present name="showComments" scope="Request"> - -Provide a static drop down or a dynamically republished one. - you may wish to remove this code - -</logic:present> + <h2> -Or choose from a list: +Choose from a list: </h2> @@ -286,7 +204,6 @@ Or choose from a list: <logic:notPresent name="siteLists" scope="request"> <form method="get" action="<bean:write name="requestURL" />"> - <div> <logic:notPresent name="entityID" scope="request"> <input type="hidden" name="shire" value="<bean:write name="shire" />" /> <input type="hidden" name="target" value="<bean:write name="target" />" /> @@ -301,20 +218,19 @@ Or choose from a list: <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> <input type="hidden" name="action" value="selection" /> - <select name="origin" id="hackForie6" tabindex="40"> + <select name="origin"> <logic:iterate id="site" name="sites"> <option value="<jsp:getProperty name="site" property="name" />"> <jsp:getProperty name="site" property="displayName" /> </option> </logic:iterate> </select> - <input type="submit" value="Select" tabindex="50" /> - <select name="cache" tabindex="60"> + <input type="submit" value="Select" /> + <select name="cache"> <option value="false"> Do not remember</option> <option value="session" selected="selected"> Remember for session</option> <option value="perm"> Remember for a week</option> </select> - </div> </form> </logic:notPresent> </logic:present> @@ -339,7 +255,6 @@ Or choose from a list: <logic:present name="siteLists" scope="request"> <form method="get" action="<bean:write name="requestURL" />"> - <div> <logic:notPresent name="entityID" scope="request"> <input type="hidden" name="shire" value="<bean:write name="shire" />" /> <input type="hidden" name="target" value="<bean:write name="target" />" /> @@ -356,10 +271,10 @@ Or choose from a list: <table id="tab"> <tr> <th>Federation </th> - <th>organization</th> + <th>Institution</th> </tr> <tr><td> - <select name="FedSelector" size="10" id="FedSelect" tabindex="30" + <select name="FedSelector" size="10" id="FedSelect" onchange="changedFed(this.form.origin, this.form.FedSelector[this.form.FedSelector.selectedIndex].value);"> <logic:iterate id="siteset" name="siteLists"> @@ -387,7 +302,7 @@ Or choose from a list: </logic:notPresent> </select></td><td> <input type="hidden" name="action" value="selection" /> - <select name="origin" size="10" id="originIdp" tabindex="40"> + <select name="origin" size="10" id="originIdp"> <logic:present name="sites" scope="request"> <logic:iterate id="site" name="sites"> <option value="<jsp:getProperty name="site" property="name" />"> @@ -409,25 +324,17 @@ Or choose from a list: </td></tr> </table> <p> - <input type="submit" value="Select" tabindex="50" /> - <select name="cache" tabindex="60" > + <input type="submit" value="Select" /> + <select name="cache"> <option value="false"> Do not remember</option> <option value="session" selected="selected"> Remember for session</option> <option value="perm"> Remember for a week</option> </select> </p> - </div> </form> </logic:present> </div> - - <div class="search"> - -<logic:present name="showComments" scope="Request"> - -<!-- This is here for completeness - it shows the "old fashioned way" to do search --> - <span class="option">or</span> <h2> @@ -437,7 +344,6 @@ Search by keyword: </h2> <form method="get" action="<bean:write name="requestURL" />"> - <div> <p> <logic:notPresent name="entityID" scope="request"> @@ -455,15 +361,11 @@ Search by keyword: </logic:present> <input type="hidden" name="action" value="search" /> - <input type="text" name="string" tabindex="70" /> - <input type="submit" value="Search" tabindex="80" /> + <input type="text" name="string" /> + <input type="submit" value="Search" /> </p> - </div> </form> -<!-- The end of the old code. Below is where search results go --> - -</logic:present> <logic:present name="searchResultsEmpty" scope="request"> <p class="error"> @@ -479,11 +381,10 @@ Search results: </h3> <form method="get" action="<bean:write name="requestURL" />"> - <div> <ul> <logic:iterate id="currResult" name="searchresults"> <li> - <input type="radio" name="origin" tabindex="90" value="<jsp:getProperty name="currResult" property="name" />" /> + <input type="radio" name="origin" value="<jsp:getProperty name="currResult" property="name" />" /> <jsp:getProperty name="currResult" property="displayName" /> </li> </logic:iterate> @@ -503,14 +404,13 @@ Search results: <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" /> </logic:present> <input type="hidden" name="action" value="selection" /> - <input type="submit" value="Select" tabindex="100" /> - <select name="cache" tabindex="100" > + <input type="submit" value="Select" /> + <select name="cache"> <option value="false"> Do not remember</option> <option value="session" selected="selected"> Remember for session</option> <option value="perm"> Remember for a week</option> </select> </p> - </div> </form> </logic:present> </div> @@ -519,9 +419,9 @@ Search results: <div class="footer"> <p class="text"> <!--CONFIG--> -Need assistance? Send mail to <a tabindex="120" href="mailto:user@domain">administrator's name</a> with description. +Need assistance? Send mail to <a href="mailto:user@domain"> administrator's name</a> with description. </p> - <div class="logo"><img src="images/internet2.gif" alt="Internet2" /></div> + <div class="logo"><img src="images/internet2.gif" alt="InQueue" /></div> </div> <logic:present name="showComments" scope="Request"> @@ -587,59 +487,13 @@ function changedFed(X, Selected) { } </logic:notPresent> + } --> </script> </logic:present> - -<logic:present name="sites" scope="request"> - -<logic:present name="showComments" scope="Request"> - <!-- Load the autosuggest code. - - PROGRAMMING NOTE - the "ie6Hack" is to do with an issue in ie6 in which the - psuedo drop down floats below the real dropdown. The hack is that we jsut disable - the real drop down when the pseudo one is about. This can seem weird for some - layouts and so if you are not deploying against ie6 you can just send an - empty array. - --> -</logic:present> - <script language="javascript" type="text/javascript" src="Suggest.js"></script> - <script language="javascript" type="text/javascript"> -<!-- -window.onload = function() { - -<logic:notPresent name="siteLists" scope="request"> - var ie6Hack = [ document.getElementById("hackForie6")]; -</logic:notPresent> - -<logic:present name="siteLists" scope="request"> - var ie6Hack = [ document.getElementById("FedSelect"), document.getElementById("originIdp")]; -</logic:present> - var control = new TypeAheadControl(theElements, - document.getElementById("enterText"), - document.getElementById("enterOrigin"), - document.getElementById("enterSubmit"), - document.getElementById("enterType"), - ie6Hack); - - - document.getElementById("enterText").focus(); -} - - -var theElements = [ - <logic:iterate id="site" name="sites"> - ["<%= ((edu.internet2.middleware.shibboleth.wayf.IdPSite)site).getDisplayName().replace("\n","").toString() %>", - "<jsp:getProperty name="site" property="name" />"], - </logic:iterate> - ]; - ---> - </script> -</logic:present> - + </body> </html> |