use macdropdown

1 files changed, 26 insertions, 47 deletions

diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 56095a2..03b5547 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -151,7 +151,7 @@
     <script type="text/javascript">
 $(function() {
 		   $("input:submit, input:reset, input:button, a",".button").button();
-		   $("#selection").mcDropdown('#sites');
+		   $("#origin").mcDropdown('#sites');
 		   
 });
     </script>
@@ -187,35 +187,32 @@ $(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>
-	        <input type="text" name="selection" id="selection" value="" />
+	        <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">
+			  <ul id="sites" class="mcdropdown_menu">
 				<logic:present name="cookieList" scope="request">
 					<li>
 					   <!-- a href="#recently-visited">Recently Visited</a -->
 					   Recently Visited
 					   <ul>
 				        <logic:iterate id="site" name="cookieList">
-				            <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"/>
-				
-				                 <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>
-				              </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" />
-				                <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>
-				              </logic:notPresent>
+				            <li rel="<jsp:getProperty name="site" property="name" />">
+				              <jsp:getProperty name="site" property="displayName" />
 				            </li>
 				        </logic:iterate>
 				        <li>
@@ -246,30 +243,12 @@ $(function() {
 	                   <!-- 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>
-	                     <logic:present name="entityID" scope="request">
-	
-			                <bean:define id="returnIDParam" name="returnIDParam"/>
-			                <bean:define id="ei" name="entityID" />
-			                <bean:define id="re" name="returnX"/>
-			
-			                 <a 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>
-			              </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" />
-			                <a 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>
-			             </logic:notPresent>
-			             </li>
-	                   </logic:iterate>
-	                  </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>