Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
diff -u -rc20b8bc20f56ae4d510bc5c4f2bf101a6ce7261b -r1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c20b8bc20f56ae4d510bc5c4f2bf101a6ce7261b)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf)
@@ -56,8 +56,7 @@
  * @author
  * @version
  * 
- * @struts.action path="/monitoring" parameter="dispatch" scope="request"
- *                name="monitoringForm" validate="false"
+ * @struts.action path="/monitoring" parameter="dispatch" scope="request" name="monitoringForm" validate="false"
  * 
  * @struts.action-forward name="success" path="tiles:/monitoring/main"
  * 
@@ -66,152 +65,147 @@
  */
 public class MonitoringAction extends LamsDispatchAction {
 
-	private static Logger log = Logger.getLogger(MonitoringAction.class);
+    private static Logger log = Logger.getLogger(MonitoringAction.class);
 
-	public IScribeService scribeService;
+    public IScribeService scribeService;
 
-	public ActionForward unspecified(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
-		log.info("excuting monitoring action");
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	log.info("excuting monitoring action");
 
-		Long toolContentID = new Long(WebUtil.readLongParam(request,
-				AttributeNames.PARAM_TOOL_CONTENT_ID));
+	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 
-		String contentFolderID = WebUtil.readStrParam(request,
-				AttributeNames.PARAM_CONTENT_FOLDER_ID);
-		MonitoringForm monForm = (MonitoringForm)form;
-		monForm.setContentFolderID(contentFolderID);
+	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+	MonitoringForm monForm = (MonitoringForm) form;
+	monForm.setContentFolderID(contentFolderID);
 
-		monForm.setCurrentTab(WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
-		
-		// set up scribeService
-		if (scribeService == null) {
-			scribeService = ScribeServiceProxy.getScribeService(this.getServlet()
-					.getServletContext());
-		}
-		Scribe scribe = scribeService.getScribeByContentId(toolContentID);
-			
-		ScribeDTO scribeDTO = setupScribeDTO(scribe);
-		boolean isGroupedActivity = scribeService.isGroupedActivity(toolContentID);
-		request.setAttribute("isGroupedActivity", isGroupedActivity);
-		request.setAttribute("monitoringDTO", scribeDTO);
-		request.setAttribute("contentFolderID", contentFolderID);
-		
-		return mapping.findForward("success");
-	}
-	
-	public ActionForward openNotebook(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-		
-		Long uid = WebUtil.readLongParam(request, "uid", false);
-		
-		ScribeUser scribeUser = scribeService.getUserByUID(uid);
-		NotebookEntry notebookEntry = scribeService.getEntry(scribeUser.getScribeSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId().intValue());
-		
-		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
-		scribeUserDTO.setNotebookEntry(notebookEntry.getEntry());
-		
-		request.setAttribute("scribeUserDTO", scribeUserDTO);
-		
-		return mapping.findForward("notebook");
-	}
+	monForm.setCurrentTab(WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
-	public ActionForward appointScribe(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		
-		MonitoringForm monForm = (MonitoringForm)form;
-		
-		ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID());
-		ScribeUser user = scribeService.getUserByUID(monForm.getAppointedScribeUID());
-		
-		session.setAppointedScribe(user);
-		scribeService.saveOrUpdateScribeSession(session);
-		
-		ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
-		
-		request.setAttribute("monitoringDTO", scribeDTO);
-		request.setAttribute("contentFolderID", monForm.getContentFolderID());
-		
-		return mapping.findForward("success");
+	// set up scribeService
+	if (scribeService == null) {
+	    scribeService = ScribeServiceProxy.getScribeService(this.getServlet().getServletContext());
 	}
-	
-	
-	public ActionForward forceCompleteActivity(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
+	Scribe scribe = scribeService.getScribeByContentId(toolContentID);
 
-		MonitoringForm monForm = (MonitoringForm)form;
+	ScribeDTO scribeDTO = setupScribeDTO(scribe);
+	boolean isGroupedActivity = scribeService.isGroupedActivity(toolContentID);
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
+	request.setAttribute("monitoringDTO", scribeDTO);
+	request.setAttribute("contentFolderID", contentFolderID);
 
-		ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID());
-		session.setForceComplete(true);
-		scribeService.saveOrUpdateScribeSession(session);
+	return mapping.findForward("success");
+    }
 
-		ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
-		request.setAttribute("monitoringDTO", scribeDTO);
-		request.setAttribute("contentFolderID", monForm.getContentFolderID());
-		
-		return mapping.findForward("success");
-	}
-	/* Private Methods */
+    public ActionForward openNotebook(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 
-	private ScribeDTO setupScribeDTO(Scribe scribe) {
-		ScribeDTO scribeDTO = new ScribeDTO(scribe);
+	Long uid = WebUtil.readLongParam(request, "uid", false);
 
-		for (Iterator sessIter = scribe.getScribeSessions().iterator(); sessIter
-				.hasNext();) {
-			ScribeSession session = (ScribeSession) sessIter.next();
+	ScribeUser scribeUser = scribeService.getUserByUID(uid);
+	NotebookEntry notebookEntry = scribeService.getEntry(scribeUser.getScribeSession().getSessionId(),
+		CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId().intValue());
 
-			ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
-			int numberOfVotes = 0;
-			
-			for (Iterator userIter = session.getScribeUsers().iterator(); userIter
-					.hasNext();) {
-				ScribeUser user = (ScribeUser) userIter.next();
-				ScribeUserDTO userDTO = new ScribeUserDTO(user);
-								
-				// get the notebook entry.
-				NotebookEntry notebookEntry = scribeService.getEntry(session.getSessionId(),
-						CoreNotebookConstants.NOTEBOOK_TOOL,
-						ScribeConstants.TOOL_SIGNATURE, user.getUserId()
-								.intValue());
-				if (notebookEntry != null) {
-					userDTO.finishedReflection = true;
-				} else {
-					userDTO.finishedReflection = false;
-				}
-				
-				if (user.isReportApproved()) {
-					numberOfVotes++;
-				}
-				
-				sessionDTO.getUserDTOs().add(userDTO);
-			}
-			int numberOfLearners = session.getScribeUsers().size();
-			
-			sessionDTO.setNumberOfVotes(numberOfVotes);
-			sessionDTO.setNumberOfLearners(numberOfLearners);
-			sessionDTO.setVotePercentage(ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners));
-			scribeDTO.getSessionDTOs().add(sessionDTO);
+	ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
+	scribeUserDTO.setNotebookEntry(notebookEntry.getEntry());
+
+	request.setAttribute("scribeUserDTO", scribeUserDTO);
+
+	return mapping.findForward("notebook");
+    }
+
+    public ActionForward appointScribe(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	MonitoringForm monForm = (MonitoringForm) form;
+
+	ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID());
+	ScribeUser user = scribeService.getUserByUID(monForm.getAppointedScribeUID());
+
+	session.setAppointedScribe(user);
+	scribeService.saveOrUpdateScribeSession(session);
+
+	ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
+	boolean isGroupedActivity = scribeService.isGroupedActivity(session.getScribe().getToolContentId());
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
+	request.setAttribute("monitoringDTO", scribeDTO);
+	request.setAttribute("contentFolderID", monForm.getContentFolderID());
+
+	monForm.setCurrentTab(WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
+
+	return mapping.findForward("success");
+    }
+
+    public ActionForward forceCompleteActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	MonitoringForm monForm = (MonitoringForm) form;
+
+	ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID());
+	session.setForceComplete(true);
+	scribeService.saveOrUpdateScribeSession(session);
+
+	ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
+	request.setAttribute("monitoringDTO", scribeDTO);
+	request.setAttribute("contentFolderID", monForm.getContentFolderID());
+
+	return mapping.findForward("success");
+    }
+
+    /* Private Methods */
+
+    private ScribeDTO setupScribeDTO(Scribe scribe) {
+	ScribeDTO scribeDTO = new ScribeDTO(scribe);
+
+	for (Iterator sessIter = scribe.getScribeSessions().iterator(); sessIter.hasNext();) {
+	    ScribeSession session = (ScribeSession) sessIter.next();
+
+	    ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
+	    int numberOfVotes = 0;
+
+	    for (Iterator userIter = session.getScribeUsers().iterator(); userIter.hasNext();) {
+		ScribeUser user = (ScribeUser) userIter.next();
+		ScribeUserDTO userDTO = new ScribeUserDTO(user);
+
+		// get the notebook entry.
+		NotebookEntry notebookEntry = scribeService.getEntry(session.getSessionId(),
+			CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE, user.getUserId()
+				.intValue());
+		if (notebookEntry != null) {
+		    userDTO.finishedReflection = true;
+		} else {
+		    userDTO.finishedReflection = false;
 		}
-		
-		return scribeDTO;
-		
+
+		if (user.isReportApproved()) {
+		    numberOfVotes++;
+		}
+
+		sessionDTO.getUserDTOs().add(userDTO);
+	    }
+	    int numberOfLearners = session.getScribeUsers().size();
+
+	    sessionDTO.setNumberOfVotes(numberOfVotes);
+	    sessionDTO.setNumberOfLearners(numberOfLearners);
+	    sessionDTO.setVotePercentage(ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners));
+	    scribeDTO.getSessionDTOs().add(sessionDTO);
 	}
