Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -53,7 +53,7 @@
 			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile" >
-			<forward name="success" path="/jsps/authoring/parts/onlinefilelist.jsp" />
+			<forward name="success" path="/jsps/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		
 		<action path="/authoring/deleteOffline"
@@ -62,7 +62,7 @@
 			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile" >
-			<forward name="success" path="/jsps/authoring/parts/offlinefilelist.jsp" />
+			<forward name="success" path="/jsps/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		
 		<!--  ================= topics  =================  -->	
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
diff -u -rf6f0e93d2134d055aadd9414aee1b588f0669c19 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision f6f0e93d2134d055aadd9414aee1b588f0669c19)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	(.../ForumConstants.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -87,6 +87,7 @@
 	public static final String ATTR_TOPIC = "topic";
 	public static final String ATTR_USER= "user";
 	public static final String ATTR_REPORT = "report";
+	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 	
 	public static final String PARAM_UPDATE_MODE = "updateMode";
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r5ee472bdb1fdd38e158d594915e5b10354042f15 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5ee472bdb1fdd38e158d594915e5b10354042f15)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java	(.../AuthoringAction.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -448,20 +448,6 @@
 		//add to attachmentList
 		attachmentList.add(att);
 		
-		//update Html FORM, this will echo back to web page for display
-		List onlineFileList = new ArrayList();
-		List offlineFileList = new ArrayList();
-		iter = attachmentList.iterator();
-		while(iter.hasNext()){
-			Attachment attFile = (Attachment) iter.next();
-			if(StringUtils.equalsIgnoreCase(attFile.getFileType(),IToolContentHandler.TYPE_OFFLINE))
-				offlineFileList.add(attFile);
-			else
-				onlineFileList.add(attFile);
-		}
-		forumForm.setOnlineFileList(onlineFileList);
-		forumForm.setOfflineFileList(offlineFileList);
-		
 		return mapping.findForward("success");
 
 	}
@@ -512,24 +498,18 @@
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		Attachment existAtt;
-		List leftAttachments = new ArrayList();
 		while(iter.hasNext()){
 			existAtt = (Attachment) iter.next();
 			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
-			}else if(StringUtils.equals(existAtt.getFileType(),type) ){
-				leftAttachments.add(existAtt);
 			}
 				
 		}
-
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			request.setAttribute("offlineFileList",leftAttachments);
-		}else{
-			request.setAttribute("onlineFileList",leftAttachments);
-		}
+		
+		request.setAttribute(ForumConstants.ATTR_FILE_TYPE_FLAG, type);
+		request.setAttribute(ForumConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		return mapping.findForward("success");
 	}
 	
@@ -900,7 +880,6 @@
 			//define it later mode(TEACHER) skip below validation.
 			String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
 			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
-				mapping.setInput("/defineLater");
 				return errors;
 			}
 			if(!form.getForum().isAllowRichEditor()){
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r782adea1cca29c0a511e5ba358bfefb9a1dcc2c2 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 782adea1cca29c0a511e5ba358bfefb9a1dcc2c2)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -99,15 +99,15 @@
 			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile" >
