Index: lams_learning/web/notebook/view.jsp
===================================================================
diff -u -r5d5ceb96e20cf8669cb5f59151e172f912221f26 -rf0e43a945b290c73971b75babd77d0b4a2fac1d5
--- lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision 5d5ceb96e20cf8669cb5f59151e172f912221f26)
+++ lams_learning/web/notebook/view.jsp	(.../view.jsp)	(revision f0e43a945b290c73971b75babd77d0b4a2fac1d5)
@@ -58,7 +58,8 @@
 		<html:hidden property="uid" value="${entry.uid}" />
 		<html:hidden property="signature" />
 		<html:hidden property="lessonID" value="${entry.externalID}" />
-
+		<html:hidden property="currentLessonID" value="${empty currentLessonID ? param.currentLessonID : currentLessonID}" />
+		
 		<!-- set title -->
 		<c:set var="title">
 			<c:choose>
@@ -139,15 +140,18 @@
 						</c:when>
 						<c:otherwise>
 							<c:set var="editnote">
-								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&uid=" />
+								<html:rewrite page="/notebook.do?method=viewEntry&mode=edit&currentLessonID=${param.currentLessonID}&uid=" />
 								<c:out value="${entry.uid}" />
 							</c:set>
 							<c:if test="${entry.externalSignature != scratchJournalSig}">
 								<a href="${editnote}" class="btn btn-default" id="saveBtn">
 									<fmt:message key="label.edit.button" />
 								</a>
 							</c:if>
-							<a href="javascript: history.back();" class="btn btn-default" id="viewAllBtn">
+							<c:set var="viewAll">
+								<html:rewrite page="/notebook.do?method=viewAll&currentLessonID=${param.currentLessonID}" />
+							</c:set>
+							<a href="${viewAll}" class="btn btn-default" id="viewAllBtn">
 								<fmt:message key="mynotes.view.all.button" />
 							</a>
 						</c:otherwise>