Index: lams_tool_wiki/web/pages/learning/notebook.jsp
===================================================================
diff -u -rf6959ef7792273a7ff3f05439513533678f9cc1f -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61
--- lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision f6959ef7792273a7ff3f05439513533678f9cc1f)
+++ lams_tool_wiki/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
@@ -45,11 +45,10 @@
 				<div class="form-group">
 					<textarea id="focused" rows="4" name="entryText" class="form-control">${learningForm.entryText}</textarea>
 		
-		
 					<a href="#nogo" class="btn btn-primary voffset5 pull-right na" id="finishButton"
 						onclick="submitForm('finish');return false">
 						<c:choose>
-							<c:when test="${activityPosition.last}">
+							<c:when test="${isLastActivity}">
 								<fmt:message key="button.submit" />
 							</c:when>
 							<c:otherwise>
@@ -59,20 +58,15 @@
 					</a>
 				</div>
 			</form:form>
-		
 		</lams:Page>
 		
-			<script type="text/javascript">
-				window.onload = function() {
-					document.getElementById("focused").focus();
-				}
-			</script>
-		
-		
+		<script type="text/javascript">
+			window.onload = function() {
+				document.getElementById("focused").focus();
+			}
+		</script>
 
 		<div class="footer">
 		</div>					
 	</body>
 </lams:html>
-
-