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.27 -r1.28
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	25 Aug 2006 02:41:05 -0000	1.27
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	25 Aug 2006 06:58:22 -0000	1.28
@@ -167,6 +167,25 @@
 			<forward name="finish" path="/pages/learning/finish.jsp" />
 		</action>
 		
+		
+		<action path="/learning/addfile"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
+			parameter="addfile"
+			name="resourceItemForm" 
+			scope="request" 
+			validate="false">
+			<forward name="success" path="/pages/learning/addfile.jsp" />
+		</action>
+		
+		<action path="/learning/addurl"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
+			parameter="addurl"
+			name="resourceItemForm" 
+			scope="request" 
+			validate="false">
+			<forward name="success" path="/pages/learning/addurl.jsp" />
+		</action>
+		
 		<action path="/learning/saveOrUpdateItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			parameter="saveOrUpdateItem"
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	25 Aug 2006 06:04:42 -0000	1.16
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	25 Aug 2006 06:58:22 -0000	1.17
@@ -56,6 +56,7 @@
 import org.lamsfoundation.lams.tool.rsrc.service.UploadResourceFileException;
 import org.lamsfoundation.lams.tool.rsrc.web.form.ResourceItemForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -86,12 +87,32 @@
 		if(param.equals("finish")){
 			return finish(mapping, form, request, response);
 		}
