Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v
diff -u -r1.5 -r1.6
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	14 Oct 2008 00:51:51 -0000	1.5
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	14 Oct 2008 02:11:08 -0000	1.6
@@ -154,6 +154,13 @@
 
 	// Here we need to clone wikipages and content for tool session versions
 	for (WikiPage childPage : wiki.getWikiPages()) {
+	    
+	    // check that this page does not already have a session
+	    if (childPage.getWikiSession() != null)
+	    {
+		continue;
+	    }
+	    
 	    // Clone the wiki page
 	    WikiPage newChildPage = (WikiPage) childPage.clone();
 	    wikiPageDAO.saveOrUpdate(newChildPage);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	10 Oct 2008 04:34:53 -0000	1.3
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	14 Oct 2008 02:11:08 -0000	1.4
@@ -62,6 +62,7 @@
     public static final String ATTR_MIN_EDITS_REACHED = "minEditsReached";
     public static final String ATTR_FINISHED_ACTIVITY = "finishedActivity";
     public static final String ATTR_CONTENT_EDITAVLE = "contentEditable";
+    public static final String ATTR_MAIN_PAGE_TITLE = "mainPageTitle";
 
     // Parameter names
     public static final String PARAM_PARENT_PAGE = "parentPage";
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java,v
diff -u -r1.4 -r1.5
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	14 Oct 2008 00:54:02 -0000	1.4
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java	14 Oct 2008 02:11:08 -0000	1.5
@@ -74,7 +74,7 @@
 		doLearnerExport(request, response, directoryName, basePath, cookies);
 	    } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) {
 		request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
-		doTeacherExport(request, response, directoryName, cookies);
+		doTeacherExport(request, response, directoryName, basePath, cookies);
 	    }
 	} catch (WikiException e) {
 	    logger.error("Cannot perform export for wiki tool.");
@@ -148,11 +148,14 @@
 	request.getSession()
 		.setAttribute(WikiConstants.ATTR_MAIN_WIKI_PAGE, new WikiPageDTO(wikiSession.getMainPage()));
 
-	writeResponseToFile(basePath + "/pages/export/exportPortfolioLearner.jsp", directoryName, FILENAME, cookies);
+	// Set the mode
+	request.getSession().setAttribute(WikiConstants.ATTR_MODE, ToolAccessMode.LEARNER);
+
+	writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp", directoryName, FILENAME, cookies);
     }
 
     private void doTeacherExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
-	    Cookie[] cookies) throws WikiException {
+	    String basePath, Cookie[] cookies) throws WikiException {
 
 	logger.debug("doExportTeacher: toolContentID:" + toolContentID);
 
@@ -163,21 +166,47 @@
 	    throw new WikiException(error);
 	}
 
+	// Set up the main wiki dto
 	Wiki wiki = wikiService.getWikiByContentId(toolContentID);
-
 	WikiDTO wikiDTO = new WikiDTO(wiki);
+	request.getSession().setAttribute(WikiConstants.ATTR_WIKI_DTO, wikiDTO);
 
-	// add the wikiEntry for each user in each session
+	// Set up the title
+	String wikiTitle = wiki.getMainPage().getTitle();
+	request.getSession().setAttribute(WikiConstants.ATTR_MAIN_PAGE_TITLE, wikiTitle);
+	
+	// Do the main monitoring page
+	writeResponseToFile(basePath + "/pages/export/exportPortfolioTeacher.jsp", directoryName, FILENAME, cookies);
 
