Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	17 Sep 2006 06:29:16 -0000	1.30
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	26 Sep 2006 02:26:47 -0000	1.31
@@ -20,26 +20,21 @@
 --%>
 
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 		<c:if test="${(voteGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
+			<c:if test="${notebookEntriesExist != 'true' }"> 			
 				<table align="center">
 					<tr> 
 						<td NOWRAP valign=top align=center> 
 							<b>  <bean:message key="error.noLearnerActivity"/> </b>
 						</td> 
 					<tr>
 				</table>
+			</c:if>							
 		</c:if>			
 
 
@@ -50,50 +45,13 @@
 
 			<c:if test="${voteGeneralMonitoringDTO.currentMonitoredToolSession == 'All'}"> 							
 					<jsp:include page="/monitoring/AllSessionsSummary.jsp" />								
+					
+				<jsp:include page="/monitoring/Reflections.jsp" />										
 			</c:if> 	    	  
 		</c:if>								
 		
-			<table class="forms">
-					<tr>			
-							<td valign=top align=left>
-								<table align=center>
-								
-										<tr>			
-											<td colspan=2 valign=top align=left>
-												<b>  <bean:message key="label.reflection"/> <bean:message key="label.include.runOffline"/> </b> 
-											 </td>
-										</tr>	
-								
-								
-									<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-							  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-							  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-							  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-							  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
-										<tr>			
-											<td valign=top align=left>
-												 <c:out value="${userName}" escapeXml="false"/> 
-											 </td>
-
-											<td valign=top align=left>
-												<c:url value="/monitoring.do" var="openNotebook">
-													<c:param name="method" value="openNotebook" />
-													<c:param name="uid" value="${reflectionUid}" />
-													<c:param name="userId" value="${userId}" />
-													<c:param name="userName" value="${userName}" />
-													<c:param name="sessionId" value="${sessionId}" />													
-												</c:url>
-				
-												<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
-													<bean:message key="label.view" />
-												</html:link>
-
-											 </td>
-										</tr>	
-									</c:forEach>		
-								</table>  	
-							 </td>
-						</tr>	
-				</table>		  	 								
+			<c:if test="${noSessionsNotebookEntriesExist == 'true'}"> 							
+						<jsp:include page="/monitoring/Reflections.jsp" />
+			</c:if>						
 		
-
+