Index: lams_tool_chat/web/pages/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/Attic/instructions.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_chat/web/pages/monitoring/instructions.jsp	10 Aug 2006 01:18:26 -0000	1.4
+++ lams_tool_chat/web/pages/monitoring/instructions.jsp	10 Aug 2006 02:20:24 -0000	1.5
@@ -12,41 +12,49 @@
 			</td>
 		</tr>
 
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<div id="onlinefile">
-					<c:if test="${not empty dto.onlineInstructionsFiles}">
+		<c:if test="${not empty dto.onlineInstructionsFiles}">
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+				
+				<td>
+					<div id="onlinefile">
 						<ul>
 							<c:forEach var="file" items="${dto.onlineInstructionsFiles}">
 								<li>
 									<c:out value="${file.fileName}" />
 
 									<c:set var="viewURL">
-										<html:rewrite page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
 									</c:set>
-									<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+									<a
+										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
 									<c:set var="downloadURL">
-										<html:rewrite page="/download/?uuid=${file.fileUuid}&amp;versionID=${file.fileVersionId}&amp;preferDownload=true" />
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;versionID=${file.fileVersionId}&amp;preferDownload=true" />
 									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
 									<c:set var="deleteonline">
-										<html:rewrite page="/authoring/deleteOnline.do?toolContentID=${dto.toolContentId}&amp;uuID=${file.fileUuid}&amp;versionID=${file.fileVersionId}" />
+										<html:rewrite
+											page="/authoring/deleteOnline.do?toolContentID=${dto.toolContentId}&amp;uuID=${file.fileUuid}&amp;versionID=${file.fileVersionId}" />
 									</c:set>
-									<html:link href="javascript:loadDoc('${deleteonline}','onlinefile')">
+									<html:link
+										href="javascript:loadDoc('${deleteonline}','onlinefile')">
 										<fmt:message key="link.delete" />
 									</html:link>
 								</li>
 							</c:forEach>
 						</ul>
-					</c:if>
-				</div>
-			</td>
-		</tr>
+					</div>
+				</td>
+			</tr>
+		</c:if>
 	</tbody>
 </table>
 
@@ -62,41 +70,48 @@
 				<c:out value="${dto.offlineInstructions}" escapeXml="false" />
 			</td>
 		</tr>
-
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<div id="offlinefile">
-					<c:if test="${not empty dto.offlineInstructionsFiles}">
+		<c:if test="${not empty dto.offlineInstructionsFiles}">
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+				
+				<td>
+					<div id="offlinefile">
 						<ul>
 							<c:forEach var="file" items="${dto.offlineInstructionsFiles}">
 								<li>
 									<c:out value="${file.fileName}" />
 
 									<c:set var="viewURL">
-										<html:rewrite page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
 									</c:set>
-									<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
+									<a
+										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+										<fmt:message key="link.view" /> </a> &nbsp;
 
 									<c:set var="downloadURL">
-										<html:rewrite page="/download/?uuid=${file.fileUuid}&amp;versionID=${file.fileVersionId}&amp;preferDownload=true" />
+										<html:rewrite
+											page="/download/?uuid=${file.fileUuid}&amp;versionID=${file.fileVersionId}&amp;preferDownload=true" />
 									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
+									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+										<fmt:message key="link.download" /> </a> &nbsp;
 
 									<c:set var="deleteoffline">
-										<html:rewrite page="/authoring/deleteOffline.do?toolContentID=${dto.toolContentId}&amp;uuID=${file.fileUuid}&amp;versionID=${file.fileVersionId}" />
+										<html:rewrite
+											page="/authoring/deleteOffline.do?toolContentID=${dto.toolContentId}&amp;uuID=${file.fileUuid}&amp;versionID=${file.fileVersionId}" />
 									</c:set>
-									<html:link href="javascript:loadDoc('${deleteoffline}','offlinefile')">
+									<html:link
+										href="javascript:loadDoc('${deleteoffline}','offlinefile')">
 										<fmt:message key="link.delete" />
 									</html:link>
 								</li>
 							</c:forEach>
 						</ul>
-					</c:if>
-				</div>
-			</td>
-		</tr>
+					</div>
+				</td>
+			</tr>
+		</c:if>
 	</tbody>
 </table>
Index: lams_tool_chat/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/statistics.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/web/pages/monitoring/statistics.jsp	10 Aug 2006 01:18:26 -0000	1.6
+++ lams_tool_chat/web/pages/monitoring/statistics.jsp	10 Aug 2006 02:20:24 -0000	1.7
@@ -5,9 +5,9 @@
 	<table cellspacing="0">
 		<tbody>
 			<tr>
-				<th colspan="2">
-					${session.sessionName}
-				</th>
+				<td colspan="2">
+					<h2>${session.sessionName}</h2>
+				</td>
 			</tr>
 
 			<tr>
@@ -35,11 +35,6 @@
 				<th>
 					<fmt:message>heading.numPosts</fmt:message>
 				</th>
-				<c:if test="${dto.reflectOnActivity}">
-					<th>
-						<fmt:message>heading.reflection</fmt:message>
-					</th>
-				</c:if>
 			</tr>
 
 			<c:forEach var="user" items="${session.userDTOs}">
@@ -50,22 +45,9 @@
 					<td>
 						${user.postCount}
 					</td>
-					<c:if test="${dto.reflectOnActivity}">
-						<td>
-							<c:if test="${user.finishedReflection}">
-								<c:url value="monitoring.do" var="openNotebook">
-									<c:param name="dispatch" value="openNotebook" />
-									<c:param name="uid" value="${user.uid}" />
-								</c:url>
-								
-								<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
-									<fmt:message key="link.view" />
-								</html:link>
-							</c:if>
-						</td>
-					</c:if>
 				</tr>
 			</c:forEach>
 		</tbody>
 	</table>