-			<forward name="success" path="/jsps/authoring/parts/onlinefilelist.jsp" />
+			<forward name="success" path="/jsps/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		<action path="/authoring/deleteOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile" >
-			<forward name="success" path="/jsps/authoring/parts/offlinefilelist.jsp" />
+			<forward name="success" path="/jsps/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		<!--  ================= topics  =================  -->	
 		<action path="/authoring/newTopic"
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
diff -u -r3713058c6b00a5ea73f4b3eff667aba0c9d41534 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 3713058c6b00a5ea73f4b3eff667aba0c9d41534)
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	(.../instructions.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp" %>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -64,9 +65,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
 				<div id="onlinefileArea">
-					<%@ include file="parts/onlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
@@ -91,9 +92,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
 				<div id="offlinefileArea">
-					<%@ include file="parts/offlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
Index: lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u
--- lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp	(revision 0)
+++ lams_tool_forum/web/jsps/authoring/parts/instructionfilelist.jsp	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -0,0 +1,66 @@
+<%@ include file="/common/taglibs.jsp" %>
+<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="CONS_OFFLINE" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+<c:choose>
+	<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
+	</c:otherwise>
+</c:choose>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="fileList" value="${sessionMap.attachmentList}"/>
+
+<%-- check whehter has target file type --%>
+<c:forEach var="file" items="${fileList}">
+	<c:if test="${targetFileType == file.fileType}">
+		<c:set var="hasFile" value="${true}"/>
+	</c:if>
+</c:forEach>
+
+<%-- Display target file type --%>
+<c:if test="${hasFile}">
+	<table style="align:left;width:600px" border="0" >
+		<c:forEach var="file" items="${fileList}">
+			<c:if test="${targetFileType == file.fileType}">
+			<tr>
+					<td>
+						<c:out value="${file.fileName}"/>
+					</td>
+					<td width="80px" align="center">
+						<c:set var="viewURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewURL}','offlinefile')" styleClass="button">
+							<fmt:message key="label.view"/>
+						</html:link>
+					</td>
+					<td width="100px" align="center">
+						<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						</c:set>
+						<html:link href="${downloadURL}"  styleClass="button">
+							<fmt:message key="label.download"/>
+						</html:link>
+					</td>
+					<td width="80px" align="center">
+					<c:choose>
+						<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+							<html:link href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+								<fmt:message key="label.authoring.offline.delete"/>
+							</html:link>
+						</c:when>
+						<c:otherwise>
+							<html:link href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" styleClass="button">
+								<fmt:message key="label.authoring.online.delete"/>
+							</html:link>
+						</c:otherwise>
+					</c:choose>
+					</td>				
+				</tr>			
+			</c:if>
+		</c:forEach>
+	</table>
+</c:if>
\ No newline at end of file
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/parts/offlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/parts/onlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/reload_2_0_1/castor-0.9.5.3-xml.jar"/>
 	<classpathentry kind="lib" path="lib/reload_2_0_1/jdom.jar"/>
 	<classpathentry kind="lib" path="lib/reload_2_0_1/moonunitsrc.jar"/>
@@ -20,5 +19,6 @@
 	<classpathentry sourcepath="/lams_common" kind="lib" path="/lams_build/lib/lams/lams.jar"/>
 	<classpathentry sourcepath="/lams_learning" kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
 	<classpathentry sourcepath="/lams_central/src" kind="lib" path="/lams_build/lib/lams/lams-central.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r12fef57b1c4aea30f19676803c58600da0a5a167 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 12fef57b1c4aea30f19676803c58600da0a5a167)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -59,15 +59,15 @@
 			scope="request" 
 			validate="false"
 			parameter="deleteOnlineFile">
-			<forward name="success" path="/pages/authoring/parts/onlinefilelist.jsp" />
+			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		<action path="/authoring/deleteOfflineFile"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="resourceForm" 
 			scope="request" 
 			validate="false"
 			parameter="deleteOfflineFile">
-			<forward name="success" path="/pages/authoring/parts/offlinefilelist.jsp" />
+			<forward name="success" path="/pages/authoring/parts/instructionfilelist.jsp" />
 		</action>
 		<!-- ==========  Resource Item : URL ========== -->
 		<action path="/authoring/newItemInit"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r92e8b8d1454cfbd9ae8a20934a677340dac3b507 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -74,6 +74,7 @@
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 	public static final Object ATTR_RESOURCE_FORM = "resourceForm";
 	public static final String ATTR_ADD_RESOURCE_TYPE = "addType";
+	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
 	
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r92e8b8d1454cfbd9ae8a20934a677340dac3b507 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -455,6 +455,16 @@
 		
 		ToolAccessMode mode = getAccessMode(request);
     	
+		ActionMessages errors = validate(resourceForm, mapping, request);
+		if(!errors.isEmpty()){
+			saveErrors(request, errors);
+			if(mode.isAuthor())
+	    		return mapping.findForward("author");
+	    	else
+	    		return mapping.findForward("monitor");			
+		}
+			
+		
 		Resource resource = resourceForm.getResource();
 		IResourceService service = getResourceService();
 		
@@ -585,7 +595,7 @@
     	else
     		return mapping.findForward("monitor");
 	}
