From 6dc252576a5871a03f5cca7af5940bd082f4b927 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 25 Nov 2011 23:14:00 +0100
Subject: tabbed layout

---
 src/installer/resources/wayfconfig.xml |  4 +-
 src/main/webapp/wayf-ndn.jsp           | 77 +++++++++++++++-------------------
 2 files changed, 35 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml
index 5cfd1fd..f751f44 100755
--- a/src/installer/resources/wayfconfig.xml
+++ b/src/installer/resources/wayfconfig.xml
@@ -206,11 +206,11 @@
        <Federation identifier="SWAMID"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
+    <DiscoveryServiceHandler location="https://idp-test.nordu.net(:[0-9]+)?/.+/ClearCache.wayf" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
        <PluginInstance identifier="DeleteCookiePlugin"/>
     </DiscoveryServiceHandler>
 
-    <DiscoveryServiceHandler provideListOfList="true" location="https://idp-test.nordu.net(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
+    <DiscoveryServiceHandler location="https://idp-test.nordu.net(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror.jsp">
        <PluginInstance identifier="CookiePlugin"/>
     </DiscoveryServiceHandler>
 
diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index ee8d3c3..568e441 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -110,50 +110,39 @@
 	        	</logic:present>
 	        	<li style="vertical-align: top; width: 65%;">
 	        		<h2>Full list of identity providers</h2>
-		            <logic:present name="siteLists" scope="request">
-					  <div id="sites">
-					     <ul>
-					     <logic:iterate id="siteset" name="siteLists">
-					        <li><a href="#<jsp:getProperty name="siteset" property="name"/>"><jsp:getProperty name="siteset" property="name"/></a></li>
-					     </logic:iterate>
-					     </ul>
-					     <logic:iterate id="siteset" name="siteLists">
-			                <div id="<jsp:getProperty name="siteset" property="name"/>">   
-			                   <form style="margin-bottom: 10px;" 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" />
-					                 <select name="origin" class="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>
-					                 <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><br/>
-                                     <input type="submit" class="button" id="originsubmit" value="Select" tabindex="50" />
-					              </div>
-					           </form>
-							</div>
-						 </logic:iterate>
-					  </div>
-					</logic:present>      		
+		            <logic:present name="sites" scope="request">  
+	                   <form style="margin-bottom: 10px;" 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" />
+			                 <select name="origin" class="origin" tabindex="40">
+			                     <logic:iterate id="site" name="sites" property="sites">
+			                         <option value="<jsp:getProperty name="site" property="name" />">
+			                             <jsp:getProperty name="site" property="displayName" />
+			                         </option>
+			                     </logic:iterate>
+			                 </select>
+			                 <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 type="submit" class="button" id="originsubmit" value="Select" tabindex="50" />
+			              </div>
+			           </form>   
+			       </logic:present> 		
 	        	</li>
 	        </ul>
 	        
-- 
cgit v1.1