Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/learning.jsp,v
diff -u -r1.25.2.3 -r1.25.2.4
--- lams_tool_task/web/pages/learning/learning.jsp	29 Feb 2016 10:51:51 -0000	1.25.2.3
+++ lams_tool_task/web/pages/learning/learning.jsp	16 Feb 2017 11:46:09 -0000	1.25.2.4
@@ -22,24 +22,37 @@
 	<script type="text/javascript">
 	<!--
 
+		function disableButtons() {
+			// logic to disable all buttons depends on contained pages so to avoid future changes breaking this code and stopping the page working, wrap in a try.
+			try {
+				$('.btn-disable-on-submit').prop('disabled', true);
+				var addTaskArea = document.getElementById('reourceInputArea');
+				if ( addTaskArea && addTaskArea.contentWindow.disableButtons  ) {
+					addTaskArea.contentWindow.disableButtons();
+				}
+			} catch(err) {}
+		}
+	
 		function checkNew() {
 			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}";
 			return false;
 		}
 
 		function completeItem(itemUid) {
+			disableButtons() ;
 			document.location.href = "<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid="
 					+ itemUid;
 			return false;
 		}
 
 		function finishSession() {
-			document.getElementById("finishButton").disabled = true;
+			disableButtons() ;
 			document.location.href = '<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
 
 		function continueReflect() {
+			disableButtons() ;
 			document.location.href = '<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 
@@ -129,9 +142,9 @@
 
 		<c:if test="${mode != 'teacher'}">
 			<p>
-				<a href="#" onclick="return checkNew()" class="btn btn-sm btn-default"> <fmt:message
+				<button onclick="return checkNew()" class="btn btn-sm btn-default btn-disable-on-submit"> <fmt:message
 						key="label.learning.check.for.new" />
-				</a>
+				</button>
 			</p>
 		</c:if>
 
@@ -141,10 +154,9 @@
 			<c:if test="${taskList.allowContributeTasks}">
 
 				<p>
-					<a
-						href="javascript:showMessage('<html:rewrite page="/learning/addtask.do?sessionMapID=${sessionMapID}&mode=${mode}"/>');"
-						class="btn btn-sm btn-default"><i class="fa fa-sm fa-plus-circle"></i>&nbsp;<fmt:message
-							key="label.authoring.basic.add.task" /> </a>
+					<button onclick="javascript:showMessage('<html:rewrite page="/learning/addtask.do?sessionMapID=${sessionMapID}&mode=${mode}"/>');"
+						class="btn btn-sm btn-default btn-disable-on-submit"><i class="fa fa-sm fa-plus-circle"></i>&nbsp;<fmt:message
+							key="label.authoring.basic.add.task" /> </button>
 				<p>
 
 					<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
@@ -156,9 +168,6 @@
 		<!--Reflection-->
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="voffset10">
-				<div class="row">
-					<div class="col-xs12">
 						<div class="panel panel-default">
 							<div class="panel-heading panel-title">
 								<fmt:message key="label.monitoring.summary.title.reflection" />
@@ -186,7 +195,7 @@
 
 									<c:if test="${mode != 'teacher'}">
 										<html:button property="FinishButton" onclick="return continueReflect()"
-											styleClass="btn btn-sm btn-default pull-left voffset10">
+											styleClass="btn btn-sm btn-default pull-left voffset10 btn-disable-on-submit">
 											<fmt:message key="label.edit" />
 										</html:button>
 									</c:if>
@@ -196,10 +205,6 @@
 
 							</div>
 						</div>
-					</div>
-				</div>
-
-			</div>
 		</c:if>
 
 		<!--Bottom buttons-->
@@ -221,14 +226,14 @@
 
 					<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<html:button property="FinishButton" onclick="return continueReflect()"
-							styleClass="btn btn-primary voffset10 pull-right">
+							styleClass="btn btn-primary btn-disable-on-submit voffset10 pull-right">
 							<fmt:message key="label.continue" />
 						</html:button>
 					</c:when>
 
 					<c:otherwise>
-						<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()"
-							styleClass="btn btn-primary voffset10 pull-right na">
+						<button type="submit" id="finishButton" onclick="return finishSession()"
+							class="btn btn-primary btn-disable-on-submit voffset10 pull-right na">
 							<span class="nextActivity"> <c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
 										<fmt:message key="label.submit" />
@@ -238,7 +243,7 @@
 									</c:otherwise>
 								</c:choose>
 							</span>
-						</html:link>
+						</button>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_task/web/pages/learning/parts/addtask.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/parts/addtask.jsp,v
diff -u -r1.1.12.2 -r1.1.12.3
--- lams_tool_task/web/pages/learning/parts/addtask.jsp	29 Feb 2016 10:51:51 -0000	1.1.12.2
+++ lams_tool_task/web/pages/learning/parts/addtask.jsp	16 Feb 2017 11:46:09 -0000	1.1.12.3
@@ -6,6 +6,24 @@
 <lams:html>
 <lams:head>
 	<%@ include file="/common/header.jsp"%>
+	
+	<script type="text/javascript">
+
+		function disableButtons() {
+			$('.btn-disable-on-submit').prop('disabled', true);
+		}
+	
+		function saveTask() {
+			disableButtons();
+			try { window.parent.disableButtons(); } catch(err) {}
+			taskListItemForm.submit();
+		}
+		
+		function cancel() {
+			 window.parent.hideMessage();
+		}
+		
+	</script>		
 </lams:head>
 <body>
 
@@ -31,11 +49,11 @@
 
 	<div class="form-group">
 		<lams:ImgButtonWrapper>
-			<a href="javascript:;" onclick="window.parent.hideMessage();" class="btn btn-sm btn-default"> <fmt:message
+			<button onclick="cancel();" class="btn btn-sm btn-default btn-disable-on-submit"> <fmt:message
 					key="label.cancel" />
-			</a>
-			<a href="#" onclick="taskListItemForm.submit();" class="btn btn-sm btn-default"> <fmt:message key="button.add" />
-			</a>
+			</button>
+			<button onclick="saveTask()" class="btn btn-sm btn-default btn-disable-on-submit"> <fmt:message key="button.add" />
+			</button>
 		</lams:ImgButtonWrapper>
 	</div>
 
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/parts/itemdetails.jsp,v
diff -u -r1.7.2.1 -r1.7.2.2
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	29 Feb 2016 10:51:51 -0000	1.7.2.1
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	16 Feb 2017 11:46:09 -0000	1.7.2.2
@@ -7,7 +7,7 @@
 			<!-- Comments Part -->
 			<c:if test="${item.commentsAllowed}">
 				<html:form action="/learning/addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
-					method="post" enctype="multipart/form-data">
+					method="post" enctype="multipart/form-data" onsubmit="disableButtons()">
 
 					<%@ include file="commentlist.jsp"%>
 
@@ -23,7 +23,7 @@
 							</c:if>
 
 							<input type="submit" name="commentButton" value='<fmt:message key="label.preview.post" />'
-								class="btn btn-sm btn-default voffset5" />
+								class="btn btn-sm btn-default btn-disable-on-submit voffset5" />
 						</div>
 
 					</c:if>
@@ -33,7 +33,7 @@
 			<!-- Uploaded Attachments -->
 			<c:if test="${item.filesAllowed}">
 				<html:form action="/learning/uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
-					method="post" enctype="multipart/form-data">
+					method="post" enctype="multipart/form-data" onsubmit="disableButtons()">
 					<c:choose>
 						<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
 							<lams:Alert id="fileRequired" close="true" type="info">
@@ -55,7 +55,7 @@
 						</html:file>
 
 						<input type="submit" name="uploadedFileButton" value='<fmt:message key="label.preview.upload.button" />'
-							class="btn btn-sm btn-default voffset5" />
+							class="btn btn-sm btn-default btn-disable-on-submit voffset5" />
 					</c:if>
 				</html:form>
 			</c:if>
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/parts/notebook.jsp,v
diff -u -r1.6.2.4 -r1.6.2.5
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	1 Jul 2016 06:04:27 -0000	1.6.2.4
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	16 Feb 2017 11:46:09 -0000	1.6.2.5
@@ -11,10 +11,6 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-		function submitForm(methodName) {
-			var f = document.getElementById('messageForm');
-			f.submit();
-		}
 	</script>
 </lams:head>
 <body class="stripes">
@@ -37,8 +33,7 @@
 			<html:textarea cols="60" styleId="notebookEntry" property="entryText" styleClass="form-control" rows="5" />
 
 			<div class="voffset10">
-				<html:link href="#nogo" styleClass="btn btn-primary pull-right na" styleId="finishButton"
-					onclick="submitForm('finish')">
+				<button type="submit" class="btn btn-primary pull-right na" id="finishButton">
 					<span class="nextActivity"> <c:choose>
 							<c:when test="${sessionMap.activityPosition.last}">
 								<fmt:message key="label.submit" />
@@ -48,7 +43,7 @@
 							</c:otherwise>
 						</c:choose>
 					</span>
-				</html:link>
+				</button>
 			</div>
 
 			<div id="footer"></div>