-	
+
 	/**
 	 * Handle upload online instruction files request. 
 	 * @param mapping
@@ -654,22 +664,7 @@
 		}
 		//add to attachmentList
 		attachmentList.add(att);
-		
-		//update Html FORM, this will echo back to web page for display
-		List onlineFileList = new ArrayList();
-		List offlineFileList = new ArrayList();
-		iter = attachmentList.iterator();
-		while(iter.hasNext()){
-			ResourceAttachment attFile = (ResourceAttachment) iter.next();
-			if(StringUtils.equalsIgnoreCase(attFile.getFileType(),IToolContentHandler.TYPE_OFFLINE))
-				offlineFileList.add(attFile);
-			else
-				onlineFileList.add(attFile);
-		}
-		resourceForm.setOnlineFileList(onlineFileList);
-		resourceForm.setOfflineFileList(offlineFileList);
-		
-		
+
 		return mapping.findForward(ResourceConstants.SUCCESS);
 
 	}
@@ -721,24 +716,17 @@
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		ResourceAttachment existAtt;
-		List leftAttachments = new ArrayList();
 		while(iter.hasNext()){
 			existAtt = (ResourceAttachment) iter.next();
 			if(existAtt.getFileUuid().equals(uuID) && existAtt.getFileVersionId().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
-			}else if(StringUtils.equals(existAtt.getFileType(),type) ){
-				leftAttachments.add(existAtt);
 			}
-				
 		}
 
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			request.setAttribute("offlineFileList",leftAttachments);
-		}else{
-			request.setAttribute("onlineFileList",leftAttachments);
-		}
+		request.setAttribute(ResourceConstants.ATTR_FILE_TYPE_FLAG, type);
+		request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 
 	}
@@ -1049,5 +1037,24 @@
 			mode = ToolAccessMode.AUTHOR;
 		return mode;
 	}
+	
+	
+	private ActionMessages validate(ResourceForm resourceForm, ActionMapping mapping, HttpServletRequest request) {
+		ActionMessages errors = new ActionMessages();
+		if (StringUtils.isBlank(resourceForm.getResource().getTitle())) {
+			ActionMessage error = new ActionMessage("error.resource.item.title.blank");
+			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		}
+		//define it later mode(TEACHER) skip below validation.
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+		if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
+			return errors;
+		}
 
+		//Some other validation outside basic Tab.
+		
+		return errors;
+	}
+
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceForm.java	(.../ResourceForm.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -32,9 +32,9 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.upload.FormFile;
-import org.apache.struts.validator.ValidatorForm;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
@@ -46,7 +46,7 @@
  *
  * User: Dapeng.Ni
  */
