Index: lams_tool_survey/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r6a5d35ec57dde95eae93fb628d669af257d36949 -r7ed78ed8506a377056c19c18d0c105cafc384f44
--- lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 6a5d35ec57dde95eae93fb628d669af257d36949)
+++ lams_tool_survey/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 7ed78ed8506a377056c19c18d0c105cafc384f44)
@@ -106,6 +106,17 @@
 			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
 		</action>
 		
+		<action path="/authoring/upItem"
+			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
+			parameter="upItem">
+			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
+		</action>
+		<action path="/authoring/downItem"
+			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
+			parameter="downItem">
+			<forward name="success" path="/pages/authoring/parts/itemlist.jsp" />
+		</action>
+		
 		<!-- ==========  Survey Instruction Item  ========== -->
 		<action path="/authoring/newInstruction"
 			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
@@ -117,30 +128,7 @@
 			parameter="removeInstruction">
 			<forward name="success" path="/pages/authoring/parts/instructions.jsp" />
 		</action>
-		
-		<action path="/authoring/removeItemAttachment"
-			type="org.lamsfoundation.lams.tool.survey.web.action.AuthoringAction"
-			parameter="removeItemAttachment">
-			<forward name="success" path="/pages/authoring/parts/itemattachment.jsp" />
-		</action>
-		
-		<!-- ==========  Display Item  ========== -->
-		<action path="/reviewItem"
-			type="org.lamsfoundation.lams.tool.survey.web.action.ViewItemAction"
-			parameter="reviewItem">
-			<forward name="success" path="/pages/itemreview/mainframe.jsp" />
-		</action>
-		<action path="/nextInstruction"
-			type="org.lamsfoundation.lams.tool.survey.web.action.ViewItemAction"
-			parameter="nextInstruction">
-			<forward name="success" path="/pages/itemreview/instructionsnav.jsp" />
-		</action>
-		<action path="/openUrlPopup"
-			type="org.lamsfoundation.lams.tool.survey.web.action.ViewItemAction"
-			parameter="openUrlPopup">
-			<forward name="success" path="/pages/itemreview/openurl.jsp" />
-		</action>
-		
+	
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/start"
 			type="org.lamsfoundation.lams.tool.survey.web.action.LearningAction"
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
===================================================================
diff -u -r49baeb6ea3cf1a5b493a798e22521dc9aec32974 -r7ed78ed8506a377056c19c18d0c105cafc384f44
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 49baeb6ea3cf1a5b493a798e22521dc9aec32974)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 7ed78ed8506a377056c19c18d0c105cafc384f44)
@@ -158,6 +158,12 @@
         if (param.equals("removeItem")) {
         	return removeItem(mapping, form, request, response);
         }
+        if (param.equals("upItem")) {
+        	return upItem(mapping, form, request, response);
+        }
+        if (param.equals("downItem")) {
+        	return downItem(mapping, form, request, response);
+        }
         //-----------------------Survey Item Instruction function ---------------------------
 	  	if (param.equals("newInstruction")) {
        		return newInstruction(mapping, form, request, response);
@@ -199,6 +205,60 @@
 		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 		return mapping.findForward(SurveyConstants.SUCCESS);
 	}
+	/**
+	 * Move up current item.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward upItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+		return switchItem(mapping, request, true);
+	}
+	/**
+	 * Move down current item.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward downItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+		return switchItem(mapping, request, false);
+	}
+
+
+	private ActionForward switchItem(ActionMapping mapping, HttpServletRequest request, boolean up) {
+//		get back sessionMAP
+		String sessionMapID = WebUtil.readStrParam(request, SurveyConstants.ATTR_SESSION_MAP_ID);
+		SessionMap sessionMap = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		
+		int itemIdx = NumberUtils.stringToInt(request.getParameter(SurveyConstants.PARAM_ITEM_INDEX),-1);
+		if(itemIdx != -1){
+			SortedSet<SurveyQuestion> surveyList = getSurveyItemList(sessionMap);
+			List<SurveyQuestion> rList = new ArrayList<SurveyQuestion>(surveyList);
+			//get current and the target item, and switch their sequnece
+			SurveyQuestion item = rList.get(itemIdx);
+			SurveyQuestion repItem;
+			if(up)
+				repItem = rList.get(--itemIdx);
+			else
+				repItem = rList.get(++itemIdx);
+			int upSeqId = repItem.getSequenceId();
+			repItem.setSequenceId(item.getSequenceId());
+			item.setSequenceId(upSeqId);
+			
+			//put back list, it will be sorted again
+			surveyList.clear();
+			surveyList.addAll(rList);
+		}	
+		
+		request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+		return mapping.findForward(SurveyConstants.SUCCESS);
+	}
 	
 	/**
 	 * Display edit page for existed survey item.
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
diff -u -r12085431903d9ea39d8b405bb70c7f01c936c409 -r7ed78ed8506a377056c19c18d0c105cafc384f44
--- lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
+++ lams_tool_survey/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7ed78ed8506a377056c19c18d0c105cafc384f44)
@@ -48,13 +48,56 @@
 		    	}
 	    );
 	}
+	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;;
+		deleteItemLoading();
+	    var myAjax = new Ajax.Updater(
+		    	surveyListTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:deleteItemComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	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;;
+		deleteItemLoading();
+	    var myAjax = new Ajax.Updater(
+		    	surveyListTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:deleteItemComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
 	function deleteItemLoading(){
 		showBusy(surveyListTargetDiv);
 	}
 	function deleteItemComplete(){
 		hideBusy(surveyListTargetDiv);
 	}
 
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
+
 </script>
 	<!-- Basic Tab Content -->
 	<table>
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r12085431903d9ea39d8b405bb70c7f01c936c409 -r7ed78ed8506a377056c19c18d0c105cafc384f44
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 12085431903d9ea39d8b405bb70c7f01c936c409)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 7ed78ed8506a377056c19c18d0c105cafc384f44)
@@ -28,13 +28,33 @@
 				<fmt:message key="label.optional"/>
 			</c:if>
 		</td>
+		<c:if test="${not status.first}">
+			<td width="20px" align="center">
+				<a href="javascript:;" onclick="upQuestion(${status.index},'${sessionMapID}')">
+					<img src="<html:rewrite page='/includes/images/uparrow.gif'/>" border="0"  title="<fmt:message key="label.up"/>">
+				</a>
+			</td>
+			<c:if test="${status.last}">
+				<td>&nbsp;</td>
+			</c:if>
+		</c:if>
+		<c:if test="${not status.last}">
+			<c:if test="${status.first}">
+				<td>&nbsp;</td>
+			</c:if>
+			<td width="20px" align="center">
+				<a href="javascript:;" onclick="downQuestion(${status.index},'${sessionMapID}')">
+					<img src="<html:rewrite page='/includes/images/downarrow.gif'/>" border="0"  title="<fmt:message key="label.down"/>"> 
+				</a>
+			</td>
+		</c:if>
 		<td width="80px" align="center">
-			<a href="#" onclick="editItem(${status.index},${question.type},'${sessionMapID}','${contentFolderID}')" class="button">
+			<a href="javascript:;" onclick="editItem(${status.index},${question.type},'${sessionMapID}','${contentFolderID}')" class="button">
 				<fmt:message key="label.authoring.basic.survey.edit" />
 			</a>
 		</td>
 		<td width="80px" align="center">
-			<a href="#" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
+			<a href="javascript:;" onclick="deleteItem(${status.index},'${sessionMapID}')" class="button">
 				<fmt:message key="label.authoring.basic.survey.delete" />
 			</a>
 		</td>