summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-07-27 01:59:51 +0200
committerLeif Johansson <leifj@sunet.se>2011-07-27 01:59:51 +0200
commit95c704d845c9b23940769da2a47937361f202d54 (patch)
tree55085be45d658d46d70c66f4eaa9c33a1636ffd1 /src/main
parent0d4f09fe70e101b155931bd60a4294019663bd2c (diff)
use macdropdown
Diffstat (limited to 'src/main')
-rw-r--r--src/main/webapp/wayf-ndn.jsp90
1 files changed, 48 insertions, 42 deletions
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 3dbed74..72b6596 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -187,33 +187,16 @@ $(function() {
<li style="vertical-align: top; margin-left: 50px;">
<h1>Select an identity provider</h1>
<p class="text">The service you are trying to use require that you identify yourself. Please select your identity provider below...</p>
- <form method="get" action="<bean:write name="requestURL" />">
- <input type="text" 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>
- </form>
- <logic:present name="siteLists" scope="request">
- <ul id="sites" class="mcdropdown_menu">
- <logic:present name="cookieList" scope="request">
- <li>
- <!-- a href="#recently-visited">Recently Visited</a -->
- Recently Visited
+
+
+
+ <ul class="ilist">
+ <li style="veritcal-align: top;">
+ <logic:present name="cookieList" scope="request">
+ <h2>Recently Used</h2>
<ul>
<logic:iterate id="site" name="cookieList">
- <li rel="<jsp:getProperty name="site" property="name" />">
- <jsp:getProperty name="site" property="displayName" />
- </li>
+ <li><a href="#<jsp:getProperty name="site" property="name"/>"><jsp:getProperty name="site" property="displayName"/></a></li>
</logic:iterate>
<li>
<form method="get" action="ClearCache.wayf" >
@@ -236,23 +219,46 @@ $(function() {
</form>
</li>
</ul>
- </li>
- </logic:present>
- <logic:iterate id="siteset" name="siteLists">
- <li>
- <!-- a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a -->
- <jsp:getProperty name="siteset" property="name"/>
- <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:iterate>
- </ul>
- </li>
- </logic:iterate>
- </ul>
- </logic:present>
+ </logic:present>
+ </li>
+ <li style="veritcal-align: top; border-left: 1px solid #CECECE;">
+ <form method="get" action="<bean:write name="requestURL" />">
+ <input type="text" 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>
+ </form>
+ <logic:present name="siteLists" scope="request">
+ <ul id="sites" class="mcdropdown_menu">
+ <logic:iterate id="siteset" name="siteLists">
+ <li>
+ <!-- a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a -->
+ <jsp:getProperty name="siteset" property="name"/>
+ <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:iterate>
+ </ul>
+ </li>
+ </logic:iterate>
+ </ul>
+ </logic:present>
+ </li>
+ </ul>
+
+
</li>
</ul>
</div>