From 075ed98b50a4494d12347b0ded9e1567d0a5793c Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 26 Nov 2011 00:32:15 +0100
Subject: simplify layout

---
 src/main/webapp/wayf-ndn.jsp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/main/webapp/wayf-ndn.jsp')

diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 56cd98e..f1546d4 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -85,7 +85,13 @@
 		              </logic:notPresent>
 			    </logic:iterate>
 		      </ul>
-		      <form method="get" action="ClearCache.wayf" >
+                      <logic:notPresent name="entityID" scope="request">
+                      <a href="ClearCache.wayf?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />">clear</a>
+                      </logic:notPresent>
+                      <logic:present name="entityID" scope="request">
+                      <a href="ClearCache.ds?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" />">clear</a>
+                      </logic:present>
+		      <!-- 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" />" />
@@ -100,7 +106,7 @@
 		            <input type="hidden" name="returnIDParam" value="<bean:write name="returnIDParam" />" />
 		          </logic:present>
 		          <div class="button"><input tabindex="20" class="button" type="submit" value="Clear List" /></div>
-		      </form>
+		      </form -->
         	</logic:present>
        		<h2>Full list of identity providers</h2>
             <logic:present name="sites" scope="request">  
@@ -129,8 +135,7 @@
 	                 </select>
                          <input type="hidden" name="cache" value="perm" />
                          <div class="button"><input type="submit" id="originsubmit" value="Select" tabindex="50" /></div>
-	              </div>
-	           </span>   
+	              </span>
 	       </logic:present> 		
 	      </li>
 	    </ul>
-- 
cgit v1.1