simplify layout

1 files changed, 76 insertions, 85 deletions

diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index b6779d6..8dab75a 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -61,91 +61,82 @@
 	       <li style="vertical-align: top; padding-left: 20px;">
 	       	<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>
-	               
-	        <ul class="clist">
-	        	<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">
-					  	  <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">
-				            <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 tabindex="20" type="submit" value="Clear List" />
-				      </form>
-		        	</li>
-	        	</logic:present>
-	        	<li style="vertical-align: top;">
-	        		<h2>Full list of identity providers</h2>
-		            <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" id="origin" tabindex="40">
-			                     <logic:iterate id="site" name="sites">
-			                         <option value="<jsp:getProperty name="site" property="name" />">
-			                             <jsp:getProperty name="site" property="displayName" />
-			                         </option>
-			                     </logic:iterate>
-			                 </select>
-                                         <input type="hidden" name="cache" value="perm" />
-			                 <!-- 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>
-	        
-
+        	<logic:present name="cookieList" scope="request">
+			  <h2>Recently Used</h2>
+			  <ul class="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">
+		            <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 tabindex="20" type="submit" value="Clear List" />
+		      </form>
+        	</logic:present>
+       		<h2>Full list of identity providers</h2>
+            <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" id="origin" tabindex="40">
+	                     <logic:iterate id="site" name="sites">
+	                         <option value="<jsp:getProperty name="site" property="name" />">
+	                             <jsp:getProperty name="site" property="displayName" />
+	                         </option>
+	                     </logic:iterate>
+	                 </select>
+                                       <input type="hidden" name="cache" value="perm" />
+	                 <!-- 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>
 	  </div>