Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.20 -r1.21
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	3 Jun 2008 01:57:55 -0000	1.20
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	3 Jun 2008 02:25:54 -0000	1.21
@@ -89,7 +89,6 @@
 label.learning.wait.for.monitor.verification  =You cannot finish this activity until it is reviewed by your teacher. Click "Check for new" to see if the review is complete
 label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to change the status of any tasks.
 label.learning.responses.locked.reminder  =The instructor has set this activity to not allow changes after you have finished it. You are able to see all Tasks, but not allowed to change them anymore.
-label.learning.info.comment.and.attachment.required  =You are required to post a comment and upload an attachment to complete this task.
 label.learning.info.add.comment.required  =You are required to add a comment to complete this task
 label.learning.info.upload.file.required  =You are required to upload a file to complete this task
 label.learning.info.sequential.order  =Tasks need to be completed in sequential order
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.19 -r1.20
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	3 Jun 2008 01:57:55 -0000	1.19
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	3 Jun 2008 02:25:54 -0000	1.20
@@ -74,7 +74,6 @@
 label.learning.wait.for.monitor.verification  =You cannot finish this activity until it is reviewed by your teacher. Click "Check for new" to see if the review is complete
 label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to change the status of any tasks.
 label.learning.responses.locked.reminder  =The instructor has set this activity to not allow changes after you have finished it. You are able to see all Tasks, but not allowed to change them anymore.
-label.learning.info.comment.and.attachment.required  =You are required to post a comment and upload an attachment to complete this task.
 label.learning.info.add.comment.required  =You are required to add a comment to complete this task
 label.learning.info.upload.file.required  =You are required to upload a file to complete this task
 label.learning.info.sequential.order  =Tasks need to be completed in sequential order
Index: lams_tool_task/conf/language/rams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/rams/Attic/ApplicationResources.properties,v
diff -u -r1.14 -r1.15
--- lams_tool_task/conf/language/rams/ApplicationResources.properties	3 Jun 2008 01:57:55 -0000	1.14
+++ lams_tool_task/conf/language/rams/ApplicationResources.properties	3 Jun 2008 02:25:54 -0000	1.15
@@ -89,7 +89,6 @@
 label.learning.wait.for.monitor.verification  =You cannot finish this activity until it is reviewed by your teacher. Click "Check for new" to see if the review is complete
 label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to change the status of any tasks.
 label.learning.responses.locked.reminder  =The instructor has set this activity to not allow changes after you have finished it. You are able to see all Tasks, but not allowed to change them anymore.
-label.learning.info.comment.and.attachment.required  =You are required to post a comment and upload an attachment to complete this task.
 label.learning.info.add.comment.required  =You are required to add a comment to complete this task
 label.learning.info.upload.file.required  =You are required to upload a file to complete this task
 label.learning.info.sequential.order  =Tasks need to be completed in sequential order
Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/conf/language/rams/Attic/ApplicationResources_en_AU.properties,v
diff -u -r1.14 -r1.15
--- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	3 Jun 2008 01:57:55 -0000	1.14
+++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	3 Jun 2008 02:25:54 -0000	1.15
@@ -89,7 +89,6 @@
 label.learning.wait.for.monitor.verification  =You cannot finish this activity until it is reviewed by your teacher. Click "Check for new" to see if the review is complete
 label.learning.responses.locked  =Note: After you click on "Next Activity" and you come back to this Task List, you won't be able to change the status of any tasks.
 label.learning.responses.locked.reminder  =The instructor has set this activity to not allow changes after you have finished it. You are able to see all Tasks, but not allowed to change them anymore.
-label.learning.info.comment.and.attachment.required  =You are required to post a comment and upload an attachment to complete this task.
 label.learning.info.add.comment.required  =You are required to add a comment to complete this task
 label.learning.info.upload.file.required  =You are required to upload a file to complete this task
 label.learning.info.sequential.order  =Tasks need to be completed in sequential order
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.15 -r1.16
--- lams_tool_task/web/pages/learning/learning.jsp	3 Jun 2008 01:57:55 -0000	1.15
+++ lams_tool_task/web/pages/learning/learning.jsp	3 Jun 2008 02:25:54 -0000	1.16
@@ -84,6 +84,12 @@
 			${taskList.title}
 		</h1>
 		
+ 	   	<%@ include file="/common/messages.jsp"%>
+
+		<p>
+			${taskList.instructions}
+		</p>
+		
 		<c:if test="${(mode != 'teacher') && taskList.lockWhenFinished}">
 	    	<div class="info space-bottom">
 		   		<c:choose>
@@ -102,12 +108,6 @@
 				<fmt:message key="label.learning.info.sequential.order" />								
 			</div>
 	   </c:if>
-	   
-	   	<%@ include file="/common/messages.jsp"%>
-
-		<p>
-			${taskList.instructions}
-		</p>
 		
 		<!--TaskListItems table-->
 		
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.3 -r1.4
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	3 Jun 2008 01:44:37 -0000	1.3
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	3 Jun 2008 02:25:54 -0000	1.4
@@ -1,16 +1,42 @@
 <html:form action="learning/addNewComment" method="post" enctype="multipart/form-data">
 
 	<p>${item.description}</p>
-
+<!-- 	
+					<c:if test="${mode != 'teacher' && (!itemDTO.commentRequirementsMet || !itemDTO.attachmentRequirementsMet)}">
+						<div class="info space-bottom">
+							<c:choose>
+								<c:when test="${!itemDTO.commentRequirementsMet && !itemDTO.attachmentRequirementsMet}">
+									<fmt:message key="label.learning.info.comment.and.attachment.required" />		
+								</c:when>
+								<c:when test="${!itemDTO.commentRequirementsMet}">
+									<fmt:message key="label.learning.info.add.comment.required" />		
+								</c:when>							
+								<c:when test="${!itemDTO.attachmentRequirementsMet}">
+									<fmt:message key="label.learning.info.upload.file.required" />	
+								</c:when>							
+							</c:choose>
+						</div>
+					</c:if>
+ -->
 	<c:if test="${item.commentsFilesAllowed}">
 				
 		<!-- Comments Part -->
 		<c:if test="${item.commentsAllowed}">
-		
-			<br/><br/>
+
+			<c:choose>
+				<c:when test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
+					<div class="info space-bottom">
+						<fmt:message key="label.learning.info.add.comment.required" />
+					</div>
+				</c:when>
+				<c:otherwise>
+					<br/>
+				</c:otherwise>
+			</c:choose>
+					
 			<%@ include file="commentlist.jsp"%>
 				
-			<c:if test="${sessionMap.mode != 'teacher'}">
+			<c:if test="${mode != 'teacher'}">
 				<div class="field-name">
 					<fmt:message key="label.preview.add.comment" />
 				</div>
@@ -28,6 +54,18 @@
 						
 		<!-- Uploaded Attachments -->	
 		<c:if test="${item.filesAllowed}">
+		
+			<c:choose>
+				<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
+					<div class="info space-bottom">
+						<fmt:message key="label.learning.info.upload.file.required" />
+					</div>
+				</c:when>
+				<c:otherwise>
+					<br/>
+				</c:otherwise>
+			</c:choose>
+		
 			<%@ include file="filelist.jsp"%>
 						
 			<c:if test="${sessionMap.mode != 'teacher'}">
Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/learning/parts/itemlist.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_task/web/pages/learning/parts/itemlist.jsp	3 Jun 2008 01:44:36 -0000	1.7
+++ lams_tool_task/web/pages/learning/parts/itemlist.jsp	3 Jun 2008 02:25:54 -0000	1.8
@@ -87,22 +87,6 @@
 						</c:if>
 					</a>
 					
-					<c:if test="${mode != 'teacher' && (!itemDTO.commentRequirementsMet || !itemDTO.attachmentRequirementsMet)}">
-						<div class="info space-bottom">
-							<c:choose>
-								<c:when test="${!itemDTO.commentRequirementsMet && !itemDTO.attachmentRequirementsMet}">
-									<fmt:message key="label.learning.info.comment.and.attachment.required" />		
-								</c:when>
-								<c:when test="${!itemDTO.commentRequirementsMet}">
-									<fmt:message key="label.learning.info.add.comment.required" />		
-								</c:when>							
-								<c:when test="${!itemDTO.attachmentRequirementsMet}">
-									<fmt:message key="label.learning.info.upload.file.required" />	
-								</c:when>							
-							</c:choose>
-						</div>
-					</c:if>
-					
 					<c:choose>
 						<c:when test="${itemDTO.displayedOpen}">
 							<c:set var="displayStyle" value="block" />