Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20131128.sql 28 Nov 2013 18:39:48 -0000 1.1 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java,v diff -u -r1.5 -r1.6 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java 24 Oct 2006 00:05:36 -0000 1.5 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemInstruction.java 28 Nov 2013 18:39:49 -0000 1.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v diff -u -r1.58 -r1.59 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 25 Jul 2013 05:55:40 -0000 1.58 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 28 Nov 2013 18:39:48 -0000 1.59 @@ -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 instructionList = new ArrayList(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 instructionList = new ArrayList(++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 instructionList = new ArrayList(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 HttpRequest - * - * @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 ActionForward from request. * * @param type Index: lams_tool_larsrc/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v diff -u -r1.12 -r1.13 --- lams_tool_larsrc/web/common/header.jsp 29 Sep 2012 13:57:59 -0000 1.12 +++ lams_tool_larsrc/web/common/header.jsp 28 Nov 2013 18:39:49 -0000 1.13 @@ -10,7 +10,6 @@ - Index: lams_tool_larsrc/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/web/common/tabbedheader.jsp 8 Jun 2007 01:39:05 -0000 1.2 +++ lams_tool_larsrc/web/common/tabbedheader.jsp 28 Nov 2013 18:39:49 -0000 1.3 @@ -10,7 +10,7 @@ - + Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js,v diff -u -r1.12 -r1.13 --- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js 26 Jul 2013 13:16:57 -0000 1.12 +++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js 28 Nov 2013 18:39:49 -0000 1.13 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v diff -u -r1.27 -r1.28 --- lams_tool_larsrc/web/pages/authoring/basic.jsp 15 Aug 2012 10:59:16 -0000 1.27 +++ lams_tool_larsrc/web/pages/authoring/basic.jsp 28 Nov 2013 18:39:48 -0000 1.28 @@ -2,9 +2,7 @@ <%-- If you change this file, remember to update the copy made for CNG-36 --%> - + @@ -136,9 +136,6 @@ ');" class="space-left"> - - -

Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v diff -u -r1.19 -r1.20 --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp 10 Nov 2008 02:57:12 -0000 1.19 +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp 28 Nov 2013 18:39:48 -0000 1.20 @@ -39,17 +39,6 @@ - <%-- Remove description in as LDEV-617 - - - - - - - - - --%> -

@@ -63,10 +52,8 @@ - <%@ include file="instructions.jsp"%> - Index: lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp,v diff -u -r1.16 -r1.17 --- lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp 10 Nov 2008 02:57:12 -0000 1.16 +++ lams_tool_larsrc/web/pages/authoring/parts/addlearningobject.jsp 28 Nov 2013 18:39:48 -0000 1.17 @@ -36,17 +36,6 @@ - - <%-- Remove description in as LDEV-617 - - - - - - - - - --%>
@@ -60,10 +49,9 @@
+ - <%@ include file="instructions.jsp"%> - - <%-- Remove description in as LDEV-617 - - - - - - - - - --%> -
@@ -63,10 +52,8 @@ - <%@ include file="instructions.jsp"%> -
Index: lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp,v diff -u -r1.16 -r1.17 --- lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp 10 Nov 2008 02:57:12 -0000 1.16 +++ lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp 28 Nov 2013 18:39:48 -0000 1.17 @@ -39,17 +39,6 @@ - <%-- Remove description in as LDEV-617 - - - - - - - - - --%> -
@@ -62,8 +51,8 @@ + - <%@ include file="instructions.jsp"%> Index: lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp 26 Jul 2013 13:16:57 -0000 1.15 +++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp 28 Nov 2013 18:39:48 -0000 1.16 @@ -1,45 +1,38 @@ <%@ include file="/common/taglibs.jsp"%> - + +
- +
- - + - - - -
+ ${status.index+1} - + + <%-- Don't display down icon if last line --%> - " onclick="upItem('${status.index}')"> - "> @@ -52,16 +45,15 @@ - "> <%-- Don't display down icon if last line --%> + " onclick="removeInstruction('${status.index}')"> @@ -70,12 +62,16 @@
+ + + +
+
<%-- This script will adjust resource item input area height according to the new instruction item amount. --%>