+		if (param.equals("addfile")) {
+			return addItem(mapping, form, request, response);
+		}
+		if (param.equals("addurl")) {
+			return addItem(mapping, form, request, response);
+		}
         if (param.equals("saveOrUpdateItem")) {
         	return saveOrUpdateItem(mapping, form, request, response);
         }
 		return  mapping.findForward(ResourceConstants.ERROR);
 	}
 	/**
+	 * Initial page for add resource item (single file or URL).
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	private ActionForward addItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		ResourceItemForm itemForm = (ResourceItemForm) form;
+		itemForm.setMode(WebUtil.readStrParam(request, AttributeNames.ATTR_MODE));
+		itemForm.setSessionMapID(WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID));
+		return mapping.findForward(ResourceConstants.SUCCESS);
+	}
+	/**
 	 * Read resource data from database and put them into HttpSession. It will redirect to init.do directly after this
 	 * method run successfully. 
 	 *  
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	25 Aug 2006 02:41:05 -0000	1.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java	25 Aug 2006 06:58:22 -0000	1.8
@@ -36,6 +36,9 @@
 	private String itemIndex;
 	private String sessionMapID;
 	
+	//tool access mode;
+	private String mode;
+	
 	private String title;
 	private short itemType;
 	private String description;
@@ -120,4 +123,10 @@
 	public void setSessionMapID(String sessionMapID) {
 		this.sessionMapID = sessionMapID;
 	}
+	public String getMode() {
+		return mode;
+	}
+	public void setMode(String mode) {
+		this.mode = mode;
+	}
 }
Index: lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/mainframe.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	25 Aug 2006 02:41:04 -0000	1.5
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	25 Aug 2006 06:58:22 -0000	1.6
@@ -22,5 +22,5 @@
 <frameset rows="110,*" frameborder="no">
 	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}&sessionMapID=${sessionMapID}" 
 	name=headerFrame" marginheight="0" scrolling="NO">
-	<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="resourceFrame" marginheight="0" scrolling="YES">
+	<frame src="<c:url value='${resourceItemReviewUrl}'/>?sessionMapID=${sessionMapID}" name="resourceFrame" marginheight="0" scrolling="YES">
 </frameset>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addfile.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	25 Aug 2006 06:04:42 -0000	1.7
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	25 Aug 2006 06:58:22 -0000	1.8
@@ -5,9 +5,9 @@
 	</head>
 	<body>
 		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm" enctype="multipart/form-data">
-			<input type="hidden" name="itemType" id="itemType" value="2" />
-			<input type="hidden" name="mode" value="${param.mode}" />
-			<input type="hidden" name="sessionMapID" value="${param.sessionMapID}" />
+			<html:hidden property="itemType" styleId="itemType" value="2" />
+			<html:hidden property="mode"/>
+			<html:hidden property="sessionMapID"/>
 			<table width="100%" border="0" align="left" cellpadding="0" cellspacing="0">
 				<tr>
 					<td colspan="2">
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/addurl.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	25 Aug 2006 06:04:42 -0000	1.9
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	25 Aug 2006 06:58:22 -0000	1.10
@@ -7,9 +7,9 @@
 	<body>
 		<!-- Basic Info Form-->
 		<html:form action="/learning/saveOrUpdateItem" method="post" styleId="resourceItemForm">
-			<input type="hidden" name="itemType" id="itemType" value="1" />
-			<input type="hidden" name="mode" value="${param.mode}" />
-			<input type="hidden" name="sessionMapID" value="${param.sessionMapID}" />
+			<html:hidden property="itemType" styleId="itemType" value="1" />
+			<html:hidden property="mode"/>
+			<html:hidden property="sessionMapID"/>
 			<table width="100%" border="0" align="left" cellpadding="0" cellspacing="0">
 				<tr>
 					<td  colspan="2">
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/learning.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_larsrc/web/pages/learning/learning.jsp	25 Aug 2006 06:04:42 -0000	1.25
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	25 Aug 2006 06:58:22 -0000	1.26
@@ -24,13 +24,13 @@
 	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
-			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+			var gurl = "<c:url value="/learning/addurl.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
 		function gotoFile(){
  		    var reqIDVar = new Date();
- 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
+ 		    var gurl = "<c:url value="/learning/addfile.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
@@ -71,9 +71,9 @@
 		<!--closes header-->
 
 		<div id="content-learner">
-			<p>
+			<h2>
 				${resource.instructions}
-			</p>
+			</h2>
 
 			<%@ include file="/common/messages.jsp"%>
 			<table cellpadding="0" cellspacing="0" class="alternative-color">
@@ -175,21 +175,21 @@
 					<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
+						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
 					<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addfile.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
+						showMessage("<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
 					<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
 						<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}");
+						showMessage("<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}");
 					-->
 				</script>
 					</c:when>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/success.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/pages/learning/success.jsp	25 Aug 2006 06:04:42 -0000	1.6
+++ lams_tool_larsrc/web/pages/learning/success.jsp	25 Aug 2006 06:58:22 -0000	1.7
@@ -12,10 +12,10 @@
 		</script>
 		<div style="align:center">
 			<c:if test="${addType == 1}">
-				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
+				Add URL success, <a href="<c:url value='/learning/addurl.do'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
 			</c:if>
 			<c:if test="${addType == 2}">
-				Add File success, <a href="<c:url value='/pages/learning/addfile.jsp'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
+				Add File success, <a href="<c:url value='/learning/addfile.do'/>?sessionMapID=${sessionMapID}&mode=${mode}" target="newResourceFrame">click here to return</a>.
 			</c:if>
 		</div>
 	</body>
Index: lams_tool_larsrc/web/pages/learningobj/mainframe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learningobj/mainframe.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	25 Aug 2006 02:41:05 -0000	1.4
+++ lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	25 Aug 2006 06:58:22 -0000	1.5
@@ -21,7 +21,7 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <frameset cols="25%,75%" rows="*">
-	<frame src="navigatortree.jsp?sessionMapID=${sessionMapID}" name="navigatorFrame" marginheight="0"  scrolling="YES">
+	<frame src="navigatortree.jsp?sessionMapID=${param.sessionMapID}" name="navigatorFrame" marginheight="0"  scrolling="YES">
 	<frame src="defaultcontent.jsp" name="contentFrame" marginheight="0" scrolling="YES">
 </frameset>
 
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	25 Aug 2006 02:41:05 -0000	1.8
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	25 Aug 2006 06:58:22 -0000	1.9
@@ -28,9 +28,10 @@
 	<html:base />
 	<%@ include file="/common/header.jsp"%>
 	
-	<c:set var="sessionMap" value="${sessionScope[param.sessionMapID]}"/>
-	<c:set var="crPackage" value="${sessionMap.crPackage}"/>
-	
+	<c:set var="sessionMapID" value="${param.sessionMapID}"/>
+	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+	<c:set var="cpPackage" value="${sessionMap.cpPackage}"/>
+	 
 	<style type="text/css">
 	<!--
 	table {