Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r680db505ed3b41934305d30a997f7dd02e653f88 -re7ceed85dfbbab1c83699895b96a9cdce0f11988
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 680db505ed3b41934305d30a997f7dd02e653f88)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision e7ceed85dfbbab1c83699895b96a9cdce0f11988)
@@ -9,10 +9,6 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-		function submitForm(methodName) {
-			var f = document.getElementById('messageForm');
-			f.submit();
-		}
 	</script>
 </lams:head>
 
@@ -36,8 +32,7 @@
 				<html:textarea property="entryText" styleClass="form-control" styleId="focused" rows="5" />
 
 
-				<html:link href="#nogo" styleClass="btn btn-primary voffset10 pull-right na" styleId="finishButton"
-					onclick="submitForm('finish')">
+				<button class="btn btn-primary voffset10 pull-right na" id="finishButton" type="submit" ">
 
 					<c:choose>
 						<c:when test="${activityPosition.last}">
@@ -48,7 +43,7 @@
 						</c:otherwise>
 					</c:choose>
 
-				</html:link>
+				</button>
 
 			</html:form>
 
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r6b30b7b273f64dc91053664be20ea37b65156024 -re7ceed85dfbbab1c83699895b96a9cdce0f11988
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 6b30b7b273f64dc91053664be20ea37b65156024)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision e7ceed85dfbbab1c83699895b96a9cdce0f11988)
@@ -27,22 +27,30 @@
 				//					return false;
 				//			}
 			} else if (uploadFileNum == 0) {
-				if (confirm("<fmt:message key='messsage.learner.finish.confirm'/>"))
+				if (confirm("<fmt:message key='messsage.learner.finish.confirm'/>")) {
+					disableButtons();
 					location.href = tUrl;
-				else
+				} else {
 					return false;
-			} else
+				}
+			} else {
+				disableButtons();
 				location.href = tUrl;
+			}
 		}
 		function finish() {
-			document.getElementById("finishButton").disabled = true;
 			var finishUrl = "<html:rewrite page='/learner.do?method=finish&sessionMapID=${sessionMapID}'/>";
 			return submitCount(finishUrl);
 		}
 		function notebook() {
 			var continueUrl = "<html:rewrite page='/learning/newReflection.do?sessionMapID=${sessionMapID}'/>";
 			return submitCount(continueUrl);
 		}
+		function disableButtons() {
+			// do not disable the file button or the file will be missing on the upload.
+			$('.btn-disable-on-submit').prop('disabled', true);
+			$('a.btn-disable-on-submit').hide(); // links must be hidden, cannot be disabled
+		}
 	</script>
 
 </lams:head>
@@ -129,7 +137,7 @@
 								</c:set>
 								</td>
 								<td>
-									<a href="${downloadURL}" title="<fmt:message key="label.download" />" class="btn btn-default pull-right">
+									<a href="${downloadURL}" title="<fmt:message key="label.download" />" class="btn btn-default btn-disable-on-submit pull-right">
 										<i class="fa fa-download" ></i>
 									</a>
 								</td>
@@ -180,7 +188,7 @@
 							<c:set var="markFileDownloadURL">
 								<c:url value="/download?uuid=${file.markFileUUID}&versionID=${file.markFileVersionID}&preferDownload=true" />
 							</c:set>
-							<a href="${markFileDownloadURL}" title="<fmt:message key='label.download' />" class="btn btn-default pull-right">
+							<a href="${markFileDownloadURL}" title="<fmt:message key='label.download' />" class="btn btn-default btn-disable-on-submit pull-right">
 								<i class="fa fa-download"></i>
 							</a>
 						</td>
@@ -208,7 +216,7 @@
 
 			<c:if test="${!displayForm}">
 
-				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data">
+				<html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" onsubmit="disableButtons();" >
 					<html:hidden property="sessionMapID" />
 
 					<!-- Hidden fields -->
@@ -235,8 +243,8 @@
 									<p class="help-block"><small><fmt:message key="errors.required"><fmt:param>*</fmt:param></fmt:message></small></p>
 							</div>
 							<div class="form-group">
-								<button type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
-									class="btn btn-sm btn-default btn-primary">
+								<button id="uploadButton" type="submit" <c:if test="${sessionMap.finishLock || sessionMap.arriveLimit}">disabled="disabled"</c:if>
+									class="btn btn-sm btn-default btn-primary btn-disable-on-submit">
 									<i class="fa fa-xs fa-upload"></i> <fmt:message key="label.learner.upload" />
 								</button>
 							</div>
@@ -277,7 +285,7 @@
 					</div>
 
 					<html:button property="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
-						styleClass="btn btn-sm btn-primary pull-left">
+						styleClass="btn btn-sm btn-primary btn-disable-on-submit pull-left" >
 						<fmt:message key="label.edit" />
 					</html:button>
 				</div>
@@ -288,13 +296,12 @@
 
 		<c:choose>
 			<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-				<html:button property="notebookButton" onclick="javascript:notebook();" styleClass="btn btn-primary pull-right">
+				<html:button property="notebookButton" onclick="javascript:notebook();" styleClass="btn btn-primary btn-disable-on-submit pull-right">
 					<fmt:message key="label.continue" />
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:link href="#nogo" property="finishButton" onclick="finish();return false"
-					styleClass="btn btn-primary pull-right na" styleId="finishButton">
+				<html:button property="finishButton" onclick="javascript:finish();" styleClass="btn btn-primary btn-disable-on-submit pull-right na" styleId="finishButton">
 					<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submit" />
@@ -303,7 +310,7 @@
 							<fmt:message key="button.finish" />
 						</c:otherwise>
 					</c:choose>
-				</html:link>
+				</html:button>
 			</c:otherwise>
 		</c:choose>