diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-08-01 11:35:10 +0200 |
| commit | e54fabf198f50546b093753900d3a41fa7535181 (patch) | |
| tree | bcd4952415c938101ae168efc2dcb2b550369e23 /src/main/webapp/javascript.jsp | |
| parent | 6c67f4c3050fa01d1b8e04f334cb8dd2293b39d0 (diff) | |
| parent | bd0c52acfb796b5a8cd85c2f535e7e874f558f3a (diff) | |
Merge branch 'trunk' into idp.nordu.net
Conflicts:
src/main/webapp/wayf.jsp
Diffstat (limited to 'src/main/webapp/javascript.jsp')
| -rw-r--r-- | src/main/webapp/javascript.jsp | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/src/main/webapp/javascript.jsp b/src/main/webapp/javascript.jsp deleted file mode 100644 index 274df50..0000000 --- a/src/main/webapp/javascript.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%@ page contentType="text/javascript;charset=UTF-8" %>
-<%@ 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");%>
-
-
-var theElements = [
- <logic:iterate id="site" name="sites">
- ["<jsp:getProperty name="site" property="displayName" />", "<jsp:getProperty name="site" property="name" />"],
- </logic:iterate>
- ];
-
-var theHints = [
-
-<logic:present name="cookieList" scope="request">
-<logic:iterate id="site" name="cookieList">
- <logic:present name="entityID" scope="request">
-
- <bean:define id="returnIDParam" name="returnIDParam"/>
- <bean:define id="ei" name="entityID" />
- <bean:define id="re" name="returnX"/>
-
- [
- "<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" />"
- ],
- </logic:present>
- <logic:notPresent name="entityID" scope="request">
- <bean:define id="targ" name="target" />
- <bean:define id="shire" name="shire" />
- <bean:define id="pid" name="providerId" />
-
- [
- "<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" />"
- ],
- </logic:notPresent>
-</logic:iterate>
-</logic:present>
-];
-
\ No newline at end of file |