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.26 -r1.27
--- lams_tool_chat/web/pages/monitoring/summary.jsp	27 Mar 2014 01:42:35 -0000	1.26
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	30 Mar 2014 15:20:45 -0000	1.27
@@ -24,100 +24,13 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<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">
+<c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<table class="alternative-color">
+<h1><c:out value="${monitoringDTO.title}" escapeXml="true"/></h1>
 
-	<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="daterestriction.jsp"%>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 	<table cellspacing="0">
 		<c:if test="${isGroupedActivity}">
@@ -176,17 +89,12 @@
 				</c:choose>
 			</td>
 		</tr>
-
+		</table>
 		<c:if test="${dto.reflectOnActivity}">
-			<tr>
-				<td colspan="3">
-					<h4>
+					<h3>
 						Reflections
-					</h4>
-				</td>
-			</tr>
-
-			<tr>
+					</h3>
+			<table class="alternative-color">
 				<th>
 					<fmt:message>heading.learner</fmt:message>
 				</th>
@@ -231,10 +139,11 @@
 					</c:if>
 				</tr>
 			</c:forEach>
+           	</table>
 		</c:if>
-		<tr>
-			<td colspan="3">
-				<div>
+		<table>
+		  <tr>
+		    <td>
 					<html:form action="/monitoring" method="get" target="_blank">
 						<div>
 							<html:hidden property="dispatch" value="openChatHistory" />
@@ -245,6 +154,8 @@
 							</html:submit>
 						</div>
 					</html:form>
+		     </td>
+		     <td>
 
 					<html:form action="/learning" method="get" target="_blank">
 						<div>
@@ -256,9 +167,103 @@
 							</html:submit>
 						</div>
 					</html:form>
-				</div>
-			</td>
-		</tr>
-	</table>
-	<hr>
+		     </td>
+		  </tr>
+		</table>
+	<hr width="100%">
 </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="daterestriction.jsp"%>