Index: lams_tool_survey/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/conf/language/ApplicationResources.properties	14 Sep 2006 06:44:13 -0000	1.2
+++ lams_tool_survey/conf/language/ApplicationResources.properties	15 Sep 2006 07:18:30 -0000	1.3
@@ -25,12 +25,14 @@
 label.authoring.basic.title  =Title
 label.authoring.basic.instruction  =Instruction
 # Survey question
-label.authoring.basic.add.survey  =Add survey question
+label.question  =Question
+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
 label.authoring.basic.add.question=Add question
-label.authoring.basic.question.compulsory  =Compulsory survey
-label.authoring.basic.question.append.text =Append text entry
-label.authoring.basic.question.max.answer  =Maximum answer(s)
+label.authoring.basic.question.optional  =Optional question
+label.authoring.basic.question.append.text =Allow 'Other' text entry
+label.authoring.basic.question.allow.muli.answer  =Allow multiple answers
 
 label.authoring.basic.survey.list.title  =Survey questions list
 label.authoring.basic.survey  =Survey
@@ -57,11 +59,9 @@
 label.authoring.cancel.button  =Cancel
 label.description  =Description:
 authoring.exception  =There is a problem in survey authoring page, the reason is {0}
-error.survey.item.title.blank  =Title can not be blank.
-error.survey.item.url.blank  =URL can not be blank.
-error.survey.item.file.blank  =File can not be blank.
-error.survey.item.desc.blank  =Comment/Instruction can not be blank
-error.survey.item.invalid.url  =Invalid URL format.
+error.survey.item.question.blank  =Question can not be blank
+error.survey.item.question.less.option  = You must input at least two options.
+
 error.upload.failed  =Upload file failed: {0}
 error.msg.upload.file.not.found  =Could not find upload file {0}.
 error.msg.zip.file.exception  =Could not handle zip file when uploading file.
Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/xdoclet/struts-actions.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	14 Sep 2006 06:44:13 -0000	1.2
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	15 Sep 2006 07:18:31 -0000	1.3
@@ -76,7 +76,8 @@
 			scope="request" 
 			validate="false"			
 			parameter="newItemInit">
-			<forward name="success" path="/pages/authoring/parts/addsurvey.jsp" />
+			<forward name="question" path="/pages/authoring/parts/addchoicequestion.jsp" />
+			<forward name="opentext" path="/pages/authoring/parts/addopenquestion.jsp" />
 		</action>
 		
 		<action path="/authoring/editItemInit"
@@ -85,17 +86,19 @@
 			scope="request" 
 			parameter="editItemInit" 
 			validate="false">
-			<forward name="success" path="/pages/authoring/parts/addsurvey.jsp" />
+			<forward name="question" path="/pages/authoring/parts/addchoicequestion.jsp" />
+			<forward name="opentext" path="/pages/authoring/parts/addopenquestion.jsp" />
 		</action>
 		
 		<action path="/authoring/saveOrUpdateItem"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
 			parameter="saveOrUpdateItem"
 			name="surveyItemForm" 
 			scope="request" 
-			input="/pages/authoring/parts/addsurvey.jsp"
 			validate="false">
 			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
+			<forward name="question" path="/pages/authoring/parts/addchoicequestion.jsp" />
+			<forward name="opentext" path="/pages/authoring/parts/addopenquestion.jsp" />
 		</action>
 		<action path="/authoring/removeItem"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/create_lams_tool_survey.sql,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/db/sql/create_lams_tool_survey.sql	14 Sep 2006 06:44:13 -0000	1.3
+++ lams_tool_survey/db/sql/create_lams_tool_survey.sql	15 Sep 2006 07:18:30 -0000	1.4
@@ -66,8 +66,8 @@
 create_date datetime, 
 question_type smallint, 
 append_text smallint, 
-compulsory smallint, 
-max_answers integer, 
+optional smallint, 
+allow_multiple_answer smallint,
 survey_uid bigint, 
 primary key (uid)
 );
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	14 Sep 2006 06:44:11 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	15 Sep 2006 07:18:29 -0000	1.4
@@ -52,7 +52,8 @@
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.survey.item.title.blank";
 	public static final String ERROR_MSG_URL_BLANK = "error.survey.item.url.blank";
