Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -raff1ef425c76fe6a2051694c0fdf833265459710 -r7c46c69de0269005bc00c1e5fd5347f6fe306790
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aff1ef425c76fe6a2051694c0fdf833265459710)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7c46c69de0269005bc00c1e5fd5347f6fe306790)
@@ -123,6 +123,13 @@
 					itemUid: itemUid,
 					sessionMapID: "${sessionMapID}",
 					comment: comment
+				},
+				function() {
+					//show complete item button in case comment is required and only its absence prevented it from completion
+					var i = $("#item-faminus-" + itemUid);
+					if (eval(i.data("waiting-for-comment"))) {
+						i.replaceWith( '<a href="javascript:;" onclick="return completeItem(' + itemUid + ')"><i class="fa fa-lg fa-square-o"></i></a>' );
+					}
 				}
 			);
 		}
Index: lams_tool_task/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -raff1ef425c76fe6a2051694c0fdf833265459710 -r7c46c69de0269005bc00c1e5fd5347f6fe306790
--- lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision aff1ef425c76fe6a2051694c0fdf833265459710)
+++ lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 7c46c69de0269005bc00c1e5fd5347f6fe306790)
@@ -50,19 +50,21 @@
 </script>
 
 <c:if test="${sessionMap.mode != 'teacher'}">
+
+	<c:if test="${!itemDTO.commentRequirementsMet}">
+		<lams:Alert id="commentRequired" close="true" type="info">
+			<fmt:message key="label.learning.info.add.comment.required" />
+		</lams:Alert>
+	</c:if>
+
 	<div class="form-group voffset5">
 		<label for="comment-${itemUid}">
 			<fmt:message key="label.preview.add.comment" />
 		</label>
 		<textarea name="comment-${itemUid}" id="comment-${itemUid}" class="form-control" rows="2"></textarea>
-							
-		<c:if test="${!itemDTO.commentRequirementsMet}">
-			<div class="help-block">
-				<fmt:message key="label.learning.info.add.comment.required" />
-			</div>
-		</c:if>
 
 		<input type="submit" value='<fmt:message key="label.preview.post" />'
 				class="btn btn-default btn-disable-on-submit voffset5" onclick="addNewComment(${itemUid})"/>
 	</div>
+	
 </c:if>
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
diff -u -raff1ef425c76fe6a2051694c0fdf833265459710 -r7c46c69de0269005bc00c1e5fd5347f6fe306790
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision aff1ef425c76fe6a2051694c0fdf833265459710)
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7c46c69de0269005bc00c1e5fd5347f6fe306790)
@@ -15,7 +15,7 @@
 					<div class="panel-title pull-left" data-toggle="collapse" data-target="#collapse${item.uid}">
 						<c:out value="${item.title}" escapeXml="true" /> 
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
-								[<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true" />]
+							[<c:out value="${item.createBy.firstName} ${item.createBy.lastName}" escapeXml="true" />]
 						</c:if>
 						<c:if test="${item.required}">
 							*
@@ -28,16 +28,17 @@
 								<i title="<fmt:message key='label.completed' />" class="fa fa-lg fa-check text-success"></i>
 							</c:when>
 
-							<c:when
-								test="${(mode != 'teacher') && (not finishedLock) && (not taskList.sequentialOrder || itemDTO.previousTaskCompleted) 
+							<c:when test="${(mode != 'teacher') && (not finishedLock) && (not taskList.sequentialOrder || itemDTO.previousTaskCompleted) 
 									&& itemDTO.commentRequirementsMet && itemDTO.attachmentRequirementsMet}">
-								<a href="javascript:;" onclick="return completeItem(${item.uid})"> <i class="fa fa-lg fa-square-o"></i>
-
+								<a href="javascript:;" onclick="return completeItem(${item.uid})"> 
+									<i class="fa fa-lg fa-square-o"></i>
 								</a>
 							</c:when>
 
 							<c:otherwise>
-								<i class="fa fa-lg fa-minus"></i>
+								<i id="item-faminus-${item.uid}" class="fa fa-lg fa-minus" 
+									data-waiting-for-comment="${(mode != 'teacher') && (not finishedLock) && (not taskList.sequentialOrder || itemDTO.previousTaskCompleted) 
+									&& !itemDTO.commentRequirementsMet && itemDTO.attachmentRequirementsMet}"></i>
 							</c:otherwise>
 						</c:choose>
 					</div>