Index: lams_tool_scribe/web/pages/learning/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/learning/instructions.jsp	16 Oct 2006 06:09:41 -0000	1.1
+++ lams_tool_scribe/web/pages/learning/instructions.jsp	31 Mar 2014 04:10:11 -0000	1.2
@@ -2,7 +2,7 @@
 
 <div id="content">
 	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="false" />
+		<c:out value="${scribeDTO.title}" escapeXml="true" />
 	</h1>
 
 	<c:if test="${role == 'scribe'}">
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/learning.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_scribe/web/pages/learning/learning.jsp	6 Nov 2006 08:26:49 -0000	1.12
+++ lams_tool_scribe/web/pages/learning/learning.jsp	31 Mar 2014 04:10:12 -0000	1.13
@@ -15,11 +15,11 @@
 <div id="content">
 
 	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="false" />
+		<c:out value="${scribeDTO.title}" escapeXml="true" />
 	</h1>
 
 	<p>
-		${scribeDTO.instructions}
+		<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<%@include file="/pages/parts/voteDisplay.jsp"%>
@@ -36,14 +36,17 @@
 
 			<div class="shading-bg">
 				<p>
-					${reportDTO.headingDTO.headingText}
+					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/> 
 				</p>
 
 				<c:if test="${not empty reportDTO.entryText}">
 					<ul>
 						<li>
 							<p>
-								<lams:out value="${reportDTO.entryText}" />
+								<c:set var="entry">
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
+								</c:set>
+								<c:out value="${entry}" escapeXml="false"/> 
 							</p>
 						</li>
 					</ul>
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/notebook.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_scribe/web/pages/learning/notebook.jsp	9 Apr 2013 12:45:43 -0000	1.10
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	31 Mar 2014 04:10:12 -0000	1.11
@@ -13,15 +13,15 @@
 <div id="content">
 
 	<h1>
-		${scribeDTO.title}
+		<c:out value="${scribeDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="dispatch" value="submitReflection" />
 		<html:hidden property="scribeUserUID" />
 
 		<p>
-			${scribeDTO.reflectInstructions}
+			<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/>
 		</p>
 
 		<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/scribe.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_scribe/web/pages/learning/scribe.jsp	29 Apr 2008 04:57:27 -0000	1.12
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	31 Mar 2014 04:10:12 -0000	1.13
@@ -58,11 +58,11 @@
 <div id="content">
 
 	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="false" />
+		<c:out value="${scribeDTO.title}" escapeXml="true" />
 	</h1>
 
 	<p>
-		${scribeDTO.instructions}
+		<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<html:form action="learning">
@@ -80,22 +80,25 @@
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
 			<div class="shading-bg">
 				<p>
-					${reportDTO.headingDTO.headingText}
+					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
 				</p>
 
 
 				<c:if test="${not empty reportDTO.entryText}">
 					<ul>
 						<li>
 							<p>
-								<lams:out value="${reportDTO.entryText}" />
+								<c:set var="entry">
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
+								</c:set>
+								<c:out value="${entry}" escapeXml="false"/>
 							</p>
 						</li>
 					</ul>
 				</c:if>
 
 				<c:if test="${not scribeUserDTO.finishedActivity}">
-					<html:textarea property="report(${reportDTO.uid})" rows="4"
+					<html:textarea property="report(${reportDTO.uid})" rows="7"
 						cols="20" value="${reportDTO.entryText}" style="width: 100%;"></html:textarea>
 				</c:if>
 			</div>
Index: lams_tool_scribe/web/pages/learning/parts/reportBody.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/parts/reportBody.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/learning/parts/reportBody.jsp	16 Nov 2007 07:51:56 -0000	1.1
+++ lams_tool_scribe/web/pages/learning/parts/reportBody.jsp	31 Mar 2014 04:10:11 -0000	1.2
@@ -1,13 +1,13 @@
 	<%@ include file="/common/taglibs.jsp"%>
 	
 	<h1>
-		<c:out value="${scribeDTO.title}" escapeXml="false" />
+		<c:out value="${scribeDTO.title}" escapeXml="true" />
 	</h1>
 
 	<div class="space-left space-right">
 
 		<p>
-			${scribeDTO.instructions}
+			<c:out value="${scribeDTO.instructions}" escapeXml="false"/>
 		</p>
 	
 		<%@include file="/pages/parts/voteDisplay.jsp"%>
@@ -19,14 +19,17 @@
 	
 			<div class="shading-bg">
 				<p>
-					${reportDTO.headingDTO.headingText}
+					<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
 				</p>
 	
 				<c:if test="${not empty reportDTO.entryText}">
 					<ul>
 						<li>
 							<p>
