Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r988d9fce322beaf579b828d5694f2260bbc17b51 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -36,6 +36,7 @@
 label.authoring.basic.type.numerical  =Numerical
 label.authoring.basic.type.true.false  =True/False
 label.authoring.basic.type.essay  =Essay
+label.authoring.basic.type.ordering  =Ordering
 label.authoring.basic.resource.url  =URL
 label.authoring.basic.resource.file  =File
 label.authoring.basic.resource.website  =Website
@@ -95,8 +96,8 @@
 label.authoring.numerical.add.answer  =Add Blank Answer
 label.authoring.numerical.add.numerical  =Add Numerical Question
 label.authoring.numerical.add.unit  =Add Blank Unit
-
 label.authoring.essay.add.essay  =Add Essay
+label.authoring.ordering.add.ordering  =Add Ordering
 label.authoring.online.file  =Upload online file
 label.authoring.offline.file  =Upload offline file
 label.authoring.choosefile.button  =Choose file
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rec107e68d150d83edb58b17177679662eb376e44 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ec107e68d150d83edb58b17177679662eb376e44)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -87,6 +87,7 @@
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
 			<forward name="essay" path="/pages/authoring/parts/addessay.jsp" />
+			<forward name="ordering" path="/pages/authoring/parts/addordering.jsp" />
 		</action>
 		<action path="/authoring/editQuestion"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
@@ -100,6 +101,7 @@
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
 			<forward name="essay" path="/pages/authoring/parts/addessay.jsp" />	
+			<forward name="ordering" path="/pages/authoring/parts/addordering.jsp" />			
 		</action>
 		<action path="/authoring/saveOrUpdateQuestion"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -rec107e68d150d83edb58b17177679662eb376e44 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision ec107e68d150d83edb58b17177679662eb376e44)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -100,6 +100,8 @@
    uid bigint not null auto_increment,
    access_date datetime,
    assessment_question_uid bigint,
+   answer_string text,
+   answer_float float,
    user_uid bigint,
    complete tinyint,
    session_id bigint,
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -rec107e68d150d83edb58b17177679662eb376e44 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision ec107e68d150d83edb58b17177679662eb376e44)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -50,6 +50,8 @@
     public static final short QUESTION_TYPE_TRUE_FALSE = 5;
 
     public static final short QUESTION_TYPE_ESSAY = 6;
+    
+    public static final short QUESTION_TYPE_ORDERING = 7;
 
     // for action forward name
     public static final String SUCCESS = "success";
@@ -136,8 +138,6 @@
 
     public static final String ATTR_ASSESSMENT = "assessment";
 
-    public static final String ATTR_RUN_AUTO = "runAuto";
-
     public static final String ATTR_QUESTION_UID = "questionUid";
 
     public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
@@ -163,6 +163,10 @@
     public static final String ATTR_INSTRUCTIONS = "instructions";
 
     public static final String ATTR_USER_FINISHED = "userFinished";
+    
+    public static final String ATTR_PAGE_NUMBER = "pageNumber";
+    
+    public static final String ATTR_PAGED_QUESTIONS = "pagedQuestions";
 
     // error message keys
     public static final String ERROR_MSG_QUESTION_NAME_BLANK = "error.question.name.blank";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r988d9fce322beaf579b828d5694f2260bbc17b51 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 988d9fce322beaf579b828d5694f2260bbc17b51)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -1116,6 +1116,9 @@
 	    break;
 	case AssessmentConstants.QUESTION_TYPE_ESSAY:
 	    forward = mapping.findForward("essay");
+	    break;
+	case AssessmentConstants.QUESTION_TYPE_ORDERING:
+	    forward = mapping.findForward("ordering");
 	    break;	    
 	default:
 	    forward = null;
