Index: lams_tool_survey/conf/language/ApplicationResources.properties
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -26,6 +26,7 @@
 label.authoring.basic.instruction  =Instruction
 # Survey question
 label.question  =Question
+label.optional= Optional
 label.authoring.basic.add.survey.question  =Add question
 label.authoring.basic.add.survey.open.question=Add open text
 label.authoring.basic.add.option  =Add more options
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -276,6 +276,9 @@
 		
 		if(!errors.isEmpty()){
 			this.addErrors(request,errors);
+			//add at least 2 instruction list
+			for(int idx=instructionList.size();idx < 2;idx++)
+				instructionList.add("");
 			request.setAttribute(SurveyConstants.ATTR_INSTRUCTION_LIST,instructionList);
 			if(itemForm.getItemType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
 				return mapping.findForward(SurveyConstants.FORWARD_OPEN_QUESTION);
@@ -736,6 +739,11 @@
 	 */
 	private List<String> getInstructionsFromRequest(HttpServletRequest request) {
 		String list = request.getParameter("instructionList");
+		List<String> instructionList = new ArrayList<String>();
+		//for open text entry question
+		if(list == null)
+			return instructionList;
+		
 		String[] params = list.split("&");
 		Map<String,String> paramMap = new HashMap<String,String>();
 		String[] pair;
@@ -751,7 +759,6 @@
 		}
 		
 		int count = NumberUtils.stringToInt(paramMap.get(INSTRUCTION_ITEM_COUNT));
-		List<String> instructionList = new ArrayList<String>();
 		for(int idx=0;idx<count;idx++){
 			String item = paramMap.get(INSTRUCTION_ITEM_DESC_PREFIX+idx);
 			if(item == null)
@@ -874,7 +881,7 @@
 		
 		short type = getQuestionType(itemForm);
 		if(type != SurveyConstants.QUESTION_TYPE_TEXT_ENTRY){
-			if(instructionList == null || instructionList.size() < 3)
+			if(instructionList == null || instructionList.size() < 2)
 				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_LESS_OPTIONS));
 		}
 		
Index: lams_tool_survey/web/common/messages.jsp
===================================================================
diff -u -r8c922599d6f715bc5aa4bac760cb939c857bf4ba -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision 8c922599d6f715bc5aa4bac760cb939c857bf4ba)
+++ lams_tool_survey/web/common/messages.jsp	(.../messages.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -1,6 +1,5 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<p>&nbsp;</p>
 	<p class="warning">
 	        <html:messages id="error">
 	            <c:out value="${error}" escapeXml="false"/><br/>
Index: lams_tool_survey/web/includes/javascript/surveyitem.js
===================================================================
diff -u -r0b9b61d67c2dcf6f83c513325afca117cb1967f2 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision 0b9b61d67c2dcf6f83c513325afca117cb1967f2)
+++ lams_tool_survey/web/includes/javascript/surveyitem.js	(.../surveyitem.js)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -25,49 +25,6 @@
 	    );
 	}
 	
-    function changeMaxAnswerOptions(initVal){
-		var tb = document.getElementById("questionTable");
-		var num = tb.getElementsByTagName("tr");
-		var numLen = num.length;
-		//remove button row
-		if(numLen > 0)
-			--numLen;
-			
-		var sel = document.getElementById("maxAnswerSelect");
-		var newField = sel.options;
-		var len = sel.length;
-		
-		if(numLen == 0){
-			sel.disabled = true;
-			return;
-		}else
-			sel.disabled = false;
-		
-		//when first enter, it should get value from Resource
-		var selIdx=initVal < 0?-1:initVal;
-		//there is bug in Opera8.5: if add alert before this loop, it will work,weird.
-		for (var idx=0;idx<len;idx++)
-		{
-			if(newField[0].selected && selIdx == -1 ){
-				selIdx = newField[0].value;
-			}
-			sel.removeChild(newField[0]);
-		}
-	
-		for(var i=1;i<=numLen;i++){
-			var opt = document.createElement("option");
-			var optT =document.createTextNode(i);
-			opt.value=i;
-			//get back user choosen value
-			if(selIdx > 0 && selIdx==i){
-				opt.selected = true;
-			}else{
-				opt.selected = false;
-			}
-			opt.appendChild(optT);
-			sel.appendChild(opt);
-		}
-	}
 	function addInstruction(){
 		var url= addInstructionUrl;
 	    var reqIDVar = new Date();
@@ -109,7 +66,6 @@
 	function removeInstructionComplete(){
 		hideBusy(instructionTargetDiv);
 		
-		changeMaxAnswerOptions(-1);
 	}
 	
 	function addInstructionLoading(){
@@ -118,7 +74,6 @@
 	function addInstructionComplete(){
 		hideBusy(instructionTargetDiv);
 		
-		changeMaxAnswerOptions(-1);
 	}
 	function showBusy(targetDiv){
 		if($(targetDiv+"_Busy") != null){
@@ -132,10 +87,9 @@
 	}
 	
 	function submitSurveyItem(){
-		$("instructionList").value = Form.serialize("instructionForm");
+		if($("instructionList") != null)
+			$("instructionList").value = Form.serialize("instructionForm");
 		$("surveyItemForm").submit();
-		//after submit, it direct to itemlist.jsp, 
-		// then refresh "basic tab" surveylist and close this window.
 	}
 	function cancelSurveyItem(){
 		window.top.hideMessage();
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -25,9 +25,9 @@
 	}
 
 	
-	function editItem(idx,sessionMapID){
+	function editItem(idx,itemType,sessionMapID){
 		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&itemType="+itemType+"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		showMessage(url);
 	}
 	//The panel of survey list panel
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	(.../addchoicequestion.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -39,6 +39,8 @@
 						<input type="hidden" name="instructionList" id="instructionList" />
 						<html:hidden property="sessionMapID" />
 						<html:hidden property="itemIndex" />
+						<%-- This value should be 1 or 2 --%>
+						<html:hidden property="itemType" value="1" />
 						<table >
 							<tr>
 								<td colspan="3">
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
diff -u -rc4a429ad90657aa55fb72fccf49cf717a3e7fd12 -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision c4a429ad90657aa55fb72fccf49cf717a3e7fd12)
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	(.../addopenquestion.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -35,10 +35,9 @@
 					<%@ include file="/common/messages.jsp"%>
 					<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="surveyItemForm">
 						<c:set var="formBean"	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-						<%-- This field is not belong STRUTS form --%>
-						<input type="hidden" name="instructionList" id="instructionList" />
 						<html:hidden property="sessionMapID" />
 						<html:hidden property="itemIndex" />
+						<html:hidden property="itemType" value="3" />
 						<table >
 							<tr>
 								<td colspan="2">
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rb3c59c3c9ce71b16c7754c776d78c6fe1f04470c -rec918a1f6fa717d59f8074f508fe798eb3cbdf41
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision b3c59c3c9ce71b16c7754c776d78c6fe1f04470c)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision ec918a1f6fa717d59f8074f508fe798eb3cbdf41)
@@ -24,7 +24,12 @@
 		</td>
 		<td>${survey.shortTitle}</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},'${sessionMapID}')" class="button">
+			<c:if test="${survey.optional}">
+				<fmt:message key="label.optional"/>
+			</c:if>
+		</td>
+		<td width="80px" align="center">
+			<a href="#" onclick="editItem(${status.index},${survey.type},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.survey.edit" />
 			</a>
 		</td>