Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 -r342f067cfe700981c6ef564e918f774118e37626
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 342f067cfe700981c6ef564e918f774118e37626)
@@ -64,6 +64,8 @@
 label.authoring.conditions.add.condition  =Add Condition
 label.authoring.conditions.list.title  =Conditions
 label.authoring.conditions.condition.name  =Condition Name
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
 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.
Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 -r342f067cfe700981c6ef564e918f774118e37626
--- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2)
+++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 342f067cfe700981c6ef564e918f774118e37626)
@@ -12,29 +12,33 @@
 tool.display.name  =Task List Tool
 tool.description  =Tool for displaying task lisk.
 appName  =Task List
+errorPage.title  =Error page
+errorPage.heading  =Some error occurs when handling your request
 label.authoring.heading  =Task List
 label.authoring.title  =Task List Authoring
 label.authoring.heading.basic  =Basic
-label.authoring.heading.instructions  =Instructions
 label.authoring.heading.basic.desc  =Basic input information for task list
+label.authoring.heading.instructions  =Instructions
 label.authoring.heading.instructions.desc  =Please input online and offline instructions
+label.authoring.heading.instructions.desc  =Please input conditions for task list
+label.authoring.heading.conditions  =Conditions
 label.authoring.heading.advance  =Advanced
 label.authoring.heading.advance.desc  =Please input advance options for task list
 label.authoring.basic.title  =Title
 label.authoring.basic.description  =Description
 label.authoring.basic.add.task  =Add Task
-label.authoring.basic.task.isRequired  =Required task
+label.authoring.basic.task.isRequired =Required task
 label.authoring.basic.task.isCommentsAllowed  =Allow Learners to add comment(s)
 label.authoring.basic.task.isCommentsRequired  =Comment required to complete task
 label.authoring.basic.task.isFilesAllowed  =Allow Learners to add file(s)
 label.authoring.basic.task.isFilesRequired  =File required to complete task
-label.authoring.basic.task.isCommentsFilesAllowed  =Allow participants to add comments/files for this task
+label.authoring.basic.task.isCommentsFilesAllowed =Allow participants to add comments/files for this task
 label.authoring.basic.task.show.only.to.monitoring  =Show only to monitoring
 label.authoring.basic.task.show.to.all.learners  =Show to all learners
-label.authoring.basic.task.isChildTask  =Don't display until parent task has been completed
-label.authoring.basic.task.parent.task.name  =Parent:
+label.authoring.basic.task.isChildTask =Don't display until parent task has been completed
+label.authoring.basic.task.parent.task.name =Parent:
 label.authoring.basic.task.list.title  =Task List
-label.authoring.basic.resource.task  =Task
+label.authoring.basic.resource.task =Task
 label.authoring.basic.resource.edit  =Edit
 label.authoring.basic.resource.delete  =Delete
 label.authoring.basic.resource.title.input  =Title
@@ -53,23 +57,36 @@
 label.authoring.advance.run.content.sequentialOrder  =Tasks have to be completed in sequential order
 label.authoring.advance.minimum.number.tasks  =Minimum number of tasks to complete
 label.authoring.cancel.button  =Cancel
+label.authoring.edit.conditions.button  =Edit Conditions
 label.authoring.save.button  =Save
+label.authoring.up  =Move Up
+label.authoring.down  =Move down
+label.authoring.conditions.add.condition  =Add Condition
+label.authoring.conditions.list.title  =Conditions
+label.authoring.conditions.condition.name  =Condition Name
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
+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.
-authoring.exception  =There is a problem in task list authoring page, the reason is {0}
 error.resource.item.title.blank  =Title can not be blank.
+error.condition.name.blank  =Condition name can not be blank.
+error.condition.name.contains.wrong.symbol  =Condition name can not contain # symbol. Please choose the name without this symbol.
+error.condition.duplicated.name  =Duplicated name. Please choose unique one.
+error.condition.no.tasklistitems.selected  =There are no TaskListItems selected. Please select at least one.
 error.upload.failed  =Upload file failed: {0}
 error.msg.upload.file.not.found  =Could not find upload file {0}.
 error.msg.file.not.found  =File not found exception occurs when uploading file.
 error.msg.io.exception  =IOException occurs when uploading file.
 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 Learner
 label.learning.tasks.to.do	  =Tasks to do
 label.learning.new.task.details  =New task details:
 label.learning.check.for.new  =Check for new
