Index: lams_tool_task/web/pages/reviewtask/reviewtask.jsp
===================================================================
diff -u -r5d767fb50e700c22e857db49f7ec2ab40d4e3744 -r51be38d48e8f9c99179c0c92dcee3257262d5bd8
--- lams_tool_task/web/pages/reviewtask/reviewtask.jsp	(.../reviewtask.jsp)	(revision 5d767fb50e700c22e857db49f7ec2ab40d4e3744)
+++ lams_tool_task/web/pages/reviewtask/reviewtask.jsp	(.../reviewtask.jsp)	(revision 51be38d48e8f9c99179c0c92dcee3257262d5bd8)
@@ -25,10 +25,23 @@
        		myForm.submit();
     	}
     	
-    	function completeItem(itemUid){
-			document.location.href = "<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=" + itemUid;
-			return false;
+//    	function completeItem(itemUid){
+	//		document.location.href = "<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&itemUid=" + itemUid;//&mode=${mode}
+		//	return false;
+		//}
+		
+		function completeItem(itemUid){
+			//learner and author(preview mode) will mark the finish
+			if(${sessionMap.mode == "learner"} || ${sessionMap.mode == "author"}){
+			   var reqIDVar = new Date();
+			    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&itemUid=" + itemUid;
+			}
+		   	if(window.parent.opener != null) {
+				window.parent.opener=null;
+				window.parent.close();
+			}
 		}
+		
 	</script>
 </lams:head>
 	
@@ -47,50 +60,53 @@
 				
 				<!-- Comments Part -->
 				<br/><br/>
-				<%@ include file="commentlist.jsp"%>
+				<%@ include file="topicview.jsp"%>
 				
 				<table class="forms">
 					
-					<tr>
-						<td>
-							<div class="field-name">
-								<fmt:message key="label.preview.leave.your.comment" />
-							</div>
-							<html:textarea property="comment" rows="3" style="width: 99%;"/>
-						</td>
-					</tr>
-					
-					<tr>
-						<td>
-							<div class="right-buttons">
-								<html:button property="newcomment"
-									onclick="javascript:addNewComment();" styleClass="button">
-									<fmt:message key="label.preview.post" />
-								</html:button>
-							</div> 
-						</td>
-					</tr>
+					<c:if test="${sessionMap.mode != 'teacher'}">
+						<tr>
+							<td>
+								<div class="field-name">
+									<fmt:message key="label.preview.leave.your.comment" />
+								</div>
+								<html:textarea property="comment" rows="3" style="width: 99%;"/>
+							</td>
+						</tr>
 						
+						<tr>
+							<td>
+								<div class="right-buttons">
+									<html:button property="newcomment"
+										onclick="javascript:addNewComment();" styleClass="button">
+										<fmt:message key="label.preview.post" />
+									</html:button>
+								</div> 
+							</td>
+						</tr>
+					</c:if>
+						
 					<!-- Uploaded Files -->	
 					<tr>
 						<td>
 							<%@ include file="filelist.jsp"%>
 						</td>
 					</tr>
-
-					<tr>
-						<td>
-							<div class="field-name">
-								<fmt:message key="label.preview.upload.file" />
-							</div>
-							<html:file property="uploadedFile">
-								<fmt:message key="label.authoring.choosefile.button" />
-							</html:file> 
-							<a href="#" onclick="javascript:doUpload();" class="button">
-								<fmt:message key="label.preview.upload.button" /> 
-							</a>
-						</td>
-					</tr>
+					<c:if test="${sessionMap.mode != 'teacher'}">
+						<tr>
+							<td>
+								<div class="field-name">
+									<fmt:message key="label.preview.upload.file" />
+								</div>
+								<html:file property="uploadedFile">
+									<fmt:message key="label.authoring.choosefile.button" />
+								</html:file> 
+								<a href="#" onclick="javascript:doUpload();" class="button">
+									<fmt:message key="label.preview.upload.button" /> 
+								</a>
+							</td>
+						</tr>
+					</c:if>
 				
 				</table>
 			</c:if>