[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/views/logout.vm idp-war/src/main/webapp/WEB-IN...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  8 23:18:23 2014
New Revision: 6513

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6513&view=rev
Log:
IDP-224 - Sync up JSP version of logout page

Modified:
    trunk/idp-conf/src/main/resources/views/logout.vm
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp

Modified: trunk/idp-conf/src/main/resources/views/logout.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/logout.vm?rev=6513&r1=6512&r2=6513&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/logout.vm (original)
+++ trunk/idp-conf/src/main/resources/views/logout.vm Mon Sep  8 23:18:23 2014
@@ -18,7 +18,7 @@
         <title>Example Logout Page</title>
         <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css"/>
         <style type="text/css">
-        iframe#buffer { position:absolute; visibility:hidden; left:0; top:0; } */
+        iframe#buffer { position:absolute; visibility:hidden; left:0; top:0; }
         </style>
   	</head>
 
@@ -38,25 +38,25 @@
             <p><strong>It does NOT result in the user being logged out of any of the applications he/she
             has accessed during a session, with the possible exception of a Service Provider that may have
             initiated the logout operation.</strong></p>
-        
-		    #if ( $logoutContext and !$logoutContext.getSessionMap().isEmpty() )
+
+            #if ( $logoutContext and !$logoutContext.getSessionMap().isEmpty() )
                 <p>The following is a list of services tracked by the session that has been terminated:</p>
                 <br/>
-				<ul>
-				#foreach ( $sp in $logoutContext.getSessionMap().keySet() )
-				    #set ( $rpCtx = $multiRPContext.getRelyingPartyContextById($sp) )
-				    #if ( $rpCtx )
-				      #set ( $rpUIContext = $rpCtx.getSubcontext('net.shibboleth.idp.ui.context.RelyingPartyUIContext') )
-				    #end
-					#if ( $rpUIContext and $rpUIContext.getServiceName() )
-					  <li>$encoder.encodeForHTML($rpUIContext.getServiceName())</li>
-					#else
-					  <li>$encoder.encodeForHTML($sp)</li>
-					#end
-				#end
-				</ul>	
-			#end
-            
+                <ul>
+                #foreach ( $sp in $logoutContext.getSessionMap().keySet() )
+                    #set ( $rpCtx = $multiRPContext.getRelyingPartyContextById($sp) )
+                    #if ( $rpCtx )
+                      #set ( $rpUIContext = $rpCtx.getSubcontext('net.shibboleth.idp.ui.context.RelyingPartyUIContext') )
+                    #end
+                    #if ( $rpUIContext and $rpUIContext.getServiceName() )
+                      <li>$encoder.encodeForHTML($rpUIContext.getServiceName())</li>
+                    #else
+                      <li>$encoder.encodeForHTML($sp)</li>
+                    #end
+                #end
+                </ul>	
+            #end
+
           </div>
           <div class="column two">
             <ul class="list list-help">

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp?rev=6513&r1=6512&r2=6513&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp Mon Sep  8 23:18:23 2014
@@ -2,10 +2,11 @@
 
 <%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
 <%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
-<%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
+<%@ page import="net.shibboleth.idp.profile.context.MultiRelyingPartyContext" %>
 <%@ page import="net.shibboleth.idp.session.SPSession" %>
 <%@ page import="net.shibboleth.idp.session.context.LogoutContext" %>
 <%@ page import="net.shibboleth.idp.ui.context.RelyingPartyUIContext" %>
+<%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
 <%@ page import="org.springframework.webflow.execution.RequestContext" %>
 
 <html>
@@ -13,6 +14,9 @@
     <meta charset="utf-8" />
     <title>Example Logout Page</title>
     <link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/css/main.css"/>
+    <style type="text/css">
+    iframe#buffer { position:absolute; visibility:hidden; left:0; top:0; }
+    </style>
   </head>
   <body>
     <div class="wrapper">
@@ -36,14 +40,24 @@
 		    final LogoutContext logoutCtx = (LogoutContext) request.getAttribute("logoutContext");
 		    if (logoutCtx != null && !logoutCtx.getSessionMap().isEmpty()) {
 		    %>
-            <p>The following is a list of Service Provider identifiers tracked by the session that has been terminated:</p>
-		
+	            <p>The following is a list of services tracked by the session that has been terminated:</p>
+			    <br/>
 				<ul>
-				<% for (final String sp : logoutCtx.getSessionMap().keySet()) { %>

[... 34 lines stripped ...]