@@ -1153,6 +1156,7 @@
 	
 	short questionType = question.getType();
 	if ((questionType == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
+		|| (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
@@ -1210,7 +1214,7 @@
 	question.setDefaultGrade(Integer.parseInt(questionForm.getDefaultGrade()));
 	question.setGeneralFeedback(questionForm.getGeneralFeedback());
 	
-	if ((type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)) {
+	if (type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
 	    question.setMultipleAnswersAllowed(questionForm.isMultipleAnswersAllowed());
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setShuffle(questionForm.isShuffle());
@@ -1232,10 +1236,16 @@
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());	    
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_ESSAY)) {
 	    question.setFeedback(questionForm.getFeedback());
+	} else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
+	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
+	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    question.setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
+	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	}
 	
 	// set options
 	if ((type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
+		|| (type == AssessmentConstants.QUESTION_TYPE_ORDERING)
 		|| (type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (type == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
 		|| (type == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
@@ -1290,22 +1300,24 @@
 
 	int count = NumberUtils.stringToInt(paramMap.get(AssessmentConstants.ATTR_OPTION_COUNT));
 	int questionType = WebUtil.readIntParam(request,AssessmentConstants.ATTR_QUESTION_TYPE);
-	TreeSet<AssessmentAnswerOption> optionList = new TreeSet<AssessmentAnswerOption>(new AssessmentAnswerOptionComparator());
+	TreeSet<AssessmentAnswerOption> optionList = new TreeSet<AssessmentAnswerOption>(
+		new AssessmentAnswerOptionComparator());
 	for (int i = 0; i < count; i++) {
 	    if ((questionType == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
-		    || (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)) {
-		
+		    || (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
+		    || (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING)) {
+
 		String answerString = paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i);
 		if ((answerString == null) && isForSaving) {
 		    continue;
 		}
-		
+
 		AssessmentAnswerOption option = new AssessmentAnswerOption();
-		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);		
+		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
 		option.setSequenceId(NumberUtils.stringToInt(sequenceId));
 		option.setAnswerString(answerString);
 		float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i));
-		option.setGrade(grade);    
+		option.setGrade(grade);
 		option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
 		optionList.add(option);
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rec107e68d150d83edb58b17177679662eb376e44 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ec107e68d150d83edb58b17177679662eb376e44)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -108,6 +108,7 @@
 		<option><fmt:message key="label.authoring.basic.type.numerical" /></option>
 		<option><fmt:message key="label.authoring.basic.type.true.false" /></option>
 		<option><fmt:message key="label.authoring.basic.type.essay" /></option>
+		<option><fmt:message key="label.authoring.basic.type.ordering" /></option>
 	</select>
 	
 	<a onclick="createNewQuestionInitHref();return false;" href="" class="button-add-item space-left thickbox" id="newQuestionInitHref">  
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -0,0 +1,234 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
+		<c:set var="questionType" value="7"	scope="request" />
+		
+		<style type="text/css">
+			label { width: 10em; float: left; }
+			label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;}
+			em { font-weight: bold; padding-right: 1em; vertical-align: top; }
+			input.error { border: 2px solid red;}
+		</style>
+
+		<script type="text/javascript">
+			var questionType = ${questionType};
+			var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
+    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
+    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.2.6.pack.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.validate.js'/>"></script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.form.js'/>"></script>
+  	    <script><!--
+			$(document).ready(function(){
+				
+		    	$("#assessmentQuestionForm").validate({
+		    		rules: {
+		    			title: "required",
+		    			defaultGrade: {
+		    			      required: true,
+		    			      digits: true
+		    			},
+		    			penaltyFactor: {
+		    			      required: true,
+		    			      number: true
+		    			},
+		    			hasAnswerFilled: {
+		    				required: function(element) {
+				    			$("[name^=optionAnswer]").each(function() {
+									this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
+				    			});		    				
+		    		        	return $("input[name^=optionAnswer]:filled").length < 1;
+			    		    }			    		    
+	    			    },
+	    			    hasOneHundredGrade: {
+		    				required: function(element) {
+	    			    		return $("select[name^='optionGrade'][value='100.0']").length < 1;
+			    		    }			    		    
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    			defaultGrade: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			},
+		    			penaltyFactor: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
+		    			},
+		    			hasAnswerFilled: {
+		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
+		    			},
+		    			hasOneHundredGrade: {
+		    				required: "<br><fmt:message key='error.form.validation.hundred.score'/>"
+		    			}
+		    		},
+		    	    invalidHandler: function(form, validator) {
+		    		      var errors = validator.numberOfInvalids();
+		    		      if (errors) {
+		    		          var message = errors == 1
+		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
+		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
+	    		          	  
+		    		          $("div.error span").html(message);
+		    		          $("div.error").show();
+		    		      } else {
+		    		          $("div.error").hide();
+		    		      }
+		    		},
+		    		debug: true,
+     			    submitHandler: function(form) {
+		    			$("[name^=optionAnswer]").each(function() {
+							this.value = FCKeditorAPI.GetInstance(this.name).GetXHTML();
+		    			});
+		    			$("#optionList").val($("#optionForm").serialize(true));
+		    			$("#question").val(FCKeditorAPI.GetInstance("question").GetXHTML());
+		    			$("#generalFeedback").val(FCKeditorAPI.GetInstance("generalFeedback").GetXHTML());
+		    			$("#feedbackOnCorrect").val(FCKeditorAPI.GetInstance("feedbackOnCorrectOutsideForm").GetXHTML());
+		    			$("#feedbackOnPartiallyCorrect").val(FCKeditorAPI.GetInstance("feedbackOnPartiallyCorrectOutsideForm").GetXHTML());
+		    			$("#feedbackOnIncorrect").val(FCKeditorAPI.GetInstance("feedbackOnIncorrectOutsideForm").GetXHTML());
+		    			
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#questionListArea'), 
+		    		   		success: afterRatingSubmit  // post-submit callback
+		    		    }; 				
+		    		    				
+		    			$('#assessmentQuestionForm').ajaxSubmit(options);
+		    		}
+		  		});
+			});
+    		// post-submit callback 
+    		function afterRatingSubmit(responseText, statusText)  { 
+    			self.parent.refreshThickbox()
+    			self.parent.tb_remove();
+    		}    
+  		--></script>
+		
+		
+	</lams:head>
+	
+	<body class="stripes" onload="parent.resizeIframe();">
+		<div id="content" >	
+			<%@ include file="/common/messages.jsp"%>
+		    <div class="error" style="display:none;">
+		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
+		      	<span></span>.<br clear="all"/>
+		    </div>			
+			
+			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<html:hidden property="sessionMapID" />
+				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
+				<input type="hidden" name="optionList" id="optionList" />
+				<html:hidden property="questionIndex" />
+				<html:hidden property="contentFolderID" styleId="contentFolderID"/>
+				<html:hidden property="feedbackOnCorrect" styleId="feedbackOnCorrect"/>
+				<html:hidden property="feedbackOnPartiallyCorrect" styleId="feedbackOnPartiallyCorrect"/>
+				<html:hidden property="feedbackOnIncorrect" styleId="feedbackOnIncorrect"/>
+	
+				<h2 class="no-space-left">
+					<fmt:message key="label.authoring.basic.type.ordering" />
+				</h2>
+	
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.question.name" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				</div>
+				<html:text property="title" size="55" />
+	
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.question.text" />
+				</div>
+				<lams:FCKEditor id="question" value="${formBean.question}"
+					contentFolderID="${formBean.contentFolderID}" width="622px">
+				</lams:FCKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.default.question.grade" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				</div>
+				<html:text property="defaultGrade" size="3" />
+					
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.penalty.factor" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				</div>
+				<html:text property="penaltyFactor" size="3" />
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.general.feedback" />
+				</div>
+				<lams:FCKEditor id="generalFeedback" value="${formBean.generalFeedback}"
+					contentFolderID="${formBean.contentFolderID}" width="622px"> 
+				</lams:FCKEditor>
+				
+				<br><br>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.answer.options" />
+				</div>
+				<input type="hidden" name="hasAnswerFilled" id="hasAnswerFilled">
+				<input type="hidden" name="hasOneHundredGrade" id="hasOneHundredGrade">
+			</html:form>
+			
+			<!-- Options -->
+			<form id="optionForm" name="optionForm">
+				<%@ include file="optionlist.jsp"%>
+				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
+					<fmt:message key="label.authoring.choice.add.option" /> 
+				</a>
+			</form>
+			
+			<!-- Overall feedback -->
+			<div class="field-name " style="margin-top: 60px;">
+				<fmt:message key="label.authoring.choice.overall.feedback" />
+			</div>
+			<div style="margin-left: 30px; margin-top: 10px;">
+				<div class="field-name" >
+					<fmt:message key="label.authoring.choice.feedback.on.correct" />
+				</div>
+				<lams:FCKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}"
+					contentFolderID="${formBean.contentFolderID}" width="622px">
+				</lams:FCKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+				</div>
+				<lams:FCKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}"
+					contentFolderID="${formBean.contentFolderID}" width="622px">
+				</lams:FCKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+				</div>
+				<lams:FCKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}"
+					contentFolderID="${formBean.contentFolderID}" width="622px">
+				</lams:FCKEditor>
+			</div>
+			
+			<lams:ImgButtonWrapper>
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" class="button-add-item">
+					<fmt:message key="label.authoring.ordering.add.ordering" /> 
+				</a>
+				<a href="#" onclick="self.parent.tb_remove();" class="button space-left">
+					<fmt:message key="label.cancel" /> 
+				</a>
+			</lams:ImgButtonWrapper>
+
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->		
+		
+	</body>
+</lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r596580465b9d0c2c7c50f9a1c42ca4ce6a91b523 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 596580465b9d0c2c7c50f9a1c42ca4ce6a91b523)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -8,7 +8,7 @@
 			<tr>
 				<td style="padding-left:10px; padding-top:15px; padding-bottom:15px;">
 					<c:choose>
-						<c:when test="${(questionType == 1) || (questionType == 3)}">
+						<c:when test="${(questionType == 1) || (questionType == 3) || (questionType == 7)}">
 							<%@ include file="option.jsp"%>
 						</c:when>
 						<c:when test="${questionType == 2}">
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rec107e68d150d83edb58b17177679662eb376e44 -r24ffa43545be19c176ebcc4cc16286e59dbf1306
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision ec107e68d150d83edb58b17177679662eb376e44)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 24ffa43545be19c176ebcc4cc16286e59dbf1306)
@@ -41,6 +41,9 @@
 							<c:when test="${question.type == 6}">
 								<fmt:message key="label.authoring.basic.type.essay" />
 							</c:when>
+							<c:when test="${question.type == 7}">
+								<fmt:message key="label.authoring.basic.type.ordering" />
+							</c:when>							
 						</c:choose>
 					</span>
 				</td>