-	
-	private ScribeUser getCurrentUser(Long toolSessionID) {
-		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(
-				AttributeNames.USER);
 
-		// attempt to retrieve user using userId and toolSessionID
-		ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(new Long(
-				user.getUserID().intValue()), toolSessionID);
+	return scribeDTO;
 
-		if (scribeUser == null) {
-			ScribeSession scribeSession = scribeService
-					.getSessionBySessionId(toolSessionID);
-			scribeUser = scribeService.createScribeUser(user, scribeSession);
-		}
+    }
 
-		return scribeUser;
+    private ScribeUser getCurrentUser(Long toolSessionID) {
+	UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+
+	// attempt to retrieve user using userId and toolSessionID
+	ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()),
+		toolSessionID);
+
+	if (scribeUser == null) {
+	    ScribeSession scribeSession = scribeService.getSessionBySessionId(toolSessionID);
+	    scribeUser = scribeService.createScribeUser(user, scribeSession);
 	}
+
+	return scribeUser;
+    }
 }
Index: lams_tool_scribe/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -rabc6f25b4f548215dc7d18bf316adbe21fe296a6 -r1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf
--- lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision abc6f25b4f548215dc7d18bf316adbe21fe296a6)
+++ lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf)
@@ -1,8 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-
 <table cellspacing="0" class="alternative-color">
 	<tr>
 		<th class="first">
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9 -r1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2353a5dcfd4b3ad6d21b3f0cda3d7833fc97c6b9)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf)
@@ -1,25 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="dto" value="${requestScope.monitoringDTO}" />
 
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
-<!--
-function confirmForceComplete() {
+	function confirmForceComplete() {
 		var message = "<fmt:message key='message.confirmForceComplete'/>";
 		if (confirm(message)) {
 			return true;			
 		} else {
 			return false;
 		}
 	}
-//-->
 </script>
 
-<c:set var="dto" value="${requestScope.monitoringDTO}" />
+<h1>
+	<c:out value="${monitoringDTO.title}" escapeXml="true"/>
+</h1>
 
-
-<h1><c:out value="${monitoringDTO.title}" escapeXml="true"/></h1>
 <div class="instructions space-top">
-<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
+	<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
 </div>
 
 <br/>
@@ -32,81 +31,74 @@
 	</c:if>
 
 	<c:choose>
-		<c:when
-			test="${(not dto.autoSelectScribe) and  session.appointedScribe eq null}">
-
-			<c:choose>
-				<c:when test="${not empty session.userDTOs}">
-					<html:form action="/monitoring">
-
-						<html:hidden property="toolSessionID" value="${session.sessionID}" />
-						<html:hidden property="dispatch" value="appointScribe" />
-						<html:hidden property="contentFolderID" />
-						<html:hidden property="currentTab" styleId="currentTab" />
-
-						<fmt:message key="heading.selectScribe" />
-
-						<html:select property="appointedScribeUID"
-							style="min-width: 150px;">
-							<c:forEach var="user" items="${session.userDTOs}">
-								<html:option value="${user.uid}">
-												${user.firstName} ${user.lastName}
-											</html:option>
-							</c:forEach>
-						</html:select>
-
-						<html:submit styleClass="button">
-							<fmt:message key="button.submit" />
-						</html:submit>
-
-					</html:form>
-				</c:when>
-
-				<c:otherwise>
-					<p>
-						<fmt:message key="message.noLearners" />
-					</p>
-				</c:otherwise>
-			</c:choose>
+		<c:when test="${not empty session.userDTOs and (not dto.autoSelectScribe or session.appointedScribe != null)}">
+			<html:form action="/monitoring">
+	
+				<html:hidden property="toolSessionID" value="${session.sessionID}" />
+				<html:hidden property="dispatch" value="appointScribe" />
+				<html:hidden property="contentFolderID" />
+				<html:hidden property="currentTab" styleId="currentTab" />
+	
+				<fmt:message key="heading.selectScribe" />
+	
+				<html:select property="appointedScribeUID" style="min-width: 150px;">
+					<c:forEach var="user" items="${session.userDTOs}">
+						<html:option value="${user.uid}">
+							${user.firstName} ${user.lastName}
+						</html:option>
+					</c:forEach>
+				</html:select>
+	
+				<html:submit styleClass="button">
+					<fmt:message key="button.select" />
+				</html:submit>
+	
+			</html:form>
+			<br>
 		</c:when>
-
+	
 		<c:otherwise>
-			<b>
-				<fmt:message key="heading.appointedScribe" />: <c:out value="${session.appointedScribe}" escapeXml="true"/>
-			</b>
+			<p>
+				<fmt:message key="message.noLearners" />
+			</p>
+		</c:otherwise>
+	</c:choose>
 
-			<c:set var="scribeSessionDTO" value="${session}" scope="request">
-			</c:set>
+	<c:if test="${session.appointedScribe != null}">
+		<b>
+			<fmt:message key="heading.appointedScribe" />: <c:out value="${session.appointedScribe}" escapeXml="true"/>
+		</b>
 
-			<div class="field-name">
-				<fmt:message key="heading.report" />
-			</div>
+		<c:set var="scribeSessionDTO" value="${session}" scope="request"/>
+
+		<div class="field-name">
+			<fmt:message key="heading.report" />
+		</div>
+		<hr />
+		<c:forEach var="report" items="${session.reportDTOs}">
+			<p>
+				<c:out value="${report.headingDTO.headingText}" escapeXml="false" />
+			</p>
+			<p>
+				<lams:out value="${report.entryText}" escapeHtml="true"/>
+			</p>
 			<hr />
-			<c:forEach var="report" items="${session.reportDTOs}">
-				<p>
-					<c:out value="${report.headingDTO.headingText}" escapeXml="false" />
-				</p>
-				<p>
-					<lams:out value="${report.entryText}" escapeHtml="true"/>
-				</p>
-				<hr />
-			</c:forEach>
+		</c:forEach>
 
-			<%@include file="/pages/parts/voteDisplay.jsp"%>
+		<%@include file="/pages/parts/voteDisplay.jsp"%>
 
-			<c:if test="${session.forceComplete eq false}">
-				<html:form action="monitoring" onsubmit="return confirmForceComplete();">
-					<html:hidden property="dispatch" value="forceCompleteActivity" />
-					<html:hidden property="toolSessionID" value="${session.sessionID}" />
-					<html:hidden property="contentFolderID" />
-					<html:submit styleClass="button">
-						<fmt:message key="button.forceComplete" />
-					</html:submit>
-				</html:form>
-			</c:if>
+		<c:if test="${session.forceComplete eq false}">
+			<html:form action="monitoring" onsubmit="return confirmForceComplete();">
+				<html:hidden property="dispatch" value="forceCompleteActivity" />
+				<html:hidden property="toolSessionID" value="${session.sessionID}" />
+				<html:hidden property="contentFolderID" />
+				<html:submit styleClass="button">
+					<fmt:message key="button.forceComplete" />
+				</html:submit>
+			</html:form>
+		</c:if>
 
-		</c:otherwise>
-	</c:choose>
+	</c:if>
 
 	<c:if test="${dto.reflectOnActivity}">
 		<div class="field-name">
@@ -167,8 +159,6 @@
 	</p>
 </html:form>
 
-
-
 <h1>
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />