Fisheye: Tag 51be38d48e8f9c99179c0c92dcee3257262d5bd8 refers to a dead (removed) revision in file `lams_tool_task/web/pages/reviewtask/commentlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/reviewtask/filelist.jsp
===================================================================
diff -u
--- lams_tool_task/web/pages/reviewtask/filelist.jsp	(revision 0)
+++ lams_tool_task/web/pages/reviewtask/filelist.jsp	(revision 51be38d48e8f9c99179c0c92dcee3257262d5bd8)
@@ -0,0 +1,34 @@
+<div>
+	<c:set var="fileList" value="${sessionMap.taskListItemAttachmentList}" />
+	 
+	<c:if test="${(fn:length(fileList) != 0)}">
+		<div class="field-name">
+			<fmt:message key="label.preview.filelist" />
+		</div>
+	</c:if>
+							
+	<%-- Display target file type --%>
+	<ul>
+		<c:forEach var="file" items="${fileList}">
+			<c:if test="${sessionMap.taskListItem.showCommentsToAll || (sessionMap.userLogin == file.createBy.loginName) || (sessionMap.mode == 'teacher')}">
+			
+				<li>
+					<c:out value="${file.fileName}" />
+												
+					<c:if test="${file.createBy != null}">
+						[${file.createBy.loginName}]
+					</c:if>
+													
+					<c:set var="downloadURL">
+						<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+					</c:set>
+					<html:link href="${downloadURL}">
+						<fmt:message key="label.download" />
+					</html:link>
+												
+				</li>
+			</c:if>
+		</c:forEach>
+	</ul>
+	<br/>
+</div>
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>
Fisheye: Tag 51be38d48e8f9c99179c0c92dcee3257262d5bd8 refers to a dead (removed) revision in file `lams_tool_task/web/pages/reviewtask/start.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 51be38d48e8f9c99179c0c92dcee3257262d5bd8 refers to a dead (removed) revision in file `lams_tool_task/web/pages/reviewtask/taskfilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/reviewtask/topicview.jsp
===================================================================
diff -u -r5d767fb50e700c22e857db49f7ec2ab40d4e3744 -r51be38d48e8f9c99179c0c92dcee3257262d5bd8
--- lams_tool_task/web/pages/reviewtask/topicview.jsp	(.../topicview.jsp)	(revision 5d767fb50e700c22e857db49f7ec2ab40d4e3744)
+++ lams_tool_task/web/pages/reviewtask/topicview.jsp	(.../topicview.jsp)	(revision 51be38d48e8f9c99179c0c92dcee3257262d5bd8)
@@ -8,13 +8,13 @@
 
 <c:forEach var="comment" items="${sessionMap.taskListItemCommentList}">
 
-	<c:if test="${sessionMap.taskListItem.showCommentsToAll || (sessionMap.userLogin == comment.createBy.loginName)}">
+	<c:if test="${sessionMap.taskListItem.showCommentsToAll || (sessionMap.userLogin == comment.createBy.loginName) || (sessionMap.mode == 'teacher')}">
 	
 		<div>
 			<table cellspacing="0" class="forum">
 				<tr>
 					<th >
-						<fmt:message key="lable.topic.subject.by" />
+						<fmt:message key="lable.preview.by" />
 						<c:set var="author" value="${comment.createBy.loginName}" />
 						<c:if test="${empty author}">
 							<c:set var="author">