Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
@@ -136,11 +136,14 @@
 										
 								//show comments textarea and a submit button
 								} else if (!isDisabled) {
-									rows += '<div id="add-comment-area-' + itemId + '">';	
+									rows += '<div id="add-comment-area-' + itemId;
+									if ( isCriteriaNotRatedByUser )
+										rows += '" style="visibility: hidden;';
+									rows += '">';	
 									rows += '<div class="no-gutter">';
 									rows += '';
 									rows += '<div class="col-xs-12 col-sm-11 ">';										
-									rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
+									rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 									rows += '</div>';
 									rows += 	'<div id="comment-tick-'+itemId+'" class="button add-comment add-comment-new col-xs-12 col-sm-1" ';
 									if ( isCriteriaNotRatedByUser )
@@ -173,11 +176,28 @@
 		});
 	 });
 	
+
+<c:choose>
+<c:when test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+	function submitEntry(next){
+		// ratings already saved, just save any unsaved comments.
+		hideButtons();
+		$("#next").val(next);
+		$('textarea').each(function() {
+			if (this.value==this.defaultValue)
+				this.value="";
+		});
+		$("#editForm").submit();
+	}
+</c:when>
+<c:otherwise>
 	function submitEntry(next) {
-		// data saved by the tick boxes so don't use next button to submit
+		// stars saved when clicked so don't use next button to submit
 		nextprev(next);
 	}
-	
+</c:otherwise>
+</c:choose>
+
 	function onRatingSuccessCallback() {
 		var numItems = $("#count-rated-items").html();
 		if ( ${minRates} <= 0 || numItems >=  ${minRates} ) {
@@ -224,6 +244,14 @@
 				
 			
 		</c:if>
+
+		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+		<form action="<c:url value="/learning/submitComments.do?"/>" method="get" id="editForm">
+			<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
+			<input type="hidden" name="toolContentId" value="${toolContentId}"/>
+			<input type="hidden" name="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
+			<input type="hidden" name="next" id="next" value=""/>		
+		</c:if>
 				
 		<c:set var="numColumns" value="2"/>
 		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
@@ -243,6 +271,10 @@
 			</th>
 			</c:if>
 		</lams:TSTable>
+
+		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+		</form>
+		</c:if>
 							
 		<div id="no-users-info">
 			<fmt:message key="label.no.users" />