From 176cdca4a74d1b91217c9c6f1f5884e348ef3cea Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 26 Jul 2011 03:50:30 +0200
Subject: ndn style

---
 src/main/webapp/wayf-ndn.jsp | 190 ++++++++++++++++++++++---------------------
 1 file changed, 96 insertions(+), 94 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 b6eb593..6f101a4 100644
--- a/src/main/webapp/wayf-ndn.jsp
+++ b/src/main/webapp/wayf-ndn.jsp
@@ -164,51 +164,99 @@ $(function() {
              </tr>
           </table>
        </div>
-       <div id="left">
-          <div id="nav">
-             <ul class="site_tree">
-                <li class="level1"><strong class="level1">About</strong>
-                   <ul>
-                      <li class="level2"><a class="level2" href="http://www.nordu.net">NORDUnet Home</a></li>
-                      <li class="level2"><a class="level2" href="http://www.nordu.net#aup">Acceptable Use Policy</a></li>
-                      <li class="level2"><a class="level2" href="http://www.nordu.net#pii">Privacy Policy</a></li>
-                   </ul>
-                </li>
-                <li class="level1"><strong class="level1">Tools</strong>
-                   <ul>
-                      <li class="level2"><a class="level2" href="https://crowd.nordu.net/sso/pwman">Change Your Password</a></li>
-                   </ul>
-                </li>
-             </ul>
-             <div id="nav_pic"><img src="http://www.nordu.net/resources/pipes.jpg" width="200px" height="395" alt="" /></div>
-          </div>
-       </div>
-       <div id="content">
-       	
-        <p class="text">The service you are trying to use require that you identify yourself. Please select your identity provider below...</p>
-
-		<logic:present name="siteLists" scope="request">
-		  <div id="sites">
-			<ul>
+       <div id="container">
+	       <div id="left">
+	          <div id="nav">
+	             <ul class="site_tree">
+	                <li class="level1"><strong class="level1">About</strong>
+	                   <ul>
+	                      <li class="level2"><a class="level2" href="http://www.nordu.net">NORDUnet Home</a></li>
+	                      <li class="level2"><a class="level2" href="http://www.nordu.net#aup">Acceptable Use Policy</a></li>
+	                      <li class="level2"><a class="level2" href="http://www.nordu.net#pii">Privacy Policy</a></li>
+	                   </ul>
+	                </li>
+	                <li class="level1"><strong class="level1">Tools</strong>
+	                   <ul>
+	                      <li class="level2"><a class="level2" href="https://crowd.nordu.net/sso/pwman">Change Your Password</a></li>
+	                   </ul>
+	                </li>
+	             </ul>
+	             <div id="nav_pic"><img src="http://www.nordu.net/resources/pipes.jpg" width="200px" height="395" alt="" /></div>
+	          </div>
+	       </div>
+	       <div id="right">
+	       	
+	        <p class="text">The service you are trying to use require that you identify yourself. Please select your identity provider below...</p>
+	
+			<logic:present name="siteLists" scope="request">
+			  <div id="sites">
+				<ul>
+					<logic:present name="cookieList" scope="request">
+						<li><a href="#recently-visited">Recently Visited</a></li>
+					</logic:present>
+					<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:present name="cookieList" scope="request">
-					<li><a href="#recently-visited">Recently Visited</a></li>
+					<div id="recently-visited">
+					<ul class="sitelist">
+				        <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>
+				        </logic:iterate>
+				       </ul>
+				        <form method="get" action="ClearCache.wayf" >
+				          <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 tabindex="20" type="submit" value="Clear List" />
+				          </div>
+				        </form>
+					</div>
 				</logic:present>
 				<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:present name="cookieList" scope="request">
-				<div id="recently-visited">
-				<ul class="sitelist">
-			        <logic:iterate id="site" name="cookieList">
-			            <li>
-			              <logic:present name="entityID" scope="request">
-			
+					<div id="<jsp:getProperty name="siteset" property="name"/>">
+	                   <ul class="sitelist">
+	                   <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 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" />">
+			                 <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>
@@ -216,66 +264,20 @@ $(function() {
 			                <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" />">
+			                <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>
-			        <form method="get" action="ClearCache.wayf" >
-			          <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 tabindex="20" type="submit" value="Clear List" />
-			          </div>
-			        </form>
-				</div>
+			             </logic:notPresent>
+			             </li>
+	                   </logic:iterate>
+	                  </ul>
+					</div>
+				</logic:iterate>
+			  </div>
 			</logic:present>
-			<logic:iterate id="siteset" name="siteLists">
-				<div id="<jsp:getProperty name="siteset" property="name"/>">
-                   <ul class="sitelist">
-                   <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>
-				</div>
-			</logic:iterate>
-		  </div>
-		</logic:present>
-      </div>
+	      </div>
+	  </div>
       <div id="footer">
         <p>NORDUnet A/S | Kastruplundgade 22 | DK-2770 Kastrup | DENMARK | Phone +45 32 46 25 00 | Fax +45 45 76 23 66 | info@nordu.net</p>
       </div>
-- 
cgit v1.1