summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-07-27 18:56:08 +0200
committerLeif Johansson <leifj@sunet.se>2011-07-27 18:56:08 +0200
commit24bbdd13899745943693e9a7c53e2e6fa40a86e4 (patch)
tree26f4424a12a9372c67a1770c9c4684f698cd0fab
parentc702655b26b8a23ea5c606f7ba423dbcae8b8b4b (diff)
back to ios menus
-rw-r--r--src/main/webapp/wayf-ndn.jsp43
1 files changed, 29 insertions, 14 deletions
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 3bb9529..353101b 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -362,29 +362,44 @@ $(function() {
<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">
+ <logic:present name="siteLists" scope="request">
<ul id="sites">
- <logic:iterate id="siteset" name="siteLists">
+ <logic:iterate id="siteset" name="siteLists">
<li>
<a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a>
<ul>
<logic:iterate id="site" name="siteset" property="sites">
- <li rel="<jsp:getProperty name="site" property="name" />">
- <jsp:getProperty name="site" property="displayName" />
- </li>
+ <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>
</li>
- </logic:iterate>
+ </logic:iterate>
</ul>
- </logic:present>
+ </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>
</li>
</ul>