-	/*
-	 * for (WikiSessionDTO session : wikiDTO.getSessionDTOs()) { for
-	 * (WikiUserDTO user : session.getUserDTOs()) { NotebookEntry entry =
-	 * wikiService.getEntry(user.getEntryUID()); if (entry != null) {
-	 * NotebookEntryDTO entryDTO = new NotebookEntryDTO(entry);
-	 * user.setEntryDTO(entryDTO); } } }
-	 */
+	// Do the wiki pages for each session
+	for (WikiSession wikiSession : wiki.getWikiSessions()) {
+	    // construct wiki session dto
+	    WikiSessionDTO sessionDTO = new WikiSessionDTO(wikiSession);
+	    request.getSession().setAttribute(WikiConstants.ATTR_SESSION_DTO, sessionDTO);
 
-	request.getSession().setAttribute("wikiDTO", wikiDTO);
+	    // construct wiki pages dto
+	    SortedSet<WikiPageDTO> wikiPageDTOs = new TreeSet<WikiPageDTO>();
+	    for (WikiPage wikiPage : wikiSession.getWikiPages()) {
+		wikiPageDTOs.add(new WikiPageDTO(wikiPage));
+	    }
+	    request.getSession().setAttribute(WikiConstants.ATTR_WIKI_PAGES, wikiPageDTOs);
+
+	    // construct current page dto
+	    request.getSession().setAttribute(WikiConstants.ATTR_CURRENT_WIKI,
+		    new WikiPageDTO(wikiSession.getMainPage()));
+
+	    // construct main page dto
+	    request.getSession().setAttribute(WikiConstants.ATTR_MAIN_WIKI_PAGE,
+		    new WikiPageDTO(wikiSession.getMainPage()));
+
+	    writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp", directoryName, wikiSession
+		    .getSessionId()
+		    + ".html", cookies);
+
+	    // Set the mode
+	    request.getSession().setAttribute(WikiConstants.ATTR_MODE, ToolAccessMode.TEACHER);
+
+	}
     }
 
 }
Index: lams_tool_wiki/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_wiki/web/pages/export/exportPortfolio.jsp	8 Oct 2008 05:33:01 -0000	1.1
+++ lams_tool_wiki/web/pages/export/exportPortfolio.jsp	14 Oct 2008 02:11:08 -0000	1.2
@@ -5,88 +5,132 @@
 
 <html>
 	<lams:head>
-		<title><c:out value="${wikiDTO.title}" escapeXml="false" />
+		<title><c:out value="${mainWikiPage.title}" escapeXml="false" />
 		</title>
 		<lams:css localLinkPath="../" />
+	
+	
+		<script type="text/javascript">
+		<!--
+			var currentPage;
+			
+			function init(mainPage)
+			{
+				mainPage.replace("&quot;", '"');
+				document.getElementById(mainPage).style.display="block";
+				currentPage = mainPage;
+			}
+			
+			function changeWikiPage(javaScriptTitle)
+			{
+				javaScriptTitle.replace("&quot;", '"');
+				document.getElementById(currentPage).style.display="none";
+				document.getElementById(javaScriptTitle).style.display="block";
+				currentPage = javaScriptTitle;
+			}
+	
+		-->
+		</script>
+	
 	</lams:head>
 
-	<body class="stripes">
+	<body class="stripes" onload="javascript:init('${mainWikiPage.javaScriptTitle}');">
 
-			<div id="content">
-
-			<h1>
-				<c:out value="${wikiDTO.title}" escapeXml="false" />
-			</h1>
-
-				<p>
-					<c:out value="${wikiDTO.instructions}" escapeXml="false" />
-				</p>
-
-				<c:if test='${mode == "teacher"}'>
-					<div id="sessionContents">
-						<ul>
-							<c:forEach var="session" items="${wikiDTO.sessionDTOs}">
-								<li>
-									<a href="#sid-${session.sessionID}">${session.sessionName}</a>
-								</li>
-							</c:forEach>
-						</ul>
-					</div>
+		<div id="content">
+			<div id="breadcrumb" style="float: left; width: 30%;">
+				<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+					<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">/${mainWikiPage.title}</a>
 				</c:if>
