Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u -r810a3898f726d0eae005128cde246c8e0d3c0ed3 -rde5a963d4ae1a002658a0f777f0eeeb58f183e72
--- lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 810a3898f726d0eae005128cde246c8e0d3c0ed3)
+++ lams_learning/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision de5a963d4ae1a002658a0f777f0eeeb58f183e72)
@@ -62,6 +62,9 @@
 label.preview.definelater.title=Activity is set to Define Later
 label.preview.definelater.message=The next activity ({0}) is set to define later. Normally a staff member would set the content for the activity before the learner's can access the activity. For the purposes of preview, the default content for the activity will be displayed. 
 
+export.portfolio.window.title=Export Portfolio
+export.portfolio.generating.message=Generating portfolio - please wait.
+export.portfolio.generation.complete.message=Portfolio generated. Your browser should be downloading the file now. When the file is saved please close this window.
 # Export portfolio: error message put in the activity's page if the activity doesn't support export portfolio. The name of the activity goes in {0}
 error.export.portfolio.not.supported=The activity {0} does not support portfolio export.
 # Export portfolio: Message displayed in portfolio if there aren't any activities on which to report.
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
===================================================================
diff -u -r04802eaaf2249d4faf8784f702664d28f46fdebc -rde5a963d4ae1a002658a0f777f0eeeb58f183e72
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision 04802eaaf2249d4faf8784f702664d28f46fdebc)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	(.../MainExportServlet.java)	(revision de5a963d4ae1a002658a0f777f0eeeb58f183e72)
@@ -34,6 +34,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioConstants;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioException;
 import org.lamsfoundation.lams.learning.export.Portfolio;
@@ -64,6 +65,7 @@
  */
 public class MainExportServlet extends HttpServlet {
 	
+    private static Logger log = Logger.getLogger(MainExportServlet.class);
  
 	private static final long serialVersionUID = 7788509831929373666L;
 	private String exportTmpDir;
@@ -127,9 +129,22 @@
 			CSSBundler bundler = new CSSBundler(request, cookies, exportTmpDir);
 			bundler.bundleStylesheet();
 			
-			//zip up the contents of the temp export folder
+			// zip up the contents of the temp export folder 
 			String zipFilename = exportService.zipPortfolio(ExportPortfolioConstants.ZIP_FILENAME, exportTmpDir);
 			
+/*			-- Used for testing timeout  change the export url in exportWaitingPage to  
+			-- String exportUrl = learning_root + "portfolioExport?" + request.getQueryString()+"&sleep=1800000";
+			-- to pause for 30 mins. 
+			Integer sleeptime = WebUtil.checkInteger("sleep", request.getParameter("sleep"), true);
+			if ( sleeptime != null ) {
+				log.debug("Testing timeouts. Sleeping for "+sleeptime/1000+" seconds");
+				try {
+					Thread.sleep(sleeptime);
+				} catch (InterruptedException e) {
+					log.error("Sleep interrupted",e);
+				}
+			}
+*/			
 			//return the relative filelocation of the zip file so that it can be picked up in exportWaitingPage.jsp
 			PrintWriter out = response.getWriter();
 			out.println(returnRelativeExportTmpDir(zipFilename)); 
Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
diff -u -r88e368163f647f4dec71a7ad2b2e4afe60526af5 -rde5a963d4ae1a002658a0f777f0eeeb58f183e72
--- lams_learning/web/exportWaitingPage.jsp	(.../exportWaitingPage.jsp)	(revision 88e368163f647f4dec71a7ad2b2e4afe60526af5)
+++ lams_learning/web/exportWaitingPage.jsp	(.../exportWaitingPage.jsp)	(revision de5a963d4ae1a002658a0f777f0eeeb58f183e72)
@@ -25,6 +25,7 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
 
 <%
@@ -43,8 +44,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <title>Generating Export</title>
+    <title><fmt:message key='export.portfolio.window.title'/></title>
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css/>
     <script type ="text/javascript">
     	var READY_STATE_UNINITIALIZED=0;
 		var READY_STATE_LOADING=1;
@@ -53,7 +55,24 @@
 		var READY_STATE_COMPLETE=4;
 		var req;
 		var updateindicator="";
+		var downloadStarted=new Boolean(false);
 
+		function startTimer() {
+			setTimeout('wakeup()', 10000 );						
+		}
+
+		function wakeup() {
+			if ( downloadStarted != true ) {
+				displayGeneratingMessage();
+				startTimer();
+			}
+		}
+
+		function displayGeneratingMessage() {
+			updateindicator = updateindicator+"... ";
+			document.getElementById("message").innerHTML = "<p><fmt:message key='export.portfolio.generating.message'/>"+updateindicator+"</p>";
+		}
+
 		function sendRequest(url,HttpMethod)
 		{
 		
@@ -72,13 +91,12 @@
 				req.open(HttpMethod,url,true);
 				req.setRequestHeader("Content-Type","application/x-www-form-urlencoded");
 				req.send(null); //sends any parameters along with the request for that url
+				startTimer();
 			}
 		}
 		
 		function exportCallback(){
 			
-			updateindicator = updateindicator+"... ";
-		
 			var ready=req.readyState;
 			var msg;
 		
@@ -88,6 +106,12 @@
 				{
 					case 200: // status 200 OK
 						var url = "<%=downloadServlet%>"+req.responseText;
+
+						downloadStarted = new Boolean(true);
+						msg = "<p><fmt:message key='export.portfolio.generation.complete.message'/></p>\n"
+						document.getElementById("button").style.visibility = "visible";
+						document.getElementById("message").innerHTML = msg;
+						
 						window.location.href = url;
 						break;
 					case 404: //status 404 Not Found
@@ -102,9 +126,7 @@
 				
 				
 			}else{
-				document.getElementById("message").innerHTML = "<p>Loading ...</p>"+updateindicator;
-				
-				
+				displayGeneratingMessage();
 			}
 		
 		}
@@ -122,20 +144,26 @@
   
   <body>
 
-	<h1 class="no-tabs-below">&nbsp;</h1>
-	<div id="header-no-tabs-learner">
+	<div id="page-learner">
+		<h1 class="no-tabs-below"><fmt:message key='export.portfolio.window.title'/></h1>
+		<div id="header-no-tabs-learner">
 
-	</div><!--closes header-->
+		</div><!--closes header-->
 
-	<div id="content-learner">
+		<div id="content-learner">
 
-	    <div id="message"></div>
+			<p>&nbsp;</p>
+			<div id="message"></div>
+			<div id="button" style="visibility:hidden">
+				<p><a href='#' onclick='javascript:window.close()' class='button'><fmt:message key='label.finish.button'/></a></p>
+			</div>
+			
+		</div>  <!--closes content-->
 
-	</div>  <!--closes content-->
 
+		<div id="footer-learner">
+		</div><!--closes footer-->
+	</div>
 
-	<div id="footer-learner">
-	</div><!--closes footer-->
-
   </body>
 </html>