-	public static final String ERROR_MSG_DESC_BLANK = "error.survey.item.desc.blank";
+	public static final String ERROR_MSG_DESC_BLANK = "error.survey.item.question.blank";
+	public static final String ERROR_MSG_LESS_OPTIONS = "error.survey.item.question.less.option";
 	public static final String ERROR_MSG_FILE_BLANK = "error.survey.item.file.blank";
 	public static final String ERROR_MSG_INVALID_URL = "error.survey.item.invalid.url";
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
@@ -80,5 +81,7 @@
 	public static final short SURVEY_TYPE_TEXT_ENTRY = 3;
 	public static final short SURVEY_TYPE_MULTIPLE_CHOICES = 2;
 	public static final short SURVEY_TYPE_SINGLE_CHOICE = 1;
+	public static final String FORWARD_OPEN_QUESTION = "opentext";
+	public static final String FORWARD_CHOICE_QUESTION = "question";
 
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Attic/SurveyQuestion.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	14 Sep 2006 06:44:12 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.hbm.xml	15 Sep 2006 07:18:30 -0000	1.3
@@ -88,19 +88,19 @@
         />
 
         <property
-            name="compulsory"
+            name="optional"
             type="boolean"
             update="true"
             insert="true"
-            column="compulsory"
+            column="optional"
         />
 
         <property
-            name="maxAnswers"
-            type="int"
+            name="allowMultipleAnswer"
+            type="boolean"
             update="true"
             insert="true"
-            column="max_answers"
+            column="allow_multiple_answer"
         />
 
         <!--
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	14 Sep 2006 06:44:12 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	15 Sep 2006 07:18:30 -0000	1.4
@@ -49,8 +49,8 @@
 	
 	//option of Question
 	private boolean appendText;
-	private boolean compulsory;
-	private int maxAnswers;
+	private boolean optional;
+	private boolean allowMultipleAnswer;
 	
 	private Set<SurveyOption> options;
 	
@@ -178,30 +178,34 @@
 	    }
 	    
 	    /**
-	     * @hibernate.property  column="compulsory" 
+	     * @hibernate.property  column="optional" 
 	     * @return
 	     */