-public class ResourceForm extends ValidatorForm {
+public class ResourceForm extends ActionForm  {
 	private static final long serialVersionUID = 3599879328307492312L;
 
 	private static Logger logger = Logger.getLogger(ResourceForm.class.getName());
@@ -56,8 +56,6 @@
 	private int currentTab;
     private FormFile offlineFile;
     private FormFile onlineFile;
-    private List onlineFileList;
-    private List offlineFileList;
 
     private Resource resource;
     
@@ -70,21 +68,7 @@
 	public void setResource(Resource resource) {
         this.resource = resource;
         //set Form special varaible from given forum
-        if(resource != null){
-    		onlineFileList = new ArrayList();
-    		offlineFileList = new ArrayList();
-    		Set fileSet = resource.getAttachments();
-    		if(fileSet != null){
-    			Iterator iter = fileSet.iterator();
-    			while(iter.hasNext()){
-    				ResourceAttachment file = (ResourceAttachment) iter.next();
-    				if(StringUtils.equalsIgnoreCase(file.getFileType(),IToolContentHandler.TYPE_OFFLINE))
-    					offlineFileList.add(file);
-    				else
-    					onlineFileList.add(file);
-    			}
-    		}
-        }else{
+        if(resource == null){
         	logger.error("Initial ResourceForum failed by null value of Resource.");
         }
 	}
@@ -122,16 +106,6 @@
 	}
 
 
-	public List getOfflineFileList() {
-		return offlineFileList;
-	}
-
-
-	public void setOfflineFileList(List offlineFileList) {
-		this.offlineFileList = offlineFileList;
-	}
-
-
 	public FormFile getOnlineFile() {
 		return onlineFile;
 	}
@@ -142,16 +116,6 @@
 	}
 
 
-	public List getOnlineFileList() {
-		return onlineFileList;
-	}
-
-
-	public void setOnlineFileList(List onlineFileList) {
-		this.onlineFileList = onlineFileList;
-	}
-
-
 	public Resource getResource() {
 		return resource;
 	}
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -110,14 +110,12 @@
 		<!-- start tabs -->
 <div id="content">
 		<!-- end tab buttons -->
-			<table align=center>
-				<tr>
-					<td NOWRAP>
-						<%@ include file="/common/messages.jsp"%>
-					</td>
-				</tr>
-			</table>
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+		<table>
+		<tr><td>
+		<%@ include file="/common/messages.jsp"%>
+		</td></tr>
+		</table>
+		<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="resource.contentId" />
 		<html:hidden property="sessionMapID" />
Index: lams_tool_larsrc/web/pages/authoring/definelater.jsp
===================================================================
diff -u -rec2ed8e2ffbf43dfb85b57cb358e50f23187e0c7 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision ec2ed8e2ffbf43dfb85b57cb358e50f23187e0c7)
+++ lams_tool_larsrc/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -65,6 +65,12 @@
 		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
 </div>
 <div id="content">
+		<table>
+		<tr><td>
+		<%@ include file="/common/messages.jsp"%>
+		</td></tr>
+		</table>
+
 		<!-- end tab buttons -->
 		<div class="tabbody">
 			<!-- tab content 1 (Basic) -->
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -1,5 +1,7 @@
 <%@ include file="/common/taglibs.jsp" %>
+<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -64,9 +66,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
 				<div id="onlinefileArea">
-					<%@ include file="parts/onlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
@@ -91,9 +93,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
 				<div id="offlinefileArea">
-					<%@ include file="parts/offlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructionfilelist.jsp	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -0,0 +1,65 @@
+<%@ include file="/common/taglibs.jsp" %>
+<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="CONS_OFFLINE" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+<c:choose>
+	<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
+	</c:otherwise>
+</c:choose>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="fileList" value="${sessionMap.instructionAttachmentList}"/>
+
+<%-- check whehter has target file type --%>
+<c:forEach var="file" items="${fileList}">
+	<c:if test="${targetFileType == file.fileType}">
+		<c:set var="hasFile" value="${true}"/>
+	</c:if>
+</c:forEach>
+
+<%-- Display target file type --%>
+<c:if test="${hasFile}">
+	<table style="align:left;width:600px" border="0" >
+		<c:forEach var="file" items="${fileList}">
+			<c:if test="${targetFileType == file.fileType}">
+				<tr>
+					<td>
+						<c:out value="${file.fileName}"/>
+					</td>
+					<td width="80px" align="center">
+						<c:set var="viewURL">
+							<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=false"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewURL}','instructionfile')" styleClass="button">
+							<fmt:message key="label.view"/>
+						</html:link>
+					</td>
+					<td width="100px" align="center">
+						<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true"/>
+						</c:set>
+						<html:link href="${downloadURL}"  styleClass="button">
+							<fmt:message key="label.download"/>
+						</html:link>
+					</td>
+					<td width="80px" align="center">
+						<c:choose>
+							<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+								<a href="#" onclick="deleteOfflineFile(${file.fileUuid},${file.fileVersionId})" class="button">
+									<fmt:message key="label.authoring.offline.delete"/>
+								</a>
+							</c:when>
+							<c:otherwise>
+								<a href="#" onclick="deleteOnlineFile(${file.fileUuid},${file.fileVersionId})" class="button">
+									<fmt:message key="label.authoring.online.delete"/>
+								</a>
+							</c:otherwise>
+						</c:choose>
+					</td>				
+				</tr>
+			</c:if>
+		</c:forEach>
+	</table>
+</c:if>
\ No newline at end of file
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/parts/offlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/authoring/parts/onlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
diff -u -rbff038af25a9dce095ea65bf2e7bc3943d9160ad -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bff038af25a9dce095ea65bf2e7bc3943d9160ad)
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -110,3 +110,4 @@
 
 
 #======= End labels: Exported 101 labels for en AU =====
