Index: lams_learning/web/notebook/viewall.jsp
===================================================================
diff -u -r0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f -r6f033f32d8bbde1303782d75a2ad8679536a7d1b
--- lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 0ddeb3a1dcf29cbbba6ed0fccbd139f9c31c347f)
+++ lams_learning/web/notebook/viewall.jsp	(.../viewall.jsp)	(revision 6f033f32d8bbde1303782d75a2ad8679536a7d1b)
@@ -30,23 +30,21 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 
 <fmt:setBundle basename="org.lamsfoundation.lams.learning.ApplicationResources" />
-<c:set var="addnote">
-	<html:rewrite page="/notebook/add.do?lessonID=" />
-	<c:out value="${lessonID}" />
-</c:set>
 <c:set var="title">
 	<fmt:message key="mynotes.title" />
 </c:set>
 
 <lams:Page type="learner" title="${title}" hideProgressBar="true">
-	<c:set var="addnote">
-		<html:rewrite page="/notebook/add.do?lessonID=" />
-		<c:out value="${lessonID}" />
-	</c:set>
-	<div class="pull-right">
-		<a href="${addnote}" class="btn btn-default pull-right" id="addNewBtn"><fmt:message
-				key="mynotes.add.new.current.lesson.button" /></a>
-	</div>
+	<c:if test="${empty entries}">
+		<c:set var="addnote">
+			<html:rewrite page="/notebook/add.do?lessonID=" />
+			<c:out value="${lessonID}" />
+		</c:set>
+		<div class="pull-right">
+			<a href="${addnote}" class="btn btn-default pull-right" id="addNewBtn"><fmt:message
+					key="mynotes.add.new.current.lesson.button" /></a>
+		</div>
+	</c:if>
 	
 	<div class="lead">
 		<fmt:message key="mynotes.view.all.button" />