Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql	(revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3153 Enlarge instructions field for Share Resource
+ALTER TABLE tl_larsrc11_item_instruction MODIFY description TEXT;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java
===================================================================
diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	(.../ResourceItemInstruction.java)	(revision 920894ca746cba5e080023c5cc80167d64d1653d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java	(.../ResourceItemInstruction.java)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -26,65 +26,73 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+
 /**
  * @hibernate.class table="tl_larsrc11_item_instruction"
  * @author Steve.Ni
  * 
  * @version $Revision$
  */
-public class ResourceItemInstruction  implements Cloneable{
-	private static final Logger log = Logger.getLogger(ResourceItemInstruction.class);
-	
-	private Long uid;
-	private int sequenceId;
-	private String description;
+public class ResourceItemInstruction implements Cloneable {
+    private static final Logger log = Logger.getLogger(ResourceItemInstruction.class);
 
-    public Object clone(){
-		Object obj = null;
-		try {
-			obj = super.clone();
-			((ResourceItemInstruction)obj).setUid(null);
-		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + ResourceItemInstruction.class + " failed");
-		}
-		
-		return obj;
+    private Long uid;
+    private int sequenceId;
+    private String description;
+
+    public Object clone() {
+	Object obj = null;
+	try {
+	    obj = super.clone();
+	    ((ResourceItemInstruction) obj).setUid(null);
+	} catch (CloneNotSupportedException e) {
+	    log.error("When clone " + ResourceItemInstruction.class + " failed");
 	}
-// **********************************************************
-	  	//		Get/Set methods
-//	  **********************************************************
-		/**
-		 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
-		 * @return Returns the uid.
-		 */
-		public Long getUid() {
-			return uid;
-		}
-		/**
-		 * @param uid The uid to set.
-		 */
-		public void setUid(Long userID) {
-			this.uid = userID;
-		}
-		/**
-		 * @hibernate.property column="description"
-		 * @return
-		 */
-		public String getDescription() {
-			return description;
-		}
-		public void setDescription(String description) {
-			this.description = description;
-		}
-		/**
-		 * @hibernate.property column="sequence_id"
-		 * @return
-		 */
-		public int getSequenceId() {
-			return sequenceId;
-		}
-		public void setSequenceId(int sequenceId) {
-			this.sequenceId = sequenceId;
-		}
 
+	return obj;
+    }
+
+    // **********************************************************
+    // Get/Set methods
+    // **********************************************************
+    /**
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
+     * @return Returns the uid.
+     */
+    public Long getUid() {
+	return uid;
+    }
+
+    /**
+     * @param uid
+     *            The uid to set.
+     */
+    public void setUid(Long userID) {
+	this.uid = userID;
+    }
+
+    /**
+     * @hibernate.property column="description" type="text"
+     * @return
+     */
+    public String getDescription() {
+	return description;
+    }
+
+    public void setDescription(String description) {
+	this.description = description;
+    }
+
+    /**
+     * @hibernate.property column="sequence_id"
+     * @return
+     */
+    public int getSequenceId() {
+	return sequenceId;
+    }
+
+    public void setSequenceId(int sequenceId) {
+	this.sequenceId = sequenceId;
+    }
+
 }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -29,7 +29,6 @@
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -274,8 +273,8 @@
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
 	((ResourceItemForm) form).setSessionMapID(sessionMapID);
 
-	short type = (short) NumberUtils.stringToInt(request.getParameter(AuthoringAction.ITEM_TYPE));
-	List instructionList = new ArrayList(AuthoringAction.INIT_INSTRUCTION_COUNT);
+	short type = (short) WebUtil.readIntParam(request, AuthoringAction.ITEM_TYPE);
+	List<String> instructionList = new ArrayList<String>(AuthoringAction.INIT_INSTRUCTION_COUNT);
 	for (int idx = 0; idx < AuthoringAction.INIT_INSTRUCTION_COUNT; idx++) {
 	    instructionList.add("");
 	}
@@ -339,8 +338,8 @@
      * @return
      */
     private ActionForward newInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-	int numberOfInstructions = getNumberOfInstructionsInRequest(request);
-	List instructionList = new ArrayList(++numberOfInstructions);
+	int numberOfInstructions = WebUtil.readIntParam(request, INSTRUCTION_ITEM_COUNT); 
+	List<String> instructionList = new ArrayList<String>(++numberOfInstructions);
 	for (int idx = 0; idx < numberOfInstructions; idx++) {
 	    String item = request.getParameter(AuthoringAction.INSTRUCTION_ITEM_DESC_PREFIX + idx);
 	    if (item == null) {
@@ -363,9 +362,9 @@
      * @return
      */
     private ActionForward removeInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-	int numberOfInstructions = getNumberOfInstructionsInRequest(request);
-	int removeIdx = NumberUtils.stringToInt(request.getParameter("removeIdx"), -1);
-	List instructionList = new ArrayList(numberOfInstructions - 1);
+	int numberOfInstructions = WebUtil.readIntParam(request, INSTRUCTION_ITEM_COUNT);
+	int removeIdx = WebUtil.readIntParam(request, "removeIdx");
+	List<String> instructionList = new ArrayList<String>(numberOfInstructions - 1);
 	for (int idx = 0; idx < numberOfInstructions; idx++) {
 	    String item = request.getParameter(AuthoringAction.INSTRUCTION_ITEM_DESC_PREFIX + idx);
 	    if (idx == removeIdx) {
@@ -949,23 +948,6 @@
     }
 
     /**
-     * Get number of instruction items in the <code>HttpRequest</code>
-     * 
-     * @param request
-     *            the HttpServletRequest
-     * @return numberOfInstruction the number of instructions in the request
-     */
-    private int getNumberOfInstructionsInRequest(HttpServletRequest request) {
-	int numberOfInstructions = 0;
-	Enumeration e = request.getParameterNames();
-	while (e.hasMoreElements()) {
-	    if (e.nextElement().toString().indexOf(AuthoringAction.INSTRUCTION_ITEM_DESC_PREFIX) != -1)
-		numberOfInstructions++;
-	}
-	return numberOfInstructions;
-    }
-
-    /**
      * Get back relative <code>ActionForward</code> from request.
      * 
      * @param type
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_larsrc/web/common/header.jsp	(.../header.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -10,7 +10,6 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
Index: lams_tool_larsrc/web/common/tabbedheader.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -10,7 +10,7 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/rsrccommon.js'/>"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js	(.../rsrcresourceitem.js)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -1,18 +1,26 @@
 	/*
-	 This is Resource Item instrcution area.
+	 This is Resource Item instruction area.
 	 */
 	var instructionTargetDiv = "instructionArea";
     var itemAttachmentTargetDiv = "itemAttachmentArea";
-    var singleInstructionHeight = 40;
+    var singleInstructionHeight = 74;
     
 	function removeInstruction(idx){
+		//prepare lams_textarea value to Ajax submit
+		$('textarea').trigger('change');
+		
 	    var param = $("#instructionForm").serialize() + "&removeIdx="+idx;
 	    removeInstructionLoading();
-	    $.post(removeInstructionUrl, param, function(xml) {
-	    	removeInstructionComplete();	
-	    	document.getElementById("instructionArea").innerHTML = xml;
-	    });
+	    $.post(
+	    	removeInstructionUrl, 
+	    	param, 
+	    	function(xml) {
+	    		removeInstructionComplete();	
+	    		document.getElementById("instructionArea").innerHTML = xml;
+	    	}
+	    );
 	}
+	
 	function removeItemAttachment(idx){
 	    removeItemAttachmentLoading();
 		$("#" + itemAttachmentTargetDiv).load(
@@ -22,16 +30,26 @@
 			}
 		);	    
 	}
+	
 	function addInstruction(){
+		//prepare lams_textarea value to Ajax submit
+		$('textarea').trigger('change');
+		
 	    var param = $("#instructionForm").serialize();
 		addInstructionLoading();
-	    $.post(addInstructionUrl, param, function(xml) {
-	    	addInstructionComplete();
-	    	document.getElementById("instructionArea").innerHTML = xml;
-	    });
+		
+	    $.post(
+	    	addInstructionUrl, 
+	    	param, 
+	    	function(xml) {
+	    		addInstructionComplete();
+	    		document.getElementById("instructionArea").innerHTML = xml;
+	    	}
+	    );
+	    
 	    return false;
-
 	}
+	
 	function adjustInstructionsDisplayAreaHeight(adjustAmount){
 		var obj = window.document.getElementById('reourceInputArea');
 		if (!obj && window.parent) {
@@ -43,13 +61,19 @@
 		obj.style.height=obj.contentWindow.document.body.scrollHeight+adjustAmount+'px';
 	}
 	function upItem(itemIdx){
+		//prepare lams_textarea value to Ajax submit
+		$('textarea').trigger('change');
+		
 		if(itemIdx == 0)
 			return;
 		var currId = "instructionItemDesc" + itemIdx;
 		var repId = "instructionItemDesc" + (--itemIdx);
 		switchValue(currId,repId);
 	}
 	function downItem(itemIdx,maxSize){
+		//prepare lams_textarea value to Ajax submit
+		$('textarea').trigger('change');
+		
 		if(itemIdx == (maxSize -1))
 			return;
 		var currId = "instructionItemDesc" + itemIdx;
@@ -83,6 +107,9 @@
 	}
 	
 	function submitResourceItem(){
+		//prepare lams_textarea value to Ajax submit
+		$('textarea').trigger('change');
+		
 		document.getElementById("instructionList").value = $("#instructionForm").serialize();
 		$("#resourceItemForm").submit();
 		// after submit, it direct to itemlist.jsp, 
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -rbf1c66f82afbc349f5702f29a0c6ab6ff9add34a -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision bf1c66f82afbc349f5702f29a0c6ab6ff9add34a)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -2,9 +2,7 @@
 
 <%-- If you change this file, remember to update the copy made for CNG-36 --%>
 
-<c:set var="formBean"
-	value="<%=request
-									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
@@ -14,7 +12,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("reourceInputArea");
 		if(area != null){
-			area.style.width="650px";
+			area.style.width="90%";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -55,18 +53,19 @@
 	function deleteItem(idx,sessionMapID){
 		var url = "<c:url value="/authoring/removeItem.do"/>";
 	    var reqIDVar = new Date();
-		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
 		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	resourceListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
-		    	}
-	    );
+	    
+		$("#" + resourceListTargetDiv).load(
+			url,
+			{
+				itemIndex: idx,
+				reqID: reqIDVar.getTime(), 
+				sessionMapID: sessionMapID
+			},
+			function() {
+				deleteItemComplete();
+			}
+		);
 	}
 	function deleteItemLoading(){
 		showBusy(resourceListTargetDiv);
@@ -80,18 +79,19 @@
 		resourceItemOrderID2++;
 		
 		var url = "<c:url value="/authoring/switchResourceItemPosition.do"/>";
-		var param = "sessionMapID=" + sessionMapID + "&resourceItemOrderID1=" + resourceItemOrderID1 + "&resourceItemOrderID2=" + resourceItemOrderID2;
 		deleteItemLoading();
-		var myAjax = new Ajax.Updater(
-	    	resourceListTargetDiv,
-	    	url,
-	    	{
-	    		method:'get',
-	    		parameters:param,
-	    		onComplete:deleteItemComplete,
-	    		evalScripts:true
-	    	}
-	    );
+		
+		$("#" + resourceListTargetDiv).load(
+			url,
+			{
+				sessionMapID: sessionMapID,
+				resourceItemOrderID1: resourceItemOrderID1, 
+				resourceItemOrderID2: resourceItemOrderID2
+			},
+			function() {
+				deleteItemComplete();
+			}
+		);
 	}
 
 </script>
@@ -136,9 +136,6 @@
 				<a
 				href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}&itemType=4"/>');" class="space-left">
 				<fmt:message key="label.authoring.basic.add.learning.object" /> </a>
-				
-				
-
 </p>
 
 <p>
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
diff -u -r8aa8842a708722ed7a742a284cc149eaaf3001de -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision 8aa8842a708722ed7a742a284cc149eaaf3001de)
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	(.../addfile.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -39,17 +39,6 @@
 
 			<html:text property="title" size="55" tabindex="1" />
 
-			<%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.description.input" />
-								</td>
-								<td>
-									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
-								</td>
-							</tr>
-							--%>
-
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.file.input" />
 			</div>
@@ -63,10 +52,8 @@
 		</html:form>
 
 		<!-- Instructions -->
-
 		<%@ include file="instructions.jsp"%>
 		
-		
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
 					key="label.authoring.basic.add.file" /> </a>
Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp
===================================================================
diff -u -r8aa8842a708722ed7a742a284cc149eaaf3001de -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision 8aa8842a708722ed7a742a284cc149eaaf3001de)
+++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp	(.../addlearningobject.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -36,17 +36,6 @@
 			</div>
 
 			<html:text property="title" size="55" tabindex="1" />
-
-			<%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.description.input" />
-								</td>
-								<td>
-									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
-								</td>
-							</tr>
-							--%>
 			
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.zip.file.input" />
@@ -60,10 +49,9 @@
 			</div>
 
 		</html:form>
+		
 		<!-- Instructions -->
-
 		<%@ include file="instructions.jsp"%>
-
 		
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
diff -u -r8aa8842a708722ed7a742a284cc149eaaf3001de -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision 8aa8842a708722ed7a742a284cc149eaaf3001de)
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	(.../addurl.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -35,17 +35,6 @@
 
 			<html:text property="title" size="55" />
 
-			<%--  Remove description in as LDEV-617
-							<tr>
-								<td>
-									<fmt:message key="label.authoring.basic.resource.description.input" />
-								</td>
-								<td>
-									<lams:STRUTS-textarea rows="5" cols="55" property="description" />
-								</td>
-							</tr>
-						 --%>
-
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.url.input" />
 			</div>
@@ -63,10 +52,8 @@
 		</html:form>
 
 		<!-- Instructions -->
-
 		<%@ include file="instructions.jsp"%>
 
-
 		<lams:ImgButtonWrapper>
 			<a href="#" onclick="submitResourceItem()" class="button-add-item"><fmt:message
 					key="label.authoring.basic.add.url" /> </a>
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp
===================================================================
diff -u -r8aa8842a708722ed7a742a284cc149eaaf3001de -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision 8aa8842a708722ed7a742a284cc149eaaf3001de)
+++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp	(.../addwebsite.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -39,17 +39,6 @@
 
 			<html:text property="title" size="55" tabindex="1" />
 
-			<%--  Remove description in as LDEV-617
-							<tr>
-								<td width="130px">
-									<fmt:message key="label.authoring.basic.resource.description.input" />
-								</td>
-								<td>
-									<lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description" />
-								</td>
-							</tr>
-							--%>
-
 			<div class="field-name space-top">
 				<fmt:message key="label.authoring.basic.resource.zip.file.input" />
 			</div>
@@ -62,8 +51,8 @@
 			</div>
 
 		</html:form>
+		
 		<!-- Instructions -->
-
 		<%@ include file="instructions.jsp"%>
 
 		<lams:ImgButtonWrapper>
Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -1,45 +1,38 @@
 <%@ 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="listSize" value="${fn:length(instructionList)}" />
+
 <div id="instructionArea">
 	<form id="instructionForm">
-		<input type="hidden" name="instructionCount" id="instructionCount">
+		<input type="hidden" name="instructionCount" id="instructionCount" value="${listSize}">
 
 		<div class="field-name space-top">
 			<fmt:message key="label.authoring.basic.resource.instructions" />
 		</div>
 
-		<a href="javascript:;" onclick="addInstruction()"
-			class="button-add-item"><fmt:message
-				key="label.authoring.basic.resource.add.instruction" /> </a>
-		<img src="${ctxPath}/includes/images/indicator.gif"
-			style="display:none" id="instructionArea_Busy" />
+		<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="instructionArea_Busy" />
 
-
 		<table>
 			<c:forEach var="item" items="${instructionList}" varStatus="status">
 				<tr id="instructionItem${status.index}">
-					<td width="3px">
+					<td width="10px">
 						${status.index+1}
 					</td>
 					<td>
-						<input type="text" name="instructionItemDesc${status.index}"
-							id="instructionItemDesc${status.index}" size="60" maxlength="255" value="<c:out value='${item}' />" />
+						<lams:STRUTS-textarea property="instructionItemDesc${status.index}" 
+							styleId="instructionItemDesc${status.index}" rows="3" cols="82" value="${item}" />
 					</td>
 
-					<td>
+					<td style="width: 20px; vertical-align: middle;">
 						<%-- Don't display down icon if last line --%>
-
 						<c:choose>
 							<c:when test="${0 != status.index}">
 								<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
 									border="0" title="<fmt:message key="label.up"/>"
 									onclick="upItem('${status.index}')">
 							</c:when>
 							<c:otherwise>
-								<img
-									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+								<img src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
 									border="0" title="<fmt:message key="label.up"/>">
 							</c:otherwise>
 						</c:choose>
@@ -52,16 +45,15 @@
 							</c:when>
 
 							<c:otherwise>
-								<img
-									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+								<img src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
 									border="0" title="<fmt:message key="label.down"/>">
 							</c:otherwise>
 
 						</c:choose>
 
 						<%-- Don't display down icon if last line --%>
 					</td>
-					<td>
+					<td style="width: 20px; vertical-align: middle;">
 						<img src="<html:rewrite page='/includes/images/cross.gif'/>"
 							border="0" title="<fmt:message key="label.delete"/>"
 							onclick="removeInstruction('${status.index}')">
@@ -70,12 +62,16 @@
 			</c:forEach>
 		</table>
 
+		<a href="#nogo" onclick="javascript:addInstruction();" class="button-add-item float-right">
+			<fmt:message key="label.authoring.basic.resource.add.instruction" /> 
+		</a>
+
 	</form>
 </div>
+<br>
 
 <%-- This script will adjust resource item input area height according to the new instruction item amount. --%>
 <script type="text/javascript">
-	document.getElementById("instructionCount").value = "${listSize}";
 	var obj = window.document.getElementById('reourceInputArea');
 	if (!obj && window.parent) {
 		 obj = window.parent.document.getElementById('reourceInputArea');
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -re9e2a6b00397afa86d303bfbc6ca3649744a982e
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision e9e2a6b00397afa86d303bfbc6ca3649744a982e)
@@ -100,7 +100,7 @@
 	</lams:head>
 	<body>
 
-		<div id="instructions">
+		<div id="instructions" style="padding: 0 10px;">
 			
 			<h2>
 				<c:if test="${instructions.total > 0}" >
@@ -114,46 +114,38 @@
 				</c:if>
 			</h2>
 			
-				<span class="right-buttons">
+			<span style="position: fixed; right: 10px;">
 				<c:choose>
-				
-				<c:when test="${instructions.current < instructions.total}">
-					<input type="button" id="NextInstruction" name="NextInstruction"
-						onClick="javascript:nextIns(${instructions.current})"
-						class="button" value="<fmt:message key='label.next.instruction' />" />
-				</c:when>
-				<c:when test="${reflectOn && runAuto}">
-					<input type="button" id="FinishInstruction" name="FinishInstruction"
-						onClick="javascript:continueReflect()" class="button" value="<fmt:message
-							key='label.continue' />" />
-				</c:when>
-				<c:otherwise>
-					<input type="button" id="FinishInstruction" name="FinishInstruction" class="button" value="<fmt:message key='label.finish' />" />
-				</c:otherwise>
-			</c:choose>
+					<c:when test="${instructions.current < instructions.total}">
+						<input type="button" id="NextInstruction" name="NextInstruction"
+							onClick="javascript:nextIns(${instructions.current})"
+							class="button" value="<fmt:message key='label.next.instruction' />" />
+					</c:when>
+					<c:when test="${reflectOn && runAuto}">
+						<input type="button" id="FinishInstruction" name="FinishInstruction"
+							onClick="javascript:continueReflect()" class="button" value="<fmt:message
+								key='label.continue' />" />
+					</c:when>
+					<c:otherwise>
+						<input type="button" id="FinishInstruction" name="FinishInstruction" class="button" value="<fmt:message key='label.finish' />" />
+					</c:otherwise>
+				</c:choose>
 			</span>
 
 			<p>
-
+			
 				<c:choose>
 					<c:when test="${instructions.instruction == null}">
 						<fmt:message key="msg.no.instruction" />
 					</c:when>
+					
 					<c:otherwise>
-					${instructions.instruction.description}
-				</c:otherwise>
+						${instructions.instruction.description}
+					</c:otherwise>
 				</c:choose>
-
-
-
-
-
+				
 			</p>
 
-
-
-
-
 		</div>
 	</body>
 </lams:html>