Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r0effae5377cf7d628757b74da04bd26e0ba60a59 -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 0effae5377cf7d628757b74da04bd26e0ba60a59)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
@@ -55,7 +55,7 @@
 	 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-sm btn-default" styleId="cancelButton">
 				<fmt:message key="button.cancel" />
 			</html:button>&nbsp;
-			<html:submit styleClass="btn btn-sm btn-default" styleId="submitButton">
+			<html:submit styleClass="btn btn-sm btn-default btn-disable-on-submit" styleId="submitButton">
 			 	<fmt:message key="button.add" />
 			</html:submit>
 		</div>
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -r6dcca6e898bc6e7e1e338e26f8de0acd715216fc -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 6dcca6e898bc6e7e1e338e26f8de0acd715216fc)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
@@ -36,7 +36,7 @@
 	 		<html:button property="goback" onclick="javascript:cancel()" styleClass="btn btn-sm btn-default" styleId="cancelButton">
 				<fmt:message key="button.cancel" />
 			</html:button>&nbsp;
-			<html:submit styleClass="btn btn-sm btn-default" styleId="submitButton">
+			<html:submit styleClass="btn btn-sm btn-default btn-disable-on-submit" styleId="submitButton">
 			 	<fmt:message key="button.add" />
 			</html:submit>
 		</div>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r33c08844653d1db1980b7a57cd4d22f28e948167 -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 33c08844653d1db1980b7a57cd4d22f28e948167)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
@@ -32,8 +32,8 @@
 		});
 
  		function submitResourceForm() {
- 			debugger;
 			if ( $(this).valid() ) {
+				$('.btn-disable-on-submit').prop('disabled', true);
 				var formData = new FormData(this);
 			    $.ajax({ // create an AJAX call...
 			        data: formData, 
@@ -43,14 +43,13 @@
 			        url: $(this).attr('action'), // the file to call
 			        success: function (response) {
 						$('#addresource').html(response);
-						if ( itemType == 1)
-							setFormURL();
-						else if ( itemType == 2)
-							setFormFile();
 			    	},
 			    	error: function (jqXHR, textStatus, errorThrown ) {
 			    		alert(textStatus+": "+errorThrown);
 			    	},
+			    	complete: function(response) {
+			            $('.btn-disable-on-submit').prop('disabled', false);
+					}
 			    });
 			}
 			return false;
@@ -84,6 +83,7 @@
 			$("#sessionMapID").val("${sessionMapID}");
 		}
 		function cancel(){
+			$('.btn-disable-on-submit').prop('disabled', false);
 			$("#addresource").html('');
 		}		
 		
@@ -97,11 +97,12 @@
 			launchPopup(myUrl,"LearnerView");
 		}
 		function finishSession(){
-			document.getElementById("finishButton").disabled = true;
+			$('.btn-disable-on-submit').prop('disabled', true);
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
 		function continueReflect(){
+			$('.btn-disable-on-submit').prop('disabled', true);
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
 		    </script>
@@ -242,7 +243,7 @@
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
-						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-sm btn-default voffset5">
+						<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-sm btn-default voffset5 btn-disable-on-submit">
 						<fmt:message key="label.edit" />
 						</html:button>
 					</c:if>
@@ -256,13 +257,13 @@
 					<c:when
 						test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
 						<html:button property="FinishButton"
-							onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
+							onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right btn-disable-on-submit">
 							<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 voffset5 pull-right na">
+						<button type="submit" id="finishButton"
+							onclick="return finishSession()" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
 				 					<c:when test="${sessionMap.activityPosition.last}">
@@ -273,7 +274,7 @@
 				 					</c:otherwise>
 				 				</c:choose>
 							</span>
-						</html:link>
+						</button>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
diff -u -r48be6456edafa05b5486a6b3fc37f33d926d3c58 -r7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 48be6456edafa05b5486a6b3fc37f33d926d3c58)
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7ed5fbd3fe8ae436e1a4376f59cd23392a6f389f)
@@ -12,10 +12,6 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
-	        function submitForm(methodName){
-        	        var f = document.getElementById('reflectionForm');
-	                f.submit();
-	        }
 	</script>
 </lams:head>
 <body class="stripes">
@@ -36,11 +32,10 @@
 				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area" />
+			<html:textarea rows="8" property="entryText" styleId="focused" styleClass="form-control" />
 
 			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
+				<button type="submit" class="btn btn-primary voffset5 pull-right na" id="finishButton">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
@@ -51,7 +46,7 @@
 		 					</c:otherwise>
 		 				</c:choose>
 		 			</span>
-				</html:link>
+				</button>
 			</div>
 		</div>
 	</html:form>