+error.title.blank =Title can not be blank.
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	(.../SbmtConstants.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -41,4 +41,9 @@
 	public static final String ATTACHMENT_LIST = "attachmentList";
 	public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList";
 	public static final String PAGE_EDITABLE = "isPageEditable";
+	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
+
+	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
+
 }
+
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java
===================================================================
diff -u -r543fd272dab584d5c2f0052df9413709f400821c -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 543fd272dab584d5c2f0052df9413709f400821c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java	(.../AuthoringAction.java)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -26,11 +26,9 @@
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -72,8 +70,9 @@
  *                validate="false"
  * 
  * @struts.action-forward name="success" path="/authoring/authoring.jsp"
- * @struts.action-forward name="onlineFileList" path="/authoring/parts/onlinefilelist.jsp"
- * @struts.action-forward name="offlineFileList" path="/authoring/parts/offlinefilelist.jsp"
+ * @struts.action-forward name="author" path="/authoring/authoring.jsp"
+ * @struts.action-forward name="monitor" path="/authoring/definelater.jsp"
+ * @struts.action-forward name="instructionFileList" path="/authoring/parts/instructionfilelist.jsp"
  */
 public class AuthoringAction extends LamsDispatchAction {
 	private Logger log = Logger.getLogger(AuthoringAction.class);
@@ -161,6 +160,15 @@
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(authForm.getSessionMapID());
 		
 		ToolAccessMode mode = SbmtWebUtils.getAccessMode(request);
+		ActionMessages errors = validate(authForm, mapping, request);
+		if(!errors.isEmpty()){
+			saveErrors(request, errors);
+			if(mode.isAuthor())
+	    		return mapping.findForward("author");
+	    	else
+	    		return mapping.findForward("monitor");			
+		}
+		
 		SubmitFilesContent content = getContent(form);
 		
 		submitFilesService = getService();
@@ -222,7 +230,8 @@
 //				if it is Teacher, then just update basic tab content (definelater)
 				persistContent.setInstruction(content.getInstruction());
 				persistContent.setTitle(content.getTitle());
-				persistContent.setDefineLater(false);
+				persistContent.setDefineLater(content.isDefineLater());
+				persistContent.setRunOffline(content.isRunOffline());
 			}
 			
 			submitFilesService.saveOrUpdateContent(persistContent);
@@ -232,7 +241,10 @@
 		
 		//to jump to common success page in lams_central
 		request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
