From b5c41b83249677bf1dec46de4a7ce97fee55729e Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 3 Nov 2011 10:53:40 +0100 Subject: import 1.1.3 --- src/main/webapp/wayf.jsp | 125 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 113 insertions(+), 12 deletions(-) mode change 100644 => 100755 src/main/webapp/wayf.jsp (limited to 'src/main/webapp/wayf.jsp') diff --git a/src/main/webapp/wayf.jsp b/src/main/webapp/wayf.jsp old mode 100644 new mode 100755 index 74ba11d..12d72da --- a/src/main/webapp/wayf.jsp +++ b/src/main/webapp/wayf.jsp @@ -2,6 +2,7 @@ <%@ page contentType="text/html;charset=UTF-8" %> +<%@ page language="java" import="java.util.*,edu.internet2.middleware.shibboleth.wayf.*,java.lang.*" %> <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> @@ -123,6 +124,7 @@ 10 - Recently used sites hyperlinks 20 - + 25 - AutoSuggestion 30 Federation selection 40 IdP within Selection 50 Select button @@ -158,15 +160,14 @@ Select an identity provider The Service you are trying to reach requires that you -authenticate with your home institution, please select it from the -list below. +authenticate with your home organization, enter the name below.

-Recently used institutions: +Recently used organizations:

@@ -178,6 +179,7 @@ Recently used institutions: simulating the user having specified a permanent cookie --> +

@@ -186,7 +188,8 @@ Recently used institutions: - ?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="> + ?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=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%> +"> @@ -194,7 +197,7 @@ Recently used institutions: - ?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=&cache=perm&action=selection&origin="> + ?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=&cache=perm&action=selection&origin=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%> @@ -230,13 +233,54 @@ Recently used institutions: - + -

+ + + + or

@@ -412,6 +463,9 @@ Search by keyword:

+ + +

@@ -540,8 +594,55 @@ function changedFed(X, Selected) { --> - + + + + + + + + + + - \ No newline at end of file + -- cgit v1.1