Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/xdoclet/struts-actions.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	24 Mar 2006 06:23:55 -0000	1.4
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	28 Mar 2006 07:26:15 -0000	1.5
@@ -16,4 +16,19 @@
 			validate="false">
 			<forward name="success" path="/pages/authoring/authoring.jsp" />
 		</action>
-		
\ No newline at end of file
+		
+		<action path="/authoring/addUrl"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			parameter="addUrl">
+			<forward name="success" path="/pages/authoring/parts/addurl.jsp" />
+		</action>
+		<action path="/authoring/newInstruction"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			parameter="newInstruction">
+			<forward name="success" path="/pages/authoring/parts/instructions.jsp" />
+		</action>
+		<action path="/authoring/removeInstruction"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			parameter="removeInstruction">
+			<forward name="success" path="/pages/authoring/parts/instructions.jsp" />
+		</action>
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/Attic/ApplicationResources.properties,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ApplicationResources.properties	27 Mar 2006 06:10:17 -0000	1.3
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ApplicationResources.properties	28 Mar 2006 07:26:15 -0000	1.4
@@ -37,7 +37,8 @@
 label.authoring.basic.resource.add.instruction=Add Instruction
 label.authoring.basic.resource.instructions=Instructions
 
-label.authoring.basic.resource.title.input=Description
+label.authoring.basic.resource.title.input=Title
+label.authoring.basic.resource.url.input=URL
 label.authoring.basic.resource.file.input=Description
 label.authoring.basic.resource.description.input=Description
 label.authoring.basic.resource.zip.file.input=Zip file:
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.4 -r1.5
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	24 Mar 2006 06:23:56 -0000	1.4
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	28 Mar 2006 07:26:15 -0000	1.5
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -30,6 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
@@ -48,6 +50,7 @@
  * @version $Revision$
  */
 public class AuthoringAction extends Action {
+	private static final int INIT_INSTRUCTION_COUNT = 2;
 	private static Logger log = Logger.getLogger(AuthoringAction.class);
 	
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
@@ -78,10 +81,17 @@
 //        if (param.equals("deleteOfflineFile")) {
 //        	return deleteOfflineFile(mapping, form, request, response);
 //        }
-//        //-----------------------Topic function ---------------------------
-//	  	if (param.equals("newTopic")) {
-//       		return newTopic(mapping, form, request, response);
-//        }
+        //----------------------- Add resource function ---------------------------
+        if (param.equals("addUrl")) {
+        	return addUrl(mapping, form, request, response);
+        }
+        if (param.equals("removeUrl")) {
+        	return removeUrl(mapping, form, request, response);
+        }
+        //-----------------------Instruction function ---------------------------
+	  	if (param.equals("newInstruction")) {
+       		return newInstruction(mapping, form, request, response);
+        }
 //	  	if (param.equals("createTopic")) {
 //       		return createTopic(mapping, form, request, response);
 //        }
@@ -108,6 +118,43 @@
 //        }
         return mapping.findForward(ResourceConstants.ERROR);
 	}
+	private ActionForward addUrl(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		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(ResourceConstants.SUCCESS);
+	}
+	private ActionForward newInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		int count = NumberUtils.stringToInt(request.getParameter("instructionCount"),0);
+		List instructionList = new ArrayList(++count);
+		for(int idx=0;idx<count;idx++){
+			String item = request.getParameter("instructionItem"+idx);
+			if(item == null)
+				instructionList.add("");
+			else
+				instructionList.add(item);
+		}
+		request.setAttribute("instructionList",instructionList);
+		return mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	private ActionForward removeUrl(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		int count = NumberUtils.stringToInt(request.getParameter("instructionCount"),0);
+		int removeIdx = NumberUtils.stringToInt(request.getParameter("removeIdx"),-1);
+		List instructionList = new ArrayList(count-1);
+		for(int idx=0;idx<count;idx++){
+			String item = request.getParameter("instructionItem"+idx);
+			if(idx == removeIdx)
+				continue;
+			if(item == null)
+				instructionList.add("");
+			else
+				instructionList.add(item);
+		}
+		request.setAttribute("instructionList",instructionList);
+		return mapping.findForward(ResourceConstants.SUCCESS);
+	}
 	//******************************************************************************************************************
 	//              Forum Author functions
 	//******************************************************************************************************************
Index: lams_tool_larsrc/web/includes/css/rsrc.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/includes/css/rsrc.css,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/includes/css/rsrc.css	27 Mar 2006 06:10:17 -0000	1.1
+++ lams_tool_larsrc/web/includes/css/rsrc.css	28 Mar 2006 07:26:15 -0000	1.2
@@ -5,4 +5,19 @@
 	float:left;
 
 	margin : 0px 0px 0px 0px;
-}
\ No newline at end of file
+}
+
+.innerforms {
+	border: 0px;
+	font-size: small;
+	font-style: normal;
+	width:100%;
+}
+
+.buttonStyle{
+	font-size: 12px;
+	color: #000000;
+	text-decoration:none;
+	text-align: center;
+	background-color:#B4C8FE;
+}
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	24 Mar 2006 06:23:57 -0000	1.3
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	28 Mar 2006 07:26:14 -0000	1.4
@@ -78,7 +78,6 @@
 	focus="title"  enctype="multipart/form-data">
 		<html:hidden property="toolContentID"/>
 		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch"/>
 
 <h1><fmt:message key="label.authoring.heading" /></h1>
 
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.3 -r1.4
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	27 Mar 2006 06:10:18 -0000	1.3
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	28 Mar 2006 07:26:15 -0000	1.4
@@ -6,14 +6,14 @@
 	 * Launches the popup window for the instruction files
 	 */
 	function showMessage(url) {
-		var area=document.getElementById("itemArea");
+		var area=document.getElementById("reourceInputArea");
 		area.style.width="100%";
 		area.style.height="100%";
 		area.src=url;
 		area.style.display="block";
 	}
 	function hideMessage(){
-		var area=document.getElementById("itemArea");
+		var area=document.getElementById("reourceInputArea");
 		area.style.width="0px";
 		area.style.height="0px";
 		area.style.display="none";
@@ -43,7 +43,7 @@
 				<table class="forms">
 					<tr>
 						<td>
-							<a href="javascript:showMessage('<html:rewrite page="/pages/authoring/parts/addurl.jsp"/>');">
+							<a href="javascript:showMessage('<html:rewrite page="/authoring/addUrl.do"/>');">
 								<fmt:message key="label.authoring.basic.add.url" />
 							</a>
 						</td>
@@ -69,7 +69,7 @@
 		<tr>
 			<td  colspan="2">
 				<iframe onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'" 
-					id="itemArea" name="itemArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
+					id="reourceInputArea" name="reourceInputArea" style="width:0px;height:0px;border:0px;display:none" frameborder="no" scrolling="no">
 				</iframe>
 			</td>
 		</tr>
Index: lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	27 Mar 2006 06:10:17 -0000	1.1
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	28 Mar 2006 07:26:14 -0000	1.2
@@ -1,42 +1,118 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <head>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
     <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
 	<!-- this is the custom CSS for hte tool -->
 	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
 	<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/prototype.js'/>"></script>
+	
+<script type="text/javascript">
+    var insTargetDiv = "instructionArea";
+    var remvTargetDiv = "instructionArea";
+	function removeInstruction(idx){
+		//var id = "instructionItem" + idx;
+		//Element.remove(id);
+ 		var url="<c:url value='/authoring/removeInstruction.do'/>";
+	    var reqIDVar = new Date();
+	    var param = Form.serialize("instructionForm")+"&removeIdx="+idx+"&reqID="+reqIDVar.getTime();
+	    removeInstructionLoading();
+	    var myAjax = new Ajax.Updater(
+		    	remvTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:removeInstructionComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function addInstruction(){
+		var url="<c:url value='/authoring/newInstruction.do'/>";
+	    var reqIDVar = new Date();
+	    var param = Form.serialize("instructionForm")+"&reqID="+reqIDVar.getTime();
+		addInstructionLoading();
+	    var myAjax = new Ajax.Updater(
+		    	insTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:addInstructionComplete,
+		    		evalScripts:true
+		    	}
+	    );
+	}
+	function removeInstructionLoading(){
+		showBusy(remvTargetDiv);
+	}
+	function removeInstructionComplete(){
+		hideBusy(remvTargetDiv);
+	
+	}
+	function addInstructionLoading(){
+		showBusy(insTargetDiv);
+	}
+	function addInstructionComplete(){
+		hideBusy(insTargetDiv);
+	
+	}
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
+</script>
+
 </head>
 <body class="tabpart">
-<!-- This table is just for layout -->
-<table class="forms">
-<tr><td>
 	<table class="forms">
 		<!-- Basic Info Form-->
 		<tr>
-			<table>
+			<td>
+			<table class="innerforms">
 				<tr>
 					<td colspan="2"><h2><fmt:message key="label.authoring.basic.add.url"/></h2></td>
 				</tr>
 				<tr>
-					<td><fmt:message key="label.authoring.basic.resource.title.input"/></td>
-					<td><input type="text" name="title"></td>
+					<td width="130px"><fmt:message key="label.authoring.basic.resource.title.input"/></td>
+					<td><input type="text" name="title" size="55"></td>
 				</tr>
+				<tr>
+					<td width="130px"><fmt:message key="label.authoring.basic.resource.url.input"/></td>
+					<td><input type="text" name="url" size="55"></td>
+				</tr>	
 			</table>
+			</td>
 		</tr>
 		<tr>
+			<td><hr></td>
+		</tr>
+		<tr>
+			
 			<!-- Instructions -->
-			<table>
-				<tr>
-					<td></td>
-				</tr>
-				<tr>
-					<td></td>
-				</tr>
-			</table>
+			<td>
+				<table class="innerforms">
+					<tr>
+						<td>
+							<%@ include file="instructions.jsp" %>
+						</td>
+						<td width="100%" align="right" valign="bottom">
+							<input type="button" name="add" value="<fmt:message key="label.authoring.basic.add.url"/>" class="buttonStyle">
+						</td>
+					</tr>
+				</table>
+			</td>
 		</tr>
 	</table>
-</td></tr>
-</table>
+
 </body>
 </html>
\ No newline at end of file
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp	28 Mar 2006 07:26:14 -0000	1.1
@@ -0,0 +1,35 @@
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<div id="instructionArea">
+	<form id="instructionForm">
+	<input type="hidden" name="instructionCount" id="instructionCount">
+	<table>
+		<tr>
+			<td colspan="5">
+				<fmt:message key="label.authoring.basic.resource.instructions"/>
+				<input type="button" onclick="addInstruction()" value="<fmt:message key="label.authoring.basic.resource.add.instruction"/>" class="buttonStyle">  
+				<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="10px">${status.index}</td>
+				<td width="100px"><input type="text" name="instructionItem1" size="70" value="${item}"></td>
+				<td width="40px"><img src="<html:rewrite page='/includes/images/uparrow.gif'/>"></td>
+				<td width="40px"><img src="<html:rewrite page='/includes/images/downarrow.gif'/>"></td>
+				<td width="40px">
+					<a href="javascript:;" onclick="removeInstruction('${status.index}')">
+						<img src="<html:rewrite page='/includes/images/cross.gif'/>">
+					</a>
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+	</form>
+</div>
+
+<script type="text/javascript">
+	$("instructionCount").value="${fn:length(instructionList)}";
+	var obj = window.top.document.getElementById('reourceInputArea');
+	obj.style.height=obj.contentWindow.document.body.scrollHeight+'px';
+</script>