Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -ra3da609771f1cedff31c3af15d26d6b69308fe97
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a3da609771f1cedff31c3af15d26d6b69308fe97)
@@ -62,13 +62,8 @@
 label.authoring.up  =Move Up
 label.authoring.down  =Move down
 label.authoring.conditions.add.condition  =Add Condition
-label.authoring.conditions  =
-label.authoring.conditions  =
-label.authoring.conditions  =
-label.authoring.conditions  =
 label.authoring.conditions.list.title  =Conditions
 label.authoring.conditions.condition.name  =Condition Name
-
 authoring.exception  =There is a problem in task list authoring page, the reason is {0}
 authoring.msg.cancel.save  =Do you want to close this window without saving?
 authoring.msg.no.tasks.save  =There must be at least one task to be saved.
@@ -86,6 +81,7 @@
 error.msg.invaid.param.upload  =InvalidParameterException occured while trying to upload File.
 error.msg.repository  =Repository occurs exception while trying to upload file.
 error.msg.default.content.not.find  =Could not retrieve default content record for this tool.
+warning.msg.authoring.deletion.affect.conditions  =Deletion of this item may affect existing conditions. Do you want to proceed?
 label.learning.title  =Task List Learning
 label.learning.heading  =Task List
 label.resoruce.to.review  =Resources to view
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
===================================================================
diff -u -r0e7e464ded505f35e6ade3811f3f74658668e13a -ra3da609771f1cedff31c3af15d26d6b69308fe97
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 0e7e464ded505f35e6ade3811f3f74658668e13a)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision a3da609771f1cedff31c3af15d26d6b69308fe97)
@@ -245,67 +245,8 @@
 				}
 			}
 		}
-
-//    	//save two pictures describing either the taskLisiItem is done or not
-//		handler.saveFile(attachment.getFileUuid(), FileUtil.getFullPath(directoryName, "images/completeitem.gif"));
-//		handler.saveFile(attachment.getFileUuid(), FileUtil.getFullPath(directoryName, "images/incompleteitem.gif"));
-		
-		
-//		String directoryPath = directoryName + File.separatorChar + "images";
-//		File dir = new File(directoryPath);
-//		if (!dir.mkdirs())  {
-//			logger.error("Unable to create directory for export portfolio: " + directoryPath);
-//		}
-//		
-//		 
-//		
-//		String completeItemName = "completeitem.gif";
-//		File completeItemFile = new File(directoryPath + completeItemName);
-//		copyFile(directoryPath + completeItemName, completeItemFile);
-//		
-//		String incompleteItemName = "incompleteitem.gif";
-//		File incompleteItemFile = new File(directoryPath + completeItemName);
-//		copyFile(directoryPath + incompleteItemName, incompleteItemFile);
 	}
     
-//	private void copyFile(String filePath, File file) throws IOException {
-//		
-//		FileInputStream is = new FileInputStream(file);
-//		OutputStream os = null;
-//		try {
-//			int bufLen = 1024; // 1 Kbyte
-//			byte[] buf = new byte[1024]; // output buffer
-//			os = new FileOutputStream(filePath);
-//
-//			BufferedInputStream in = new BufferedInputStream(is);
-//			int len = 0;
-//		    while((len = in.read(buf,0,bufLen)) != -1){
-//		    	os.write(buf,0,len);
-//		    }	
-//			
-//		} catch ( IOException e ) {
-//			String message = "Unable to write out file needed for export portfolio. File was "+filePath;	
-//			logger.error(message,e);
-//			throw e;
-//			
-//		} finally {
-//
-//			try {
-//				if ( is != null ) is.close();
-//			} catch (IOException e1) {
-//				String message = "Unable to close input export portfolio file due to IOException";
-//				logger.warn(message,e1);
-//			}
-//
-//			try {
-//				if ( os != null ) os.close();
-//			} catch (IOException e2) {
-//				String message = "Unable to close output export portfolio file due to IOException";
-//				logger.warn(message,e2);
-//			}
-//		}
-//	}
-
 	/**
 	 * {@inheritDoc}
 	 */
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -ra3da609771f1cedff31c3af15d26d6b69308fe97
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a3da609771f1cedff31c3af15d26d6b69308fe97)
@@ -34,28 +34,38 @@
 		}
 	}
 
-	function editItem(idx,sessionMapID){
-		 var reqIDVar = new Date();
+	function editItem(idx, sessionMapID){
+		var reqIDVar = new Date();
 		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		showMessage(url);
 	}
 	//The panel of taskList list panel
 	var taskListListTargetDiv = "taskListListArea";
-	function deleteItem(idx,sessionMapID){
-		var url = "<c:url value="/authoring/removeItem.do"/>";
-	    var reqIDVar = new Date();
-		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
-		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	taskListListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
-		    	}
-	    );
+	function deleteItem(idx, sessionMapID){
+		var deletionConfirmed = true;
+		
+		var containsConditions = document.getElementById("conditionTable").rows.length > 0;
+		if (containsConditions) {
+			deletionConfirmed = confirm('<fmt:message key="warning.msg.authoring.deletion.affect.conditions"></fmt:message>');
+ 		}
+		
+		if (deletionConfirmed) {
+			var url = "<c:url value="/authoring/removeItem.do"/>";
+		    var reqIDVar = new Date();
+			var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+			deleteItemLoading();
+		    var myAjax = new Ajax.Updater(
+			    	taskListListTargetDiv,
+			    	url,
+			    	{
+			    		method:'get',
+			    		parameters:param,
+			    		onComplete:deleteItemComplete,
+			    		evalScripts:true
+			    	}
+		    );
+ 		}
+		
 	}
 	function deleteItemLoading(){
 		showBusy(taskListListTargetDiv);
@@ -64,7 +74,7 @@
 		hideBusy(taskListListTargetDiv);
 	}
 	
-	function upQuestion(idx,sessionMapID){
+	function upQuestion(idx, sessionMapID){
 		var url = "<c:url value="/authoring/upItem.do"/>";
 	    var reqIDVar = new Date();
 		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
@@ -80,7 +90,7 @@
 		    	}
 	    );
 	}
-	function downQuestion(idx,sessionMapID){
+	function downQuestion(idx, sessionMapID){
 		var url = "<c:url value="/authoring/downItem.do"/>";
 	    var reqIDVar = new Date();
 		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
Index: lams_tool_task/web/pages/export/summaryTask.jsp
===================================================================
diff -u -rf976c3bd40613835d2b5ac91a1eee6748afbe2c7 -ra3da609771f1cedff31c3af15d26d6b69308fe97
--- lams_tool_task/web/pages/export/summaryTask.jsp	(.../summaryTask.jsp)	(revision f976c3bd40613835d2b5ac91a1eee6748afbe2c7)
+++ lams_tool_task/web/pages/export/summaryTask.jsp	(.../summaryTask.jsp)	(revision a3da609771f1cedff31c3af15d26d6b69308fe97)
@@ -58,11 +58,11 @@
 						<td align="center">
 							<c:choose>
 								<c:when test="${taskSummaryItem.completed}">
-									<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">
+									<img src="../images/tick.gif"	border="0">
 								</c:when>
 									
 								<c:otherwise>
-									<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>" border="0">
+									<img src="../images/cross.gif" border="0">
 								</c:otherwise>
 							</c:choose>
 						</td>