-
-				<c:forEach var="session" items="${wikiDTO.sessionDTOs}">
-					<div id="sid-${session.sessionID}">
-						<h2>
-							${session.sessionName}
-						</h2>
-						<p>
-							&nbsp;
-						</p>
-						<c:forEach var="user" items="${session.userDTOs}">
-							<table>
-								<tr>
-									<th colspan="2">
-										${user.firstName} ${user.lastName }
-									</th>
-								</tr>
-								<c:if test="${not empty user.entryDTO}">
-									<tr>
-										<td class="field-name" width="20%">
-											<fmt:message key="label.created" />
-										</td>
-										<td>
-											<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
-										</td>
-									</tr>
-									<tr>
-										<td class="field-name" width="20%">
-											<fmt:message key="label.lastModified" />
-										</td>
-										<td>
-											<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
-										</td>
-									</tr>
-	
-									<tr>
-										<td class="field-name">
-											<fmt:message key="label.notebookEntry" />
-										</td>
-										<td>
-											<c:out value="${user.entryDTO.entry}" escapeXml="false"></c:out>
-										</td>
-									</tr>
-								</c:if>
-							</table>
-						</c:forEach>
+				<a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">/${currentWikiPage.title}</a>
+			</div>
+			
+			<br />
+			<br />
+			<hr />
+			<br />
+			
+			
+			<c:forEach var="wikiPage" items="${wikiPages}">
+				
+				<div id='${wikiPage.javaScriptTitle}' style="display:none">
+					<h1>
+						${wikiPage.title}
+					</h1>
+					<i>
+						<fmt:message key="label.wiki.last.edit">
+							<fmt:param>
+								<c:choose>
+									<c:when test="${wikiPage.currentWikiContentDTO.editorDTO == null}">
+										<fmt:message key="label.wiki.history.editor.author"></fmt:message>
+									</c:when>
+									<c:otherwise>
+										${wikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
+									</c:otherwise>
+								</c:choose>
+							</fmt:param>
+							<fmt:param><lams:Date value="${wikiPage.currentWikiContentDTO.editDate}" /></fmt:param>
+						</fmt:message>
+					</i>
+					<br />
+					<br />
+					
+					<div>
+						${wikiPage.currentWikiContentDTO.body}
 					</div>
-				</c:forEach>
+				
+				</div>
+			</c:forEach>	
+			
+			<br />
+			<hr />
+			<br />
+			
+			<div class="field-name">
+			<fmt:message key="label.wiki.pages"></fmt:message>
 			</div>
-			<!--closes content-->
+			<c:forEach var="wikiPage" items="${wikiPages}">
+				<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">
+					${wikiPage.title}
+					<c:if test="${wikiPage.title == mainWikiPage.title}">
+						<fmt:message key="label.wiki.main"></fmt:message>
+					</c:if>
+				</a><br />
+			</c:forEach>
+		
+		
+			<!-- Reflections -->
+			<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity && mode=='teacher'}">
+				
+				<br />
+				<hr />
+				<br />
+				
+				<h4>
+					<fmt:message key="monitor.notebooks"></fmt:message>
+				</h4>
+				<br />
+				<table class="alternative-color">
+					<c:forEach var="user" items="${sessionDTO.userDTOs}">
+						<c:if test="${not empty user.notebookEntry}">
+						<tr>
+							<td>
+								${user.firstName} ${user.lastName}
+							</td>
+							<td> 
+								<lams:out escapeHtml="true" value="${user.notebookEntry}" />
+							</td>
+						</tr>
+						</c:if>
+					</c:forEach>
+				</table>
+			</c:if>
+		
+		</div>
+		<!--closes content-->
 
-			<div id="footer">
-			</div>
-			<!--closes footer-->
-
+		<div id="footer">
+		</div>
+		<!--closes footer-->
 	</body>
 </html>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_wiki/web/pages/export/exportPortfolioLearner.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/pages/export/exportPortfolioTeacher.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/pages/export/exportPortfolioTeacher.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_wiki/web/pages/export/exportPortfolioTeacher.jsp	14 Oct 2008 02:11:08 -0000	1.1
