Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.10 -r1.11
--- lams_learning/conf/language/ApplicationResources.properties	23 Jun 2006 07:58:00 -0000	1.10
+++ lams_learning/conf/language/ApplicationResources.properties	30 Jun 2006 03:44:22 -0000	1.11
@@ -66,3 +66,7 @@
 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.
 export.portfolio.noneAttempted.message=No activities have been attempted.
+export.portfolio.for.user.heading=Portfolio For
+export.portfolio.for.class.heading=Class Portfolio
+export.portfolio.lesson.started.date.label=Lesson started:
+export.portfolio.generated.date.label=Portfolio generated:
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java,v
diff -u -r1.7 -r1.8
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java	18 Jun 2006 04:55:52 -0000	1.7
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/Portfolio.java	30 Jun 2006 03:44:21 -0000	1.8
@@ -24,7 +24,10 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.learning.export;
 
+import java.util.Date;
 
+
+
 /**
  * @author mtruong
   */
@@ -35,12 +38,16 @@
     private String lessonName;
     private String lessonDescription;
     private ActivityPortfolio[] activityPortfolios;
+    private String learnerName;
+    private Date lessonStartDate;
+    private Date portfolioCreatedDate;
     
     public Portfolio(String exportID)
     {
         this.exportTmpDir = null;
         this.activityPortfolios = null;
         this.exportID = exportID;
+        this.portfolioCreatedDate = new Date();
     }
 
     /**
@@ -92,4 +99,28 @@
 	public void setExportID(String exportID) {
 		this.exportID = exportID;
 	}
+
+	public String getLearnerName() {
+		return learnerName;
+	}
+
+	public void setLearnerName(String learnerName) {
+		this.learnerName = learnerName;
+	}
+
+	public Date getLessonStartDate() {
+		return lessonStartDate;
+	}
+
+	public void setLessonStartDate(Date lessonStartDate) {
+		this.lessonStartDate = lessonStartDate;
+	}
+
+	public Date getPortfolioCreatedDate() {
+		return portfolioCreatedDate;
+	}
+
+	public void setPortfolioCreatedDate(Date portfolioCreatedDate) {
+		this.portfolioCreatedDate = portfolioCreatedDate;
+	}
 }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java,v
diff -u -r1.20 -r1.21
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	21 Jun 2006 12:03:17 -0000	1.20
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	30 Jun 2006 03:44:22 -0000	1.21
@@ -191,7 +191,7 @@
 		    		
 		    		if ( portfolios.size() >= 0 ) {
 			    		exports = doExport(portfolios, cookies,lesson);	 
-			    		
+			    		exports.setLearnerName(learner.getFirstName()+" "+learner.getLastName()+" ("+learner.getLogin()+")");
 		    		} else {
 				        log.error("The learner has not completed or attempted any activities");
 		    		}
@@ -270,6 +270,7 @@
 		portfolio.setExportTmpDir(tempDirectoryName);
 		portfolio.setLessonName(lesson.getLessonName());
 		portfolio.setLessonDescription(lesson.getLessonDescription());
+		portfolio.setLessonStartDate(lesson.getStartDateTime());
 		
 		processPortfolios(portfolios, cookies, tempDirectoryName);
 		portfolio.setActivityPortfolios((ActivityPortfolio[])portfolios.toArray(new ActivityPortfolio[portfolios.size()]));
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java,v
diff -u -r1.12 -r1.13
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	26 Jun 2006 23:32:35 -0000	1.12
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java	30 Jun 2006 03:44:21 -0000	1.13
@@ -153,6 +153,8 @@
 	
 	private void bundleStylesheetWithExportPackage(String directory, HttpServletRequest request, Cookie[] cookies) throws IOException
 	{
+		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
+
 		List themeList = CSSThemeUtil.getAllUserThemes();
 		
 		Iterator i = themeList.iterator();
@@ -161,10 +163,14 @@
 		{
 			String theme = (String)i.next();
 			
-			String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort();
 			String url = basePath + "/lams/css/" + theme + ".css";
 			HttpUrlConnectionUtil.writeResponseToFile(url, directory, theme + ".css", cookies); //cookies aren't really needed here.
 		}
+		
+		// include the special IE stylesheet
+		String url = basePath + "/lams/css/ie-styles.css";
+		HttpUrlConnectionUtil.writeResponseToFile(url, directory, "ie-styles.css", cookies); //cookies aren't really needed here.
+		
 	}
 
 }
Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v
diff -u -r1.7 -r1.8
--- lams_learning/web/exportWaitingPage.jsp	28 Jun 2006 23:10:03 -0000	1.7
+++ lams_learning/web/exportWaitingPage.jsp	30 Jun 2006 03:44:21 -0000	1.8
@@ -91,18 +91,18 @@
 						window.location.href = url;
 						break;
 					case 404: //status 404 Not Found
-						msg = "<fmt:message key='error.message.404' />";
+						msg = "<fmt:message key='error.message.404' />.";
 						alert(msg);
 						break;
 					case 500: //status 500 Internal Server Error
-						msg = "<fmt:message key='error.system.learner'><fmt:param>Status 500</fmt:param></fmt:message>";
+						msg = "<p><fmt:message key='error.system.learner'><fmt:param>Status 500</fmt:param></fmt:message></p>";
 						document.getElementById("message").innerHTML = msg;
 						break;
 				}
 				
 				
 			}else{
-				document.getElementById("message").innerHTML = "Loading ... "+updateindicator;
+				document.getElementById("message").innerHTML = "<p>Loading ...</p>"+updateindicator;
 				
 				
 			}
Index: lams_learning/web/exportPortfolio/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/main.jsp,v
diff -u -r1.3 -r1.4
--- lams_learning/web/exportPortfolio/main.jsp	28 Jun 2006 23:10:03 -0000	1.3
+++ lams_learning/web/exportPortfolio/main.jsp	30 Jun 2006 03:44:21 -0000	1.4
@@ -34,7 +34,16 @@
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title><c:out value="${portfolio.lessonName}"/></title>
     <fmt:setBundle basename = "org.lamsfoundation.lams.learning.ApplicationResources" />
-	<lams:css/>
+
+	<%--  can't use the normal "lams:css localLink=true" as that points to ../default.css --%>
+	<link href="aqua.css" rel="stylesheet" type="text/css">
+	<link href="default.css" rel="stylesheet" type="text/css">
+	<!--[if IE]>
+	<style type="text/css">
+	@import url(<link href="ie-styles.css" rel="stylesheet" type="text/css">);
+	</style>
+	<![endif]-->
+
 </head>
 
 <body>
@@ -44,28 +53,49 @@
 		</h1>
 		<div id="header-no-tabs"></div>
 		<div id="content">
+		
+		<c:choose>
+			<c:when test="${not empty portfolio.learnerName}">
+				<H2><fmt:message key="export.portfolio.for.user.heading"/> <c:out value="${portfolio.learnerName}"/></H2>
+			</c:when>
+			<c:otherwise>
+				<H2><fmt:message key="export.portfolio.for.class.heading"/> <c:out value="${portfolio.learnerName}"/></H2>
+			</c:otherwise>
+		</c:choose>
+			
+		<p>&nbsp;</p>
+		
+		<c:if test="${not empty portfolio.lessonDescription}">
+			<p><c:out value="${portfolio.lessonDescription}"/></p>
+		</c:if>
 
-		<p><c:out value="${portfolio.lessonDescription}"/></p>
+		<p><fmt:message key="export.portfolio.lesson.started.date.label"/> 
+			<fmt:formatDate value="${portfolio.lessonStartDate}" type="both" timeStyle="long"/></p>
 
+		<p><fmt:message key="export.portfolio.generated.date.label"/> 
+			<fmt:formatDate value="${portfolio.portfolioCreatedDate}" type="both" timeStyle="long"/></p>
+
 		<c:if test="${empty portfolio.activityPortfolios}">
-			<fmt:message key="export.portfolio.noneAttempted.message"/>
+			<p><fmt:message key="export.portfolio.noneAttempted.message"/></p>
 		</c:if>
+	
+		<div align="left" width="90">
+			<c:forEach var="actport" items="${portfolio.activityPortfolios}" varStatus="status">
+				<c:if test="${status.first}">
+					<UL>
+				</c:if>
+	
+				<lams:ExportPortOutput actport="${actport}"/>
+				<c:if test="${status.last}">
+					</UL>
+				</c:if>
+			</c:forEach>
+		</div>
 
-		<c:forEach var="actport" items="${portfolio.activityPortfolios}" varStatus="status">
-			<c:if test="${status.first}">
-				<UL>
-			</c:if>
-
-			<lams:ExportPortOutput actport="${actport}"/>
-			<c:if test="${status.last}">
-				</UL>
-			</c:if>
-		</c:forEach>
-
 		</div>
 		<div id="footer"></div>
 	</div>
 
-<</body>
+</body>
 	
 </html:html>
\ No newline at end of file