-		return mapping.findForward("success");
+    	if(mode.isAuthor())
+    		return mapping.findForward("author");
+    	else
+    		return mapping.findForward("monitor");
 	}
 	/**
 	 * Handle upload online instruction files request. Once the file uploaded successfully, database
@@ -309,20 +321,6 @@
 		}
 		//add to attachmentList
 		attachmentList.add(att);
-
-		//update Html FORM, this will echo back to web page for display
-		List onlineFileList = new ArrayList();
-		List offlineFileList = new ArrayList();
-		iter = attachmentList.iterator();
-		while(iter.hasNext()){
-			InstructionFiles attFile = (InstructionFiles) iter.next();
-			if(StringUtils.equalsIgnoreCase(attFile.getType(),IToolContentHandler.TYPE_OFFLINE))
-				offlineFileList.add(attFile);
-			else
-				onlineFileList.add(attFile);
-		}
-		authForm.setOnlineFileList(onlineFileList);
-		authForm.setOfflineFileList(offlineFileList);
 		
 		return mapping.getInputForward();
 
@@ -346,7 +344,7 @@
 	private ActionForward deleteFile(ActionMapping mapping,ActionForm form,HttpServletRequest request, HttpServletResponse response, String type) {
 		Long versionID = new Long(WebUtil.readLongParam(request,"fileVersionId"));
 		Long uuID = new Long(WebUtil.readLongParam(request,"fileUuid"));
-		String sessionMapID = WebUtil.readStrParam(request, "sessionMapID");
+		String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
 		
 		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 		
@@ -356,26 +354,18 @@
 		//first check exist attachment and delete old one (if exist) to deletedAttachmentList
 		Iterator iter = attachmentList.iterator();
 		InstructionFiles existAtt;
-		List leftAttachments = new ArrayList();
 		while(iter.hasNext()){
 			existAtt = (InstructionFiles) iter.next();
 			if(existAtt.getUuID().equals(uuID) && existAtt.getVersionID().equals(versionID)){
 				//if there is same name attachment, delete old one
 				deleteAttachmentList.add(existAtt);
 				iter.remove();
-			}else if(StringUtils.equals(existAtt.getType(),type) ){
-				leftAttachments.add(existAtt);
 			}
-				
 		}
-
-		if(StringUtils.equals(IToolContentHandler.TYPE_OFFLINE,type)){
-			request.setAttribute("offlineFileList",leftAttachments);
-			return mapping.findForward("offlineFileList");
-		}else{
-			request.setAttribute("onlineFileList",leftAttachments);
-			return mapping.findForward("onlineFileList");
-		}
+		
+		request.setAttribute(SbmtConstants.ATTR_FILE_TYPE_FLAG, type);
+		request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		return mapping.findForward("instructionFileList");
 	}
 
 	//***********************************************************
@@ -449,4 +439,22 @@
 			return submitFilesService;
 	}
 		
-}
+	private ActionMessages validate(AuthoringForm sbmtForm, ActionMapping mapping, HttpServletRequest request) {
+		ActionMessages errors = new ActionMessages();
+		if (StringUtils.isBlank(sbmtForm.getTitle())) {
+			ActionMessage error = new ActionMessage("error.title.blank");
+			errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+		}
+		//define it later mode(TEACHER) skip below validation.
+		String modeStr = request.getParameter(AttributeNames.ATTR_MODE);
+		if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
+			return errors;
+		}
+
+		//Some other validation outside basic Tab.
+		
+		return errors;
+	}
+
+
+}
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -143,15 +143,20 @@
         redirect="false"
       />
       <forward
-        name="onlineFileList"
-        path="/authoring/parts/onlinefilelist.jsp"
+        name="author"
+        path="/authoring/authoring.jsp"
         redirect="false"
       />
       <forward
-        name="offlineFileList"
-        path="/authoring/parts/offlinefilelist.jsp"
+        name="monitor"
+        path="/authoring/definelater.jsp"
         redirect="false"
       />
+      <forward
+        name="instructionFileList"
+        path="/authoring/parts/instructionfilelist.jsp"
+        redirect="false"
+      />
     </action>
 
    <!-- ========== Action Mapping Definitions ============================== -->
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
diff -u -rdddca323fde3074e9e913d5fb031e7dc95cf5aac -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision dddca323fde3074e9e913d5fb031e7dc95cf5aac)
+++ lams_tool_sbmt/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -73,6 +73,12 @@
 		</div>
 
 		<div id="content">
+			<table>
+			<tr><td>
+			<%@ include file="/common/messages.jsp"%>
+			</td></tr>
+			</table>
+			
 			<html:form action="authoring" method="post" styleId="authoringForm" enctype="multipart/form-data">
 				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 			
@@ -81,7 +87,6 @@
 				<html:hidden property="toolContentID" />
 				<html:hidden property="currentTab" styleId="currentTab" />
 				<html:hidden property="dispatch" value="updateContent" />
-				<%@ include file="/common/messages.jsp"%>
 
 				<!-- tab content 1 (Basic) -->
 				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
Index: lams_tool_sbmt/web/authoring/definelater.jsp
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/web/authoring/definelater.jsp	(.../definelater.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -58,12 +58,10 @@
 			<!-- end tab buttons -->
 		</div>
 		<div id="content">
-			<table align=center>
-				<tr>
-					<td NOWRAP>
-						<%@ include file="/common/messages.jsp"%>
-					</td>
-				</tr>
+			<table>
+			<tr><td>
+			<%@ include file="/common/messages.jsp"%>
+			</td></tr>
 			</table>
 			<html:form action="definelater" method="post" focus="title" styleId="authoringForm" enctype="multipart/form-data">
 				<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
diff -u -r17b9effc3c7ea57333aa800fff6d511689c32329 -r671e0f31315ba99ec13f82789869ce2a01e0ea04
--- lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 17b9effc3c7ea57333aa800fff6d511689c32329)
+++ lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp" %>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
 
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -64,9 +65,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="onlineFileList" value="${formBean.onlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
 				<div id="onlinefileArea">
-					<%@ include file="parts/onlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
@@ -91,9 +92,9 @@
 		</tr>
 		<tr>
 			<td colspan="2">
-				<c:set var="offlineFileList" value="${formBean.offlineFileList}"/>
+				<c:set var="fileTypeFlag" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
 				<div id="offlinefileArea">
-					<%@ include file="parts/offlinefilelist.jsp" %>
+					<%@ include file="parts/instructionfilelist.jsp" %>
 				</div>
 			</td>
 		</tr>
Index: lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u
--- lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp	(revision 0)
+++ lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp	(revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
@@ -0,0 +1,66 @@
+<%@ include file="/common/taglibs.jsp" %>
+<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="CONS_OFFLINE" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+<c:choose>
+	<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_OFFLINE %>"/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="targetFileType" value="<%=IToolContentHandler.TYPE_ONLINE %>"/>
+	</c:otherwise>
+</c:choose>
+
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="fileList" value="${sessionMap.attachmentList}"/>
+
+<%-- check whehter has target file type --%>
+<c:forEach var="file" items="${fileList}">
+	<c:if test="${targetFileType == file.type}">
+		<c:set var="hasFile" value="${true}"/>
+	</c:if>
+</c:forEach>
+
+<%-- Display target file type --%>
+<c:if test="${hasFile}">
+	<table style="align:left;width:600px" border="0" >
+		<c:forEach var="file" items="${fileList}">
+			<c:if test="${targetFileType == file.type}">
+				<tr>
+					<td>
+						<c:out value="${file.name}"/>
+					</td>
+					<td width="80px" align="center">
+						<c:set var="viewURL">
+							<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=false"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewURL}','offlinefile')" styleClass="button">
+							<fmt:message key="label.view"/>
+						</html:link>
+					</td>
+					<td width="100px" align="center">
+						<c:set var="downloadURL">
+								<html:rewrite page="/download/?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true"/>
+						</c:set>
+						<html:link href="${downloadURL}"  styleClass="button">
+							<fmt:message key="label.download"/>
+						</html:link>
+					</td>
+					<td width="80px" align="center">
+						<c:choose>
+							<c:when test="${fileTypeFlag==CONS_OFFLINE}">
+								<html:link href="#" onclick="deleteOfflineFile(${file.uuID},${file.versionID})" styleClass="button">
+									<fmt:message key="label.authoring.offline.delete"/>
+								</html:link>
+							</c:when>
+							<c:otherwise>
+								<html:link href="#" onclick="deleteOnlineFile(${file.uuID},${file.versionID})" styleClass="button">
+									<fmt:message key="label.authoring.online.delete"/>
+								</html:link>
+							</c:otherwise>
+						</c:choose>
+					</td>				
+				</tr>			
+			</c:if>
+		</c:forEach>
+	</table>
+</c:if>
\ No newline at end of file
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/parts/offlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 671e0f31315ba99ec13f82789869ce2a01e0ea04 refers to a dead (removed) revision in file `lams_tool_sbmt/web/authoring/parts/onlinefilelist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?