-		public boolean isCompulsory() {
-			return compulsory;
+		public boolean isOptional() {
+			return optional;
 		}
-		public void setCompulsory(boolean compulsory) {
-			this.compulsory = compulsory;
+		public void setOptional(boolean compulsory) {
+			this.optional = compulsory;
 		}
-	    
 	    /**
-	     * @hibernate.property  column="max_answers" 
+	     * @hibernate.property  column="allow_multiple_answer" 
 	     * @return
-	     */		
-		public int getMaxAnswers() {
-			return maxAnswers;
+	     */
+		public boolean isAllowMultipleAnswer() {
+			return allowMultipleAnswer;
 		}
-		public void setMaxAnswers(int maxAnswers) {
-			this.maxAnswers = maxAnswers;
+		public void setAllowMultipleAnswer(boolean allowMultipleAnswer) {
+			this.allowMultipleAnswer = allowMultipleAnswer;
 		}
+		
+		//****************************************************************
+		// DTO fields
+		//****************************************************************
 		public String getShortTitle() {
 			return shortTitle;
 		}
 		public void setShortTitle(String shortTitle) {
 			this.shortTitle = shortTitle;
 		}
+
 }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	14 Sep 2006 06:44:13 -0000	1.3
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	15 Sep 2006 07:18:30 -0000	1.4
@@ -210,6 +210,7 @@
 	 */
 	private ActionForward editItemInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		
+		QuestionForm itemForm = (QuestionForm) form;
 //		get back sessionMAP
 		String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
 		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
@@ -221,10 +222,13 @@
 			List<SurveyQuestion> rList = new ArrayList<SurveyQuestion>(surveyList);
 			item = rList.get(itemIdx);
 			if(item != null){
-				populateItemToForm(itemIdx, item,(QuestionForm) form,request);
+				populateItemToForm(itemIdx, item,itemForm,request);
 			}
 		}		
-		return mapping.findForward(SurveyConstants.SUCCESS);
+		if(itemForm.getItemType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
+			return mapping.findForward(SurveyConstants.FORWARD_OPEN_QUESTION);
+		else
+			return mapping.findForward(SurveyConstants.FORWARD_CHOICE_QUESTION);
 	}
 	/**
 	 * Display empty page for new survey item.
@@ -235,15 +239,19 @@
 	 * @return
 	 */
 	private ActionForward newItemlInit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		QuestionForm questionForm = (QuestionForm)form;
 		String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
-		((QuestionForm)form).setSessionMapID(sessionMapID);
+		questionForm.setSessionMapID(sessionMapID);
 		
 		List instructionList = new ArrayList(INIT_INSTRUCTION_COUNT);
 		for(int idx=0;idx<INIT_INSTRUCTION_COUNT;idx++){
 			instructionList.add("");
 		}
 		request.setAttribute("instructionList",instructionList);
-		return mapping.findForward(SurveyConstants.SUCCESS);
+		if(questionForm.getItemType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
+			return mapping.findForward(SurveyConstants.FORWARD_OPEN_QUESTION);
+		else
+			return mapping.findForward(SurveyConstants.FORWARD_CHOICE_QUESTION);
 	}
 	/**
 	 * This method will get necessary information from survey item form and save or update into 
@@ -264,19 +272,15 @@
 		List<String> instructionList = getInstructionsFromRequest(request);
 		
 		QuestionForm itemForm = (QuestionForm)form;
-		ActionErrors errors = validateSurveyItem(itemForm);
+		ActionErrors errors = validateSurveyItem(itemForm,instructionList);
 		
-		//reset maxAnswer according to the real number of options
-		if(instructionList != null){
-			int max = itemForm.getQuestion().getMaxAnswers();
-			if(max > instructionList.size()){
-				itemForm.getQuestion().setMaxAnswers(instructionList.size());
-			}
-		}
 		if(!errors.isEmpty()){
 			this.addErrors(request,errors);
 			request.setAttribute(SurveyConstants.ATTR_INSTRUCTION_LIST,instructionList);
-			return mapping.getInputForward();
+			if(itemForm.getItemType() == SurveyConstants.QUESTION_TYPE_TEXT_ENTRY)
+				return mapping.findForward(SurveyConstants.FORWARD_OPEN_QUESTION);
+			else
+				return mapping.findForward(SurveyConstants.FORWARD_CHOICE_QUESTION);
 		}
 		
 		try {
@@ -809,23 +813,13 @@
 			List<SurveyQuestion> rList = new ArrayList<SurveyQuestion>(surveyList);
 			item = rList.get(itemIdx);
 			item.setDescription(itemForm.getQuestion().getDescription());
-			item.setCompulsory(itemForm.getQuestion().isCompulsory());
+			item.setOptional(itemForm.getQuestion().isOptional());
 			item.setAppendText(itemForm.getQuestion().isAppendText());
-			item.setMaxAnswers(itemForm.getQuestion().getMaxAnswers());
+			item.setAllowMultipleAnswer(itemForm.getQuestion().isAllowMultipleAnswer());
 			
 		}
 		retriveQuestionForDisplay(item);
-		//set question type
-		int max  = item.getMaxAnswers();
-		short type = SurveyConstants.SURVEY_TYPE_SINGLE_CHOICE; 
-		if(instructionList == null || instructionList.size() == 0)
-			type = SurveyConstants.SURVEY_TYPE_TEXT_ENTRY;
-		else if( max > 1)
-				type = SurveyConstants.SURVEY_TYPE_MULTIPLE_CHOICES;
-		else if(max <= 1)
-				type = SurveyConstants.SURVEY_TYPE_SINGLE_CHOICE;
-		else
-			log.error("Unexpected survey question type for index : " + itemIdx);
+		short type = getQuestionType(itemForm);
 		item.setType(type);
 
 		//set instrcutions
@@ -842,6 +836,19 @@
 		
 		
 	}
+
+
+	private short getQuestionType(QuestionForm itemForm) {
+		//set question type
+		short type;
+		if(itemForm.getItemType() == SurveyConstants.SURVEY_TYPE_TEXT_ENTRY)
+			type = SurveyConstants.SURVEY_TYPE_TEXT_ENTRY;
+		else if( itemForm.getQuestion().isAllowMultipleAnswer())
+			type = SurveyConstants.SURVEY_TYPE_MULTIPLE_CHOICES;
+		else 
+			type = SurveyConstants.SURVEY_TYPE_SINGLE_CHOICE;
+		return type;
+	}
 	
 	private void retriveQuestionListForDisplay(List<SurveyQuestion> list) {
 		for(SurveyQuestion item: list){
@@ -857,12 +864,20 @@
 	/**
 	 * Vaidate survey item regards to their type (url/file/learning object/website zip file)
 	 * @param itemForm
+	 * @param instructionList 
 	 * @return
 	 */
-	private ActionErrors validateSurveyItem(QuestionForm itemForm) {
+	private ActionErrors validateSurveyItem(QuestionForm itemForm, List<String> instructionList) {
 		ActionErrors errors = new ActionErrors();
 		if(StringUtils.isBlank(itemForm.getQuestion().getDescription()))
 			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK));
+		
+		short type = getQuestionType(itemForm);
+		if(type != SurveyConstants.QUESTION_TYPE_TEXT_ENTRY){
+			if(instructionList == null || instructionList.size() < 3)
+				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_LESS_OPTIONS));
+		}
+		
 		return errors;
 	}
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	14 Sep 2006 06:44:13 -0000	1.2
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/QuestionForm.java	15 Sep 2006 07:18:31 -0000	1.3
@@ -38,6 +38,9 @@
  */
 public class QuestionForm extends ActionForm {
 	private String itemIndex;
+	
+	//1: single or multiple choice question;3:open text question
+	private short itemType;
 	private String sessionMapID;
 	
 	//tool access mode;
@@ -51,7 +54,7 @@
 	public void reset(ActionMapping mapping, HttpServletRequest request){
 		if(question != null){
 			question.setAppendText(false);
-			question.setCompulsory(false);
+			question.setOptional(false);
 		}
 	}
 	public String getItemIndex() {
@@ -79,4 +82,10 @@
 	public void setQuestion(SurveyQuestion question) {
 		this.question = question;
 	}
+	public short getItemType() {
+		return itemType;
+	}
+	public void setItemType(short itemType) {
+		this.itemType = itemType;
+	}
 }
Index: lams_tool_survey/web/includes/images/icon_multiple.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/includes/images/icon_multiple.gif,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_survey/web/includes/images/icon_single.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/includes/images/icon_single.gif,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_survey/web/includes/images/icon_text.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/includes/images/icon_text.gif,v
diff -u -r1.1 -r1.2
Binary files differ
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/pages/authoring/basic.jsp	14 Sep 2006 06:44:13 -0000	1.2
+++ lams_tool_survey/web/pages/authoring/basic.jsp	15 Sep 2006 07:18:30 -0000	1.3
@@ -89,10 +89,15 @@
 				<table class="forms">
 					<tr>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}"/>');">
