Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	17 Jan 2014 22:10:27 -0000	1.16
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	17 Jul 2014 18:05:50 -0000	1.17
@@ -144,6 +144,9 @@
 	if (nbEntry != null) {
 	    learningForm.setEntryText(nbEntry.getEntry());
 	}
+	
+	// get teacher's comment if available
+	request.setAttribute("teachersComment", notebookUser.getTeachersComment());
 
 	// set readOnly flag.
 	if (mode.equals(ToolAccessMode.TEACHER) || (notebook.isLockOnFinished() && notebookUser.isFinishedActivity())) {
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_notebook/web/pages/learning/notebook.jsp	27 Mar 2014 00:00:06 -0000	1.29
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	17 Jul 2014 18:05:50 -0000	1.30
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-<!--
 	var mode = "${mode}";
 
 	function disableFinishButton() {
@@ -36,11 +35,11 @@
 			}
 		}
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
--->
+	
+	function submitForm(methodName){
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
 </script>
 
 <div id="content">
@@ -75,14 +74,12 @@
 
 	&nbsp;
 
-	<html:form action="/learning" method="post"
-		onsubmit="return validateForm();" styleId="messageForm">
+	<html:form action="/learning" method="post" onsubmit="return validateForm();" styleId="messageForm">
 		<html:hidden property="dispatch" value="finishActivity" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="contentEditable" value="${contentEditable}" />
 		
-		<c:set var="lrnForm"
-			value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<c:set var="lrnForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 		<c:choose>
 			<c:when test="${contentEditable}">
@@ -94,8 +91,7 @@
 					</c:when>
 
 					<c:otherwise>
-						<html:textarea cols="60" rows="8" property="entryText"
-							styleClass="text-area"></html:textarea>
+						<html:textarea cols="60" rows="8" property="entryText"styleClass="text-area"/>
 					</c:otherwise>
 				</c:choose>
 			</c:when>
@@ -105,6 +101,14 @@
 			</c:otherwise>
 		</c:choose>
 		
+		<c:if test="${not empty teachersComment}">
+			<br><br>
+			<h3>
+				<fmt:message key="label.learning.comment" />
+			</h3>
+			<lams:out value="${teachersComment}" escapeHtml="true"/>
+		</c:if>
+		
 		<div class="space-bottom-top align-right">
 			<html:link href="#nogo" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
 				<span class="nextActivity">
Index: lams_tool_notebook/web/pages/learning/mobile/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/mobile/notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	27 Mar 2014 00:00:06 -0000	1.4
+++ lams_tool_notebook/web/pages/learning/mobile/notebook.jsp	17 Jul 2014 18:05:51 -0000	1.5
@@ -1,7 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-<!--
 	var mode = "${mode}";
 
 	function disableFinishButton() {
@@ -36,11 +35,11 @@
 			}
 		}
 	}
-         function submitForm(methodName){
-                var f = document.getElementById('messageForm');
-                f.submit();
-        }
--->
+	
+	function submitForm(methodName){
+		var f = document.getElementById('messageForm');
+		f.submit();
+	}
 </script>
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
@@ -91,8 +90,15 @@
 				<lams:out value="${lrnForm.entryText}" />
 			</c:otherwise>
 		</c:choose>
-
-	
+		
+		<c:if test="${not empty teachersComment}">
+			<br><br>
+			<h3>
+				<fmt:message key="label.learning.comment" />
+			</h3>
+			<lams:out value="${teachersComment}" escapeHtml="true"/>
+		</c:if>
+		
 	</div>
 
 	<div data-role="footer" data-theme="b" class="ui-bar">