-label.learning.comment.or.instruction  =Description
+label.learning.comment.or.instruction  =Comment/Instruction
 label.learning.required.tasks  =required tasks
 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.
@@ -96,8 +113,6 @@
 monitoring.label.user.name  =Name
 monitoring.label.group  =Group
 label.monitoring.heading.access  =Learners list
-label.monitoring.edit.activity.cancel  =Cancel
-label.monitoring.edit.activity.update  =Update
 label.monitoring.edit.activity.edit  =Edit
 label.monitoring.summary.overall.summary  =Overall Summary
 label.monitoring.summary.user  =User
@@ -118,14 +133,13 @@
 label.monitoring.tasksummary.files.required  =Files are required to complete the task
 label.monitoring.instructions.attachments  =Attachments
 message.monitoring.edit.activity.not.editable  =This Activity is no longer editable
-message.monitoring.summary.no.session  =No Session Available
-message.monitoring.summary.no.resource.for.group  =No resource available for this group.
 export.title  =Export portfolio of Task List
 label.export.reflection  =Notebook Entries
 label.download  =Download
 label.view  =View
 label.edit  =Edit
 label.completed  =Completed
+button.upload  =Upload
 button.add  =Add
 message.monitoring.summary.no.session  =No Session Available
 label.cancel  =Cancel
@@ -143,4 +157,6 @@
 label.default.user.name  =Instructor
 output.desc.learner.number.of.tasks.completed=Number of Tasks Completed
 output.desc.tool.condition=User Entered Conditions
+
+
 #======= End labels: Exported 156 labels for en AU =====
Index: lams_tool_task/conf/language/rams/ApplicationResources.properties
===================================================================
diff -u -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 -r342f067cfe700981c6ef564e918f774118e37626
--- lams_tool_task/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2)
+++ lams_tool_task/conf/language/rams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 342f067cfe700981c6ef564e918f774118e37626)
@@ -64,6 +64,8 @@
 label.authoring.conditions.add.condition  =Add Condition
 label.authoring.conditions.list.title  =Conditions
 label.authoring.conditions.condition.name  =Condition Name
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
 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.
Index: lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r39444d1719a438cb33f7201ba98d4b3292ee9fc2 -r342f067cfe700981c6ef564e918f774118e37626
--- lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 39444d1719a438cb33f7201ba98d4b3292ee9fc2)
+++ lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 342f067cfe700981c6ef564e918f774118e37626)
@@ -64,6 +64,8 @@
 label.authoring.conditions.add.condition  =Add Condition
 label.authoring.conditions.list.title  =Conditions
 label.authoring.conditions.condition.name  =Condition Name
+label.authoring.conditions.order  =Order
+label.authoring.conditions.empty.condition.list  =There are no conditions
 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.
Index: lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -rf98164082de73795d7ecc803ab22d050af9d30ed -r342f067cfe700981c6ef564e918f774118e37626
--- lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision f98164082de73795d7ecc803ab22d050af9d30ed)
+++ lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 342f067cfe700981c6ef564e918f774118e37626)
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}"
-	scope="request" />
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 <c:set var="tool">
 	<lams:WebAppURL />
@@ -13,11 +13,26 @@
 	</h2>
 	
 	<table class="alternative-color" id="conditionTable" cellspacing="0">
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		<tr>
+			<th width="8%">
+				<fmt:message key="label.authoring.conditions.order" />
+			</th>
+			<th align="left" colspan="4">
+				<fmt:message key="label.authoring.conditions.condition.name" />
+			</th>
+		</tr>
 
+		<c:if test="${empty sessionMap.conditionList}">
+			<tr>
+                <td colspan="5">
+					<fmt:message key="label.authoring.conditions.empty.condition.list" />
+				</td>
+			</tr>
+		</c:if>
+
 		<c:forEach var="condition" items="${sessionMap.conditionList}" varStatus="status">
 			<tr>
-                <td width="2%">
+                <td>
 					${status.index + 1}
 				</td>