-								<fmt:message key="label.authoring.basic.add.survey" />
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=1&sessionMapID=${formBean.sessionMapID}"/>');">
+								<fmt:message key="label.authoring.basic.add.survey.question" />
 							</a>
 						</td>
+						<td>
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?itemType=3&sessionMapID=${formBean.sessionMapID}"/>');">
+								<fmt:message key="label.authoring.basic.add.survey.open.question" />
+							</a>
+						</td>
 					</tr>
 				</table>
 			</td>
Index: lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp	15 Sep 2006 07:18:30 -0000	1.1
@@ -0,0 +1,124 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		<%-- user for  surveysurveyitem.js --%>
+		<script type="text/javascript">
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
+		<style type="text/css">
+	<!--
+	table { 
+		 width:650px;
+		 margin-left:0px; 
+		 text-align:left; 
+		 }
+	
+	td { 
+		padding:4px; 
+		font-size:12px;
+	}
+		
+	-->
+	</style>
+	</head>
+	<body class="tabpart">
+		<table class="forms" border="0">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<%@ 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" />
+						<table >
+							<tr>
+								<td colspan="3">
+									<h2>
+										<fmt:message key="label.authoring.basic.add.survey.question" />
+									</h2>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="2">
+									<fmt:message key="label.question" />
+								</td>
+								<td>
+									<html:checkbox property="question.optional" styleClass="noBorder">
+										<fmt:message key="label.authoring.basic.question.optional" />
+									</html:checkbox>
+								</td>								
+							</tr>
+							<tr>
+								<td colspan="3">
+									<c:set var="language">
+										<lams:user property="localeLanguage" />
+									</c:set>
+									<fck:editor id="question.description" basePath="/lams/fckeditor/"
+										imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+										linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+										flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+										imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+										linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+										flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+										toolbarSet="Default-Learner" defaultLanguage="${language}"
+										autoDetectLanguage="false">
+										<c:out value="${formBean.question.description}"
+											escapeXml="false" />
+									</fck:editor>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<a href="javascript:;" onclick="addInstruction()" class="button"><fmt:message key="label.authoring.basic.add.option"/></a>
+									<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="instructionArea_Busy" />
+								</td>
+								<td>
+									<html:checkbox property="question.allowMultipleAnswer" styleClass="noBorder">
+										<fmt:message key="label.authoring.basic.question.allow.muli.answer" />
+									</html:checkbox>
+								</td>				
+								<td>
+									<html:checkbox property="question.appendText" styleClass="noBorder">
+										<fmt:message key="label.authoring.basic.question.append.text" />
+									</html:checkbox>
+								</td>
+							</tr>			
+						</table>
+					</html:form>
+				</td>
+			</tr>
+			<tr>
+				<!-- Instructions -->
+				<td>
+					<%@ include file="instructions.jsp"%>
+				</td>
+			</tr>
+
+			<tr>
+				<td align="center" valign="bottom">
+					<a href="#" onclick="submitSurveyItem()" class="button-add-item">
+						<fmt:message key="label.authoring.basic.add.question" /> 
+					</a> 
+					&nbsp;&nbsp;
+					<a href="javascript:;" onclick="cancelSurveyItem()" class="button">
+						<fmt:message key="label.cancel" /> 
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp	15 Sep 2006 07:18:30 -0000	1.1
@@ -0,0 +1,101 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+		<%-- user for  surveysurveyitem.js --%>
+		<script type="text/javascript">
+	   var removeInstructionUrl = "<c:url value='/authoring/removeInstruction.do'/>";
+       var addInstructionUrl = "<c:url value='/authoring/newInstruction.do'/>";
+	</script>
+		<script type="text/javascript"
+			src="<html:rewrite page='/includes/javascript/surveyitem.js'/>"></script>
+		<style type="text/css">
+	<!--
+	table { 
+		 width:650px;
+		 margin-left:0px; 
+		 text-align:left; 
+		 }
+	
+	td { 
+		padding:4px; 
+		font-size:12px;
+	}
+		
+	-->
+	</style>
+	</head>
+	<body class="tabpart">
+		<table class="forms" border="0">
+			<!-- Basic Info Form-->
+			<tr>
+				<td>
+					<%@ 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" />
+						<table >
+							<tr>
+								<td colspan="2">
+									<h2>
+										<fmt:message key="label.authoring.basic.add.survey.question" />
+									</h2>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<fmt:message key="label.question" />
+								</td>
+								<td>
+									<html:checkbox property="question.optional" styleClass="noBorder">
+										<fmt:message key="label.authoring.basic.question.optional" />
+									</html:checkbox>
+								</td>								
+							</tr>
+							<tr>
+								<td colspan="2">
+									<c:set var="language">
+										<lams:user property="localeLanguage" />
+									</c:set>
+									<fck:editor id="question.description" basePath="/lams/fckeditor/"
+										imageBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Image&amp;Connector=connectors/jsp/connector"
+										linkBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Connector=connectors/jsp/connector"
+										flashBrowserURL="/FCKeditor/editor/filemanager/browser/default/browser.html?Type=Flash&amp;Connector=connectors/jsp/connector"
+										imageUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Image"
+										linkUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=File"
+										flashUploadURL="/FCKeditor/editor/filemanager/upload/simpleuploader?Type=Flash"
+										toolbarSet="Default-Learner" defaultLanguage="${language}"
+										autoDetectLanguage="false">
+										<c:out value="${formBean.question.description}"
+											escapeXml="false" />
+									</fck:editor>
+								</td>
+							</tr>
+						</table>
+					</html:form>
+				</td>
+			</tr>
+			<tr>
+				<td align="center" valign="bottom">
+					<a href="#" onclick="submitSurveyItem()" class="button-add-item">
+						<fmt:message key="label.authoring.basic.add.question" /> 
+					</a> 
+					&nbsp;&nbsp;
+					<a href="javascript:;" onclick="cancelSurveyItem()" class="button">
+						<fmt:message key="label.cancel" /> 
+					</a>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					&nbsp;
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_survey/web/pages/authoring/parts/addsurvey.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/pages/authoring/parts/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/instructions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_survey/web/pages/authoring/parts/instructions.jsp	14 Sep 2006 06:44:12 -0000	1.2
+++ lams_tool_survey/web/pages/authoring/parts/instructions.jsp	15 Sep 2006 07:18:30 -0000	1.3
@@ -5,12 +5,6 @@
 	<form id="instructionForm">
 	<input type="hidden" name="instructionCount" id="instructionCount">
 	<table border="0" style="width:400px" id="questionTable">
-		<tr>
-			<td colspan="5">
-				<a href="javascript:;" onclick="addInstruction()" class="button"><fmt:message key="label.authoring.basic.add.option"/></a>
-				<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="instructionArea_Busy" />
-			</td>
-		</tr>
 		<c:forEach var="item" items="${instructionList}" varStatus="status">
 			<tr id="instructionItem${status.index}">
 				<td width="3px">${status.index+1}</td>