@@ -0,0 +1,241 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<html>
+	<lams:head>
+		<title><c:out value="${mainPageTitle}" escapeXml="false" />
+		</title>
+		<lams:css localLinkPath="../" />
+	
+		<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+		
+		<script type="text/javascript">
+		<!--
+			var viewWindow = null;
+			function openViewWindow(url)
+			{
+				if(viewWindow && viewWindow.open && !viewWindow.closed){
+					viewWindow.close();
+				}
+				viewWindow = window.open(url,'viewWindow','resizable,width=796,height=570,scrollbars');
+				viewWindow.window.focus();
+			}
+	
+		-->
+		</script>
+	
+	</lams:head>
+
+	<body class="stripes">
+
+
+		<div id="content">
+		
+			<h1>
+				${mainPageTitle}
+			</h1>
+			
+			<br />
+
+			<!-- The advanced options pane -->
+			<h1>
+				<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+			
+				<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+					<fmt:message key="monitor.summary.th.advancedSettings" />
+				</a>
+			</h1>
+			<br />
+			
+			<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+				<table class="alternative-color">
+				
+					<tr>
+						<td>
+							<fmt:message key="advanced.lockOnFinished" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.lockOnFinish}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<fmt:message key="advanced.allowLearnerCreatePages" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.allowLearnerCreatePages}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<fmt:message key="advanced.allowLearnerInsertLinks" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.allowLearnerInsertLinks}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<fmt:message key="advanced.allowLearnerAttachImages" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.allowLearnerAttachImages}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<fmt:message key="advanced.allowLearnerAttachImages" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.allowLearnerAttachImages}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<tr>
+						<td>
+							<fmt:message key="monitor.summary.td.addNotebook" />
+						</td>
+						
+						<td>
+							<c:choose>
+								<c:when test="${wikiDTO.reflectOnActivity == true}">
+									<fmt:message key="label.on" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="label.off" />
+								</c:otherwise>
+							</c:choose>	
+						</td>
+					</tr>
+					
+					<c:choose>
+						<c:when test="${wikiDTO.reflectOnActivity == true}">
+							<tr>
+								<td>
+									<fmt:message key="monitor.summary.td.notebookInstructions" />
+								</td>
+								<td>
+									${wikiDTO.reflectInstructions}	
+								</td>
+							</tr>
+						</c:when>
+					</c:choose>
+					
+					<tr>
+						<td>
+							<fmt:message key="advanced.editingLimits.prompt" />
+						</td>
+						
+						<td>
+							<fmt:message key="advanced.editingLimits.minimum" /> 
+							<c:choose>
+								<c:when test="${wikiDTO.minimumEdits == 0}">
+									<fmt:message key="advanced.editingLimits.nominimum" />
+								</c:when>
+								<c:otherwise>
+									${wikiDTO.minimumEdits}
+								</c:otherwise>
+							</c:choose>
+							
+							<br />
+							
+							<fmt:message key="advanced.editingLimits.maximum" /> 
+							<c:choose>
+								<c:when test="${wikiDTO.maximumEdits == 0}">
+									<fmt:message key="advanced.editingLimits.nomaximum" />
+								</c:when>
+								<c:otherwise>
+									${wikiDTO.maximumEdits}
+								</c:otherwise>
+							</c:choose>
+						</td>
+					</tr>
+					
+				</table>
+			</div>	
+			
+			<c:choose>
+				<c:when test="${not empty wikiDTO.sessionDTOs}">
+					<table class="alternative-color">
+						<tr>
+							<th>
+								<fmt:message key="monitor.th.sessions"></fmt:message>
+							</th>	
+							<th>
+								<fmt:message key="monitor.th.numlearners"></fmt:message>
+							</th>
+						</tr>
+						<c:forEach var="session" items="${wikiDTO.sessionDTOs}">
+						<tr>
+							<td>
+								<a href="javascript:openViewWindow('./${session.sessionID}.html')">${session.sessionName}</a>
+							</td>	
+							<td>
+								${session.numberOfLearners}
+							</td>	
+						</tr>
+						</c:forEach>
+					</table>
+			
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="monitor.nosessions"></fmt:message> 
+				</c:otherwise>
+			</c:choose>
+				
+			
+		</div>
+		<!--closes content-->
+
+		<div id="footer">
+		</div>
+		<!--closes footer-->
+	</body>
+</html>
+