-								<lams:out value="${reportDTO.entryText}" />
+								<c:set var="entry">
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true"/>
+								</c:set>
+								<c:out value="${entry}" escapeXml="false"/>
 							</p>
 						</li>
 					</ul>
@@ -38,10 +41,10 @@
 			test="${scribeUserDTO.finishedActivity and scribeDTO.reflectOnActivity}">
 			<div>
 				<h4>
-					${scribeDTO.reflectInstructions}
+					<lams:out value="${scribeDTO.reflectInstructions}" escapeHtml="true"/>
 				</h4>
 				<p>
-					${scribeUserDTO.notebookEntry}
+					<lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/>
 				</p>
 			</div>
 		</c:if>
@@ -59,14 +62,17 @@
 				<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
 					<div class="shading-bg">
 						<p>
-							${reportDTO.headingDTO.headingText}
+							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false"/>
 						</p>
 			
 						<c:if test="${not empty reportDTO.entryText}">
 							<ul>
 								<li>
 									<p>
-										<lams:out value="${reportDTO.entryText}" />
+										<c:set var="entry">
+											<lams:out value="${reportDTO.entryText}" escapeHtml="true"/> 
+										</c:set>
+										<c:out value="${entry}" escapeXml="false"/>
 									</p>
 								</li>
 							</ul>
Index: lams_tool_scribe/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/pages/monitoring/editActivity.jsp	11 Oct 2006 07:41:26 -0000	1.3
+++ lams_tool_scribe/web/pages/monitoring/editActivity.jsp	31 Mar 2014 04:10:12 -0000	1.4
@@ -9,7 +9,7 @@
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
-				<c:out value="${dto.title}" escapeXml="false" />
+				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_scribe/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/monitoring/notebook.jsp	15 Sep 2006 03:09:52 -0000	1.1
+++ lams_tool_scribe/web/pages/monitoring/notebook.jsp	31 Mar 2014 04:10:12 -0000	1.2
@@ -4,13 +4,13 @@
 	<tr>
 		<td>
 			<h2>
-				${scribeUserDTO.firstName} ${scribeUserDTO.lastName}
+				<c:out value="${scribeUserDTO.firstName} ${scribeUserDTO.lastName}" escapeXml="true"/>
 			</h2>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<p>${scribeUserDTO.notebookEntry}</p>
+			<p><lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/></p>
 		</td>
 	</tr>
 </table>
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/summary.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	6 Jan 2009 03:44:36 -0000	1.17
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	31 Mar 2014 04:10:12 -0000	1.18
@@ -16,82 +16,10 @@
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<h1>
-	<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.showAggregatedReports" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.showAggregatedReports}">
-					<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="advanced.selectScribe" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.autoSelectScribe}">
-					<fmt:message key="advanced.firstLearner" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="advanced.selectInMonitor" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.reflectOnActivity}">
-					<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="${dto.reflectOnActivity}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${dto.reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
+<h1><c:out value="${monitoringDTO.title}" escapeXml="true"/></h1>
+<div class="instructions space-top">
+<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
 </div>
 
 <c:forEach var="session" items="${dto.sessionDTOs}">
@@ -121,7 +49,7 @@
 							style="min-width: 150px;">
 							<c:forEach var="user" items="${session.userDTOs}">
 								<html:option value="${user.uid}">
-												${user.firstName} ${user.lastName}
+												<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 											</html:option>
 							</c:forEach>
 						</html:select>
@@ -147,7 +75,7 @@
 			</div>
 
 			<p>
-				${session.appointedScribe}
+				<c:out value="${session.appointedScribe}" escapeXml="true"/>
 			</p>
 
 			<c:set var="scribeSessionDTO" value="${session}" scope="request">
@@ -163,7 +91,7 @@
 					<lams:out value="${report.headingDTO.headingText}" />
 				</p>
 				<p>
-					<lams:out value="${report.entryText}" />
+					<lams:out value="${report.entryText}" escapeHtml="true"/>
 				</p>
 				<hr />
 			</c:forEach>
@@ -207,7 +135,7 @@
 			<c:forEach var="user" items="${session.userDTOs}">
 				<tr>
 					<td>
-						${user.firstName} ${user.lastName}
+						<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 					</td>
 					<c:if test="${dto.reflectOnActivity}">
 						<td>
@@ -240,3 +168,83 @@
 		</html:submit>
 	</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/>');" />
+
+	<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.showAggregatedReports" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.showAggregatedReports}">
+					<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="advanced.selectScribe" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.autoSelectScribe}">
+					<fmt:message key="advanced.firstLearner" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="advanced.selectInMonitor" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.reflectOnActivity}">
+					<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="${dto.reflectOnActivity}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					<c:out value="${dto.reflectInstructions}" />	
+				</td>
+			</tr>
+		</c:when>
+	</c:choose>
+</table>
+</div>