From d1c1871c41409299931c57fb86176f7c2552b8e4 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Sat, 26 Nov 2011 00:38:56 +0100
Subject: simplify layout

---
 src/main/webapp/wayf-ndn.jsp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/webapp/wayf-ndn.jsp b/src/main/webapp/wayf-ndn.jsp
index 3de7485..d1d0b8e 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -86,10 +86,16 @@
 			    </logic:iterate>
 		      </ul>
                       <logic:notPresent name="entityID" scope="request">
-                      <a href="ClearCache.wayf?target=<%= java.net.URLEncoder.encode(targget.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>
+                      <bean:define id="targ" name="target" />
+		              <bean:define id="shire" name="shire" />
+		              <bean:define id="pid" name="providerId" />
+                      <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(entityID.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(returnX.toString(), "utf-8") %>&returnIDParam=<%= java.net.URLEncoder.encode( returnIDParam.toString(), "utf-8" ) %>&cache=perm&action=selection&origin=<jsp:getProperty name="site" property="name" />">clear</a>
+                      <bean:define id="returnIDParam" name="returnIDParam"/>
+		              <bean:define id="ei" name="entityID" />
+		              <bean:define id="re" name="returnX"/>
+                      <a href="ClearCache.ds?entityID=<%= java.net.URLEncoder.encode(ei.toString(), "utf-8") %>&return=<%= java.net.URLEncoder.encode(re.toString(), "utf-8") %>&returnIDParam=<%= 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">
-- 
cgit v1.1