summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/webapp/wayf-ndn.jsp56
1 files changed, 33 insertions, 23 deletions
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 66fc0c8..5f67f10 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -116,29 +116,39 @@
</logic:iterate>
</ul>
<logic:iterate id="siteset" name="siteLists">
- <div id="<jsp:getProperty name="siteset" property="name"/>">
- <ul class="sitelist">
- <logic:iterate id="site" name="siteset" property="sites">
- <logic:present name="entityID" scope="request">
- <bean:define id="returnIDParam" name="returnIDParam"/>
- <bean:define id="ei" name="entityID" />
- <bean:define id="re" name="returnX"/>
-
- <li><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" />">
- <jsp:getProperty name="site" property="displayName" />
- </a></li>
- </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" />
- <li><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" />">
- <jsp:getProperty name="site"
- property="displayName" />
- </a></li>
- </logic:notPresent>
- </logic:iterate>
- </ul>
+ <div id="<jsp:getProperty name="siteset" property="name"/>">
+ <form style="margin-bottom: 10px;" id="originform" 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" />" />
+ <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" name="action" value="selection" />
+ <!-- input type="text" id="originSearch" name="string" value="" tabindex="25" size="30"/ -->
+ <select name="origin" id="origin" tabindex="40">
+ <logic:iterate id="site" name="siteset" property="sites">
+ <option value="<jsp:getProperty name="site" property="name" />">
+ <jsp:getProperty name="site" property="displayName" />
+ </option>
+ </logic:iterate>
+ </select>
+ <input type="submit" id="originsubmit" value="Select" tabindex="50" />
+ <select name="cache" tabindex="60">
+ <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>
</div>
</logic:iterate>
</div>