Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -r135edd5e691553685777c2fef3099e832ed62b4b -r38a6c414e30497d03559a85b5c33155e4a2fc22e
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 135edd5e691553685777c2fef3099e832ed62b4b)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 38a6c414e30497d03559a85b5c33155e4a2fc22e)
@@ -43,7 +43,7 @@
 			<html:hidden property="signature"/>
 			<html:hidden property="lessonID" value="${entry.externalID}"/>
 	
-		<h1><fmt:message key="mynotes.title"/></h1>
+		<h1><c:choose><c:when test="${mode == 'teacher'}"><fmt:message key="mynotes.journals.title"/></c:when><c:otherwise><fmt:message key="mynotes.title"/></c:otherwise></c:choose></h1>
 		
 		<!-- title -->
 		<h2><c:choose>
@@ -83,9 +83,21 @@
 				<c:otherwise>
 					<tr>
 						<td>
-							<p><c:out value="${entry.entry}" escapeXml="false"/></p>
+							<c:set var="entryTxt"><c:out value="${entry.entry}" escapeXml="false"/></c:set>
+							<p><lams:out value="${entryTxt}" /></p>
 						</td>
 					</tr>
+					<c:if test="${mode == 'teacher'}">
+						<tr>
+							<td>
+								<p><i><fmt:message key="mynotes.entry.submitted.by">
+									<fmt:param>
+										<c:out value="${entry.user.fullName}" escapeXml="false"/>
+									</fmt:param>
+								</fmt:message></i></p>
+							</td>
+						</tr>
+					</c:if>	
 				</c:otherwise>
 			</c:choose>
 			<tr>