+	<hr/>
 </c:forEach>
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/monitoring/summary.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_chat/web/pages/monitoring/summary.jsp	10 Aug 2006 01:18:26 -0000	1.8
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	10 Aug 2006 02:20:24 -0000	1.9
@@ -4,16 +4,18 @@
 <c:forEach var="session" items="${dto.sessionDTOs}">
 	<table cellspacing="0">
 		<tr>
-			<th colspan="2">
-				${session.sessionName}
-			</th>
+			<td colspan="3">
+				<h2>
+					${session.sessionName}
+				</h2>
+			</td>
 		</tr>
 
 		<tr>
 			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalLearners</fmt:message>
 			</td>
-			<td>
+			<td colspan="2">
 				${session.numberOfLearners}
 			</td>
 		</tr>
@@ -22,66 +24,119 @@
 			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalMessages</fmt:message>
 			</td>
-			<td>
+			<td colspan="2">
 				${session.numberOfPosts}
 			</td>
 		</tr>
 
 		<tr>
-			<td class="field-name" style="width: 30%;">
-				<fmt:message>heading.recentMessages</fmt:message>
+			<td colspan="3">
+				<h4>
+					<fmt:message>heading.recentMessages</fmt:message>
+				</h4>
 			</td>
-			<td>
-				&nbsp;
-			</td>
 		</tr>
+
 		<tr>
-			<td colspan="2">
-				<div style="background-color: white; padding: 8px;">
+			<td colspan="3">
+				<c:choose>
+					<c:when test="${empty session.messageDTOs}">
+						<fmt:message>message.noChatMessages</fmt:message>
+					</c:when>
+					<c:otherwise>
+						<c:forEach var="message" items="${session.messageDTOs}">
+							<span style="font-weight: bold"> ${message.from}</span>
+								${message.body}
+								<br />
+						</c:forEach>
+
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+
+		<c:if test="${dto.reflectOnActivity}">
+			<tr>
+				<td colspan="3">
+					<h4>
+						Reflections
+					</h4>
+				</td>
+			</tr>
+
+			<tr>
+				<th>
+					<fmt:message>heading.learner</fmt:message>
+				</th>
+				<th>
+					<fmt:message>heading.numPosts</fmt:message>
+				</th>
+
+				<th>
 					<c:choose>
-						<c:when test="${empty session.messageDTOs}">
-							<fmt:message>message.noChatMessages</fmt:message>
+						<c:when test="${dto.reflectOnActivity}">
+							<fmt:message key="heading.reflection" />
 						</c:when>
 						<c:otherwise>
-
-							<c:forEach var="message" items="${session.messageDTOs}">
-								<div>
-									<span style="font-weight: bold"> ${message.from}</span>
-									${message.body}
-									<br />
-								</div>
-							</c:forEach>
-
-						</c:otherwise>
+						&nbsp;
+					</c:otherwise>
 					</c:choose>
-				</div>
-			</td>
-		</tr>
+				</th>
+			</tr>
 
+			<c:forEach var="user" items="${session.userDTOs}">
+				<tr>
+					<td>
+						${user.jabberNickname}
+					</td>
+					<td>
+						${user.postCount}
+					</td>
+					<c:if test="${dto.reflectOnActivity}">
+						<td>
+							<c:if test="${user.finishedReflection}">
+								<c:url value="monitoring.do" var="openNotebook">
+									<c:param name="dispatch" value="openNotebook" />
+									<c:param name="uid" value="${user.uid}" />
+								</c:url>
+
+								<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
+									<fmt:message key="link.view" />
+								</html:link>
+							</c:if>
+						</td>
+					</c:if>
+				</tr>
+			</c:forEach>
+		</c:if>
 		<tr>
-			<td colspan="2">
-				<html:form action="/monitoring" method="post" target="_blank"
-					style="float:left; margin-right: 4px">
-					<div>
-						<html:hidden property="dispatch" value="openChatHistory" />
-						<html:hidden property="toolSessionID" value="${session.sessionID}" />
-						<html:submit styleClass="button">
-							<fmt:message>summary.editMessages</fmt:message>
-						</html:submit>
-					</div>
-				</html:form>
+			<td colspan="3">
+				<div>
+					<html:form action="/monitoring" method="post" target="_blank"
+						style="float:left; margin-right: 4px">
+						<div>
+							<html:hidden property="dispatch" value="openChatHistory" />
+							<html:hidden property="toolSessionID"
+								value="${session.sessionID}" />
+							<html:submit styleClass="button">
+								<fmt:message>summary.editMessages</fmt:message>
+							</html:submit>
+						</div>
+					</html:form>
 
-				<html:form action="/learning" method="post" target="_blank">
-					<div>
-						<html:hidden property="toolSessionID" value="${session.sessionID}" />
-						<html:hidden property="mode" value="teacher" />
-						<html:submit styleClass="button">
-							<fmt:message>summary.openChat</fmt:message>
-						</html:submit>
-					</div>
-				</html:form>
-
+					<html:form action="/learning" method="post" target="_blank">
+						<div>
+							<html:hidden property="toolSessionID"
+								value="${session.sessionID}" />
+							<html:hidden property="mode" value="teacher" />
+							<html:submit styleClass="button">
+								<fmt:message>summary.openChat</fmt:message>
+							</html:submit>
+						</div>
+					</html:form>
+				</div>
 			</td>
 		</tr>
 	</table>
+	<hr />
 </c:forEach>