Index: lams_central/web/comments/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/edit.jsp,v
diff -u -r1.2.2.4 -r1.2.2.5
--- lams_central/web/comments/edit.jsp	23 Feb 2016 14:23:03 -0000	1.2.2.4
+++ lams_central/web/comments/edit.jsp	20 Apr 2016 02:58:10 -0000	1.2.2.5
@@ -26,9 +26,16 @@
 	$('#editForm').submit(function() { // catch the form's submit event
 		editCommentSubmit()
 	} );
-		
+		 	
 	function editCommentSubmit() {
 
+		var btnName = "editCommentSubmitButton";
+		if ( isDisabled(btnName) ) {
+			return false;
+		}
+
+		disableButton(btnName);
+		
 		var theForm = $(editForm);			
 
 		if ( validateBodyText($('#editFormBody').val(), <%=CommentConstants.MAX_BODY_LENGTH%>, "<fmt:message key="label.comment.body.validation" />") ) {
@@ -48,6 +55,9 @@
 				reloadThread(response,'<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
     		});
 		} // end validateBodyText
+		else {
+			enableButton(btnName);
+		}
 		return false;
 	};
 
@@ -64,7 +74,7 @@
 	<input type="hidden" id="commentUid" name="commentUid" value="${commentUid}"/>
 	
 	<div class="right-buttons voffset5">
-		<a href="#nogo" onclick="javascript:editCommentSubmit();" class="btn btn-xs btn-primary pull-right">
+		<a href="#nogo" onclick="javascript:editCommentSubmit();" class="btn btn-xs btn-primary pull-right" id="editCommentSubmitButton">
 			<fmt:message key="label.post" />
 		</a>&nbsp;
 		<a href="#nogo" onclick="javascript:cancelEdit();" class="btn btn-xs btn-primary pull-right roffset5">
Index: lams_central/web/comments/new.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/new.jsp,v
diff -u -r1.4.2.4 -r1.4.2.5
--- lams_central/web/comments/new.jsp	23 Feb 2016 14:23:03 -0000	1.4.2.4
+++ lams_central/web/comments/new.jsp	20 Apr 2016 02:58:10 -0000	1.4.2.5
@@ -11,9 +11,16 @@
 		});
 	});
 
+	var btnName = "newCommentSubmitButton";
+
 	function newCommentSubmit() {
 
+		if ( isDisabled(btnName) ) {
+			return false;
+		}
+		
 		var theForm = $(newForm);
+		disableButton(btnName);
 
 		if (validateBodyText($('#newFormBody').val(),
 <%=CommentConstants.MAX_BODY_LENGTH%>,"<fmt:message key="label.comment.body.validation" />")) {
@@ -56,17 +63,22 @@
 									clearNewForm();
 								} else if (response.errMessage) {
 									alert(response.errMessage);
+									enableButton(btnName);
 								} else {
 									alert('<fmt:message key="error.please.refresh"/>');
 								}
 
 							});
 		} // end validateBodyText
+		else {
+			enableButton(btnName);
+		}
 		return false;
 	}
 
 	function clearNewForm() {
 		$('#newFormBody').val('');
+		enableButton(btnName);
 		return false;
 	}
 </script>
@@ -93,9 +105,9 @@
 								href="javascript:refreshComments();" style="margin: 5px"
 								class="btn btn-primary btn-xs"> <fmt:message
 									key="label.refresh" />
-							</a> <a href="#nogo" onclick="javascript:newCommentSubmit();"
-								style="margin: 5px" class="btn btn-primary btn-xs pull-right">
-								<fmt:message key="label.post" />
+							</a> <span onclick="javascript:newCommentSubmit();"
+								style="margin: 5px" class="btn btn-primary btn-xs pull-right" id="newCommentSubmitButton">
+								<fmt:message key="label.post" /></span>
 							</a> <a href="#nogo" onclick="javascript:clearNewForm();"
 								style="margin: 5px" class="btn btn-primary btn-xs pull-right">
 								<fmt:message key="label.cancel" />
Index: lams_central/web/comments/reply.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/reply.jsp,v
diff -u -r1.2.2.4 -r1.2.2.5
--- lams_central/web/comments/reply.jsp	23 Feb 2016 14:23:03 -0000	1.2.2.4
+++ lams_central/web/comments/reply.jsp	20 Apr 2016 02:58:10 -0000	1.2.2.5
@@ -26,6 +26,14 @@
 	});
 
 	function replyFormSubmit() {
+		
+		var btnName = "replyCommentSubmitButton";
+		if ( isDisabled(btnName) ) {
+			return false;
+		}
+
+		disableButton(btnName);
+		
 		var theForm = $(replyForm);
 		if (validateBodyText($('#replyFormBody').val(),
 <%=CommentConstants.MAX_BODY_LENGTH%>
@@ -56,6 +64,9 @@
 										'<fmt:message key="error.please.refresh"/>');
 							});
 		} // end validateBodyText
+		else {
+			enableButton(btnName);
+		}
 		return false;
 	}
 
@@ -76,7 +87,7 @@
 
 		<div class="right-buttons voffset5">
 			<a href="#nogo" onclick="javascript:replyFormSubmit();"
-				class="btn btn-xs btn-primary pull-right"> <fmt:message
+				class="btn btn-xs btn-primary pull-right" id="replyCommentSubmitButton"> <fmt:message
 					key="label.post" />
 			</a>&nbsp; <a href="#nogo" onclick="javascript:cancelReply();"
 				class="btn btn-xs btn-primary pull-right roffset5"> <fmt:message
Index: lams_central/web/includes/javascript/comments.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/comments.js,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_central/web/includes/javascript/comments.js	18 Jan 2016 03:26:27 -0000	1.3.2.3
+++ lams_central/web/includes/javascript/comments.js	20 Apr 2016 02:58:10 -0000	1.3.2.4
@@ -42,3 +42,16 @@
     		alert(errorCannotRedisplayMessage);
     	} 
 	}
+
+	/** Disable the submit button when pressed to stop double submission. disabled = true doesn't stop the link working it just
+	 * greys it out. So we need to test with isDisabled() in the submit methods too! Messy. */
+	function disableButton(buttonId) {
+		$("#"+buttonId).attr("disabled", true); 
+	}
+	function isDisabled(buttonId) {
+		return $("#"+buttonId).attr("disabled");
+	}
+	function enableButton(buttonId) {
+		$("#"+buttonId).removeAttr("disabled");
+	}
+