Fisheye: Tag 1.28.2.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_en_AU.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_ko_KR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_mi_NZ.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_no_NO.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_pt_BR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6.14.1 refers to a dead (removed) revision in file `lams_tool_chat/conf/language/ApplicationResources_sv_SE.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_chat/web/pages/monitoring/advanceOptions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.29 -r1.29.2.1
--- lams_tool_chat/web/pages/monitoring/summary.jsp	8 Apr 2014 00:16:23 -0000	1.29
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	12 Dec 2014 14:36:38 -0000	1.29.2.1
@@ -2,6 +2,7 @@
 <c:set var="lams">
         <lams:LAMSURL />
 </c:set>
+<c:set var="dto" value="${requestScope.monitoringDTO}" />
 
 <link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
@@ -24,22 +25,19 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
-
 <h1>
 	<c:out value="${monitoringDTO.title}" escapeXml="true"/>
 </h1>
 
-<div class="space-top instructions">
+<div class="space-top small-space-bottom instructions">
 	<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
 </div>
 
-<br/>&nbsp;<br/>
 <c:forEach var="session" items="${dto.sessionDTOs}">
 	<table cellspacing="0">
 		<c:if test="${isGroupedActivity}">
 			<tr>
-				<td colspan="3">
+				<td colspan="2">
 					<h2>
 						${session.sessionName}
 					</h2>
@@ -51,7 +49,7 @@
 			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalLearners</fmt:message>
 			</td>
-			<td colspan="2">
+			<td>
 				${session.numberOfLearners}
 			</td>
 		</tr>
@@ -60,21 +58,21 @@
 			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalMessages</fmt:message>
 			</td>
-			<td colspan="2">
+			<td>
 				${session.numberOfPosts}
 			</td>
 		</tr>
 
 		<tr>
-			<td colspan="3">
+			<td colspan="2">
 				<h4>
 					<fmt:message>heading.recentMessages</fmt:message>
 				</h4>
 			</td>
 		</tr>
 
 		<tr>
-			<td colspan="3">
+			<td colspan="2">
 				<c:choose>
 					<c:when test="${empty session.messageDTOs}">
 						<fmt:message>message.noChatMessages</fmt:message>
@@ -93,45 +91,46 @@
 				</c:choose>
 			</td>
 		</tr>
-		</table>
-			<html:form action="/monitoring" method="get" target="_blank" style="display:inline;">
-				<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>
-			</html:form>
-			<html:form action="/learning" method="get" target="_blank" style="display:inline;">
-				<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>
-			</html:form>
-		<c:if test="${dto.reflectOnActivity}">
-					<h3>
-						Reflections
-					</h3>
-			<table class="alternative-color">
-				<th>
-					<fmt:message>heading.learner</fmt:message>
-				</th>
-				<th align="center">
-					<fmt:message>heading.numPosts</fmt:message>
-				</th>
+	</table>
+	
+	<html:form action="/monitoring" method="get" target="_blank" style="display:inline; padding-left: 30px;">
+		<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>
+	</html:form>
+	<html:form action="/learning" method="get" target="_blank" style="display:inline;">
+		<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>
+	</html:form>
+			
+	<c:if test="${dto.reflectOnActivity}">
+		<h3>
+			<fmt:message>label.reflections</fmt:message>
+		</h3>
+			
+		<table class="alternative-color">
+			<th>
+				<fmt:message>heading.learner</fmt:message>
+			</th>
+			<th align="center">
+				<fmt:message>heading.numPosts</fmt:message>
+			</th>
 
-				<th align="center">
-					<c:choose>
-						<c:when test="${dto.reflectOnActivity}">
-							<fmt:message key="heading.reflection" />
-						</c:when>
-						<c:otherwise>
+			<th align="center">
+				<c:choose>
+					<c:when test="${dto.reflectOnActivity}">
+						<fmt:message key="heading.reflection" />
+					</c:when>
+					<c:otherwise>
 						&nbsp;
 					</c:otherwise>
-					</c:choose>
-				</th>
-			</tr>
+				</c:choose>
+			</th>
 
 			<c:forEach var="user" items="${session.userDTOs}">
 				<tr>
@@ -142,118 +141,28 @@
 						${user.postCount}
 					</td>
 					<c:if test="${dto.reflectOnActivity}">
-						<<td align="center">
+						<td align="center">
 							<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="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
+								<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
 									<fmt:message key="link.view" />
 								</html:link>
 							</c:if>
 						</td>
 					</c:if>
 				</tr>
 			</c:forEach>
-           	</table>
-		</c:if>
-	<hr width="100%"/>
+        </table>
+	</c:if>
+	
+	<c:if test="${fn:length(dto.sessionDTOs) > 1}">
+		<hr width="100%"/>
+	</c:if>
 </c:forEach>
 
-
-
-<h1 style="padding-bottom: 10px;">
-	<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="${monitoringDTO.lockOnFinish == true}">
-					<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="${monitoringDTO.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="${monitoringDTO.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					<lams:out value="${monitoringDTO.reflectInstructions}" escapeHtml="true"/>
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-	
-	<tr>
-		<td>
-			<fmt:message key="advanced.filteringEnabled" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${monitoringDTO.filteringEnabled == 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="${monitoringDTO.filteringEnabled == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.filteredWords" />
-				</td>
-				<td>
-					<lams:out value="${monitoringDTO.filteredKeyWords}" escapeHtml="true"/>
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>
-
+<%@include file="advanceOptions.jsp"%>
 <%@include file="daterestriction.jsp"%>