Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	19 May 2006 11:36:02 -0000	1.19
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	19 May 2006 19:28:05 -0000	1.20
@@ -60,182 +60,8 @@
 				</table>
 			</c:if> 	    
 
-			<c:if test="${currentMonitoredToolSession != 'All'}"> 							
+			<jsp:include page="/monitoring/SummaryStatsCommon.jsp" />
 
-				<table align="left">
-						<tr> 
-					 		<td NOWRAP> </td>
-							<td NOWRAP align=right>
-								<jsp:include page="/monitoring/PullDownMenu.jsp" />					
-							</td> 
-						</tr>
-
-						<tr>
-					 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
-						</tr>
-
-	  					<tr>
-					 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.students"/> </b> </td>
-					 		<td> <font size=2> <c:out value="${VoteMonitoringForm.sessionUserCount}"/> </font></td>
-						</tr>
-
-	  					<tr>
-					 		<td NOWRAP> <b> <font size=2> <bean:message key="label.total.completed.students"/> </b> </td> 
-					 		<td> <font size=2> <c:out value="${VoteMonitoringForm.completedSessionUserCount}"/> </font></td>
-						</tr>
-
-						<tr>
-					 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
-						</tr>
-	  				
-						<tr>
-					 		<td NOWRAP colspan=2> 
-		                            <c:out value="${activityInstructions}" escapeXml="false"/> &nbsp
-							</td>
-						</tr>
-						
-
-						<tr>
-					 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
-						</tr>
-						
-						<tr>
-							<td NOWRAP valign=top align=left>
-							<table align=center>
-								<tr> 
-									<td> </td>
-									<td NOWRAP valign=top align=left >
-										<c:set var="viewURL">
-											<html:rewrite page="/chartGenerator?type=pie"/>
-										</c:set>
-										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-											 <font size=2>	<bean:message key="label.view.piechart"/>  </font>
-										</a>
-									</td>
-								</tr>
-								<tr> 
-									<td> </td>
-									<td NOWRAP valign=top align=left >
-										<c:set var="viewURL">
-											<html:rewrite page="/chartGenerator?type=bar"/>
-										</c:set>
-										<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-											 <font size=2>	<bean:message key="label.view.barchart"/>  </font>
-										</a>
-									</td>
-								</tr>
-
-							
-									<tr>
-								 		<td NOWRAP> <b> <font size=2> <bean:message key="label.nomination"/> </b> </td>
-										<td NOWRAP> <b> <font size=2> <bean:message key="label.total.votes"/> </b> </td>
-									</tr>
-									
-									<c:forEach var="currentNomination" items="${mapStandardNominationsContent}">
-							  	 		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}"/>
-							  	 		 <tr>
-				  	 						<td NOWRAP valign=top align=left>
-												<c:out value="${currentNomination.value}" escapeXml="false"/>
-											 </td>
-			
-											<td NOWRAP valign=top align=left>				  	 		
-									  	 		<c:forEach var="currentUserCount" items="${mapStandardUserCount}">
-										  	 		<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}"/>
-									  				<c:if test="${currentNominationKey == currentUserKey}"> 				
-																<font size=2> <c:out value="${currentUserCount.value}"/>  </font>
-													</c:if> 	    
-												</c:forEach>		  
-			
-									  	 		<c:forEach var="currentRate" items="${mapStandardRatesContent}">
-										  	 		<c:set var="currentRateKey" scope="request" value="${currentRate.key}"/>
-									  				<c:if test="${currentNominationKey == currentRateKey}"> 				
-																<font size=2> &nbsp(<c:out value="${currentRate.value}"/> <bean:message key="label.percent"/>) </font>
-													</c:if> 	    
-												</c:forEach>		  
-											</td>								
-										</tr>	
-									</c:forEach>	
-							</table>
-							</td>
-						</tr>
-
-
-							<tr>
-						 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
-							</tr>
-						
-							<tr>
-						 		<td NOWRAP colspan=2 > <HR> </td>
-							</tr>
-
-							<tr>
-						 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
-							</tr>
-	
-							<tr>
-						 		<td NOWRAP colspan=2>
-					 			<table align=left>
-					 					<tr>
-									 		<td NOWRAP align=center> 
-												<b> <font size=2> <bean:message key="label.openVotes"/> </b>
-											</td>
-										</tr>
-					 			
-									<c:forEach var="currentDto" items="${sessionScope.listUserEntries}">
-
-										<tr> 
-											<td NOWRAP valign=top>
-												<table align=center>
-													<tr> 
-														 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
-														 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.visible"/> </font> </b></td>								  						 
-										  			</tr>				 
-				
-						  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
-											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
-	  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
-														<tr> 
-																<td NOWRAP valign=top align=left> 
-																	<c:out value="${currentDto.question}" escapeXml="false"/> 
-																	<c:if test="${userData.visible != 'true' }"> 			
-												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
-																	</c:if> 								
-																</td>
-																 
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-																 
-																 <td NOWRAP valign=top align=left>
-											 						<c:if test="${userData.visible == 'true' }"> 			
-												                                <html:submit property="hideOpenVote" 
-												                                             styleClass="linkbutton" 
-										                                                     onclick="submitOpenVote(${currentUid}, 'hideOpenVote');">						                                             
-												                                    <bean:message key="label.hide"/>
-												                                </html:submit>
-																	</c:if> 													
-						
-																	<c:if test="${userData.visible != 'true' }"> 			
-												                                <html:submit property="showOpenVote" 
-												                                             styleClass="linkbutton" 
-										                                                     onclick="submitOpenVote(${currentUid}, 'showOpenVote');">						                                             
-												                                    <bean:message key="label.show"/>
-												                                </html:submit>
-																	</c:if> 						
-																</td>																			
-																 
-														</tr>		
-													</c:forEach>		  	
-												</table>
-											</td>  
-							  			</tr>
-									</c:forEach>		
-								</table> 
-								</td>
-							</tr>
-				</table>
-			</c:if> 	    	  
 		</c:if>