summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-02 11:13:29 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-02 11:13:29 +0200
commitfb2f3976e45d77cf3426e85e00c89e0ee1cff553 (patch)
tree4ec23f5b1751c836a6f5f329f9f0630bd1fb963a /src/main
parent61efb36d47076f501b87bfaad983cfe40d39d319 (diff)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/webapp/wayf-ndn.jsp55
1 files changed, 24 insertions, 31 deletions
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 58f1b9a..b59bd5c 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -155,14 +155,14 @@
<script type="text/javascript">
$(function() {
$("input:submit, input:reset, input:button, a",".button").button();
- $(".sitelist").menu();
+ $("#sitelist").menu();
});
</script>
<script type="text/javascript">
$.widget( "ui.iosMenu", {
options: {
backText: 'Back',
- slideDuration: 400,
+ slideDuration: 200,
slideEasing: 'linear'
},
@@ -321,11 +321,28 @@
<ul class="ilist">
<logic:present name="cookieList" scope="request">
<li style="veritcal-align: top;">
- <h2>Recently Used</h2>
- <ul class="sitelist" style="margin-bottom: 50px;">
- <logic:iterate id="site" name="cookieList">
- <li><a tabindex="10" href="#<jsp:getProperty name="site" property="name"/>"><jsp:getProperty name="site" property="displayName"/></a></li>
- </logic:iterate>
+ <h2>Recently Used</h2>
+ <ul id="sitelist" style="margin-bottom: 50px;">
+ <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"/>
+
+ <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>
<form method="get" action="ClearCache.wayf" >
<logic:notPresent name="entityID" scope="request">
@@ -348,30 +365,6 @@
</logic:present>
<li style="vertical-align: top;">
<h2>Full list of identity providers</h2>
- <!-- form id="selector" method="get" action="<bean:write name="requestURL" />">
- <input type="hidden" name="action" value="selection"/>
- <input type="hidden" name="origin" id="origin" value="" />
- <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>
-
- <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>
- <input tabindex="50" type="submit" value="Select"/>
- </form -->
<logic:present name="siteLists" scope="request">
<ul id="sites">
<logic:iterate id="siteset" name="siteLists">