Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
===================================================================
diff -u -r5ca22e4b948f3f34a5505cedf17cb8ff06490fb4 -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5ca22e4b948f3f34a5505cedf17cb8ff06490fb4)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	(.../LearningAction.java)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -93,6 +93,7 @@
 	
 	private ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		//auto run mode, when use finish the only one resource item, mark it as complete then finish this activity as well.
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		String resourceItemUid = request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID);
 		String runOffline = request.getParameter(ResourceConstants.PARAM_RUN_OFFLINE);
 		if(resourceItemUid != null){
@@ -126,12 +127,15 @@
 		} catch (ResourceApplicationException e) {
 			log.error("Failed get next activity url:" + e.getMessage());
 		}
+		
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return mapping.findForward("finish");
 	}
 
 	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		doComplete(request);
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
@@ -147,6 +151,7 @@
 	private ActionForward saveOrUpdateItem(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
 		
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
 		ResourceItemForm itemForm = (ResourceItemForm)form;
 		ActionErrors errors = validateResourceItem(itemForm);
 		
@@ -208,6 +213,7 @@
 		
 		//URL or file upload
 		request.setAttribute("addType",new Short(type));
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
 		return  mapping.findForward(ResourceConstants.SUCCESS);
 	}
 	/**
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -ra780ca2abc108cb1fc24396a2429461b7973f16a -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision a780ca2abc108cb1fc24396a2429461b7973f16a)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -6,18 +6,23 @@
 		<title>${instructions.title}</title>
 
 		<%@ include file="/common/header.jsp"%>
+		
+		<%-- param has higher level for request attribute --%>
+		<c:if test="${not empty param.mode}">
+			<c:set var="mode" value="${param.mode}"/>
+		</c:if>		
 		<script language="JavaScript" type="text/JavaScript">
 		<!--
 				function finishIns(){
 				//learner and author(preview mode) will mark the finish
-					if(${param.mode == "learner"} || ${param.mode == "author"}){
+					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
 					   //if auto run mode, the opener will be null
 					   if(window.parent.opener != null) 
-						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
+						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
 					   else{
 					  		//set complete flag and finish this activity as well.
-					        window.parent.location.href='<c:url value="/learning/finish.do?toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
+					        window.parent.location.href='<c:url value="/learning/finish.do?mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 					   }
 					}
 				   if(window.parent.opener != null) {
@@ -26,7 +31,7 @@
 					}
 				}
 				function nextIns(currIns){
-					document.location.href="<c:url value='/nextInstruction.do'/>?insIdx=" + currIns + "&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}&mode=${param.mode}";
+					document.location.href="<c:url value='/nextInstruction.do'/>?mode=${mode}&insIdx=" + currIns + "&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}";
 				}
 		//-->
 		</script>
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r356eb906d0a80130e76929e9cd914b57304887ff -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 356eb906d0a80130e76929e9cd914b57304887ff)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp	(.../addfile.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -47,6 +47,7 @@
 					<%@ include file="/common/messages.jsp"%>
 					<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}"/>
 						<table class="innerforms">
 							<tr>
 								<td valign="top">
Index: lams_tool_larsrc/web/pages/learning/addurl.jsp
===================================================================
diff -u -r12268ac0f789aef40452d6850b638d6c118b21bc -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 12268ac0f789aef40452d6850b638d6c118b21bc)
+++ lams_tool_larsrc/web/pages/learning/addurl.jsp	(.../addurl.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -47,6 +47,7 @@
 					<%@ include file="/common/messages.jsp"%>
 					<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}"/>
 						<table class="innerforms">
 							<tr>
 								<td valign="top">
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r0323e71ffd563ef7cd2bc6560e0fc5428f998268 -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0323e71ffd563ef7cd2bc6560e0fc5428f998268)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -7,35 +7,40 @@
 	<title><fmt:message key="label.learning.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 
+	<%-- param has higher level for request attribute --%>
+	<c:if test="${not empty param.mode}">
+		<c:set var="mode" value="${param.mode}"/>
+	</c:if>
+	
 	<script type="text/javascript">
 	<!--
 		function gotoURL(){
  		    var reqIDVar = new Date();
-			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?&reqID="+reqIDVar.getTime();
+			var gurl = "<c:url value="/pages/learning/addurl.jsp"/>?mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
 		function gotoFile(){
  		    var reqIDVar = new Date();
- 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?&reqID="+reqIDVar.getTime();
+ 		    var gurl = "<c:url value="/pages/learning/addfile.jsp"/>?mode=${mode}&reqID="+reqIDVar.getTime();
 	      	showMessage(gurl);
 	      	return false;
 		}
 		function checkNew(){
  		    var reqIDVar = new Date();
-			document.location.href = "<c:url value="/learning/start.do"/>?mode=${param.mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
+			document.location.href = "<c:url value="/learning/start.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
  		    return false;
 		}
 		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${param.mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
+			var myUrl = "<c:url value="/reviewItem.do"/>?mode=${mode}&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
 		function completeItem(itemUid){
-			document.location.href = "<c:url value="/learning/completeItem.do"/>?itemUid=" + itemUid;
+			document.location.href = "<c:url value="/learning/completeItem.do"/>?mode=${mode}&itemUid=" + itemUid;
 			return false;
 		}
 		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}"/>';
+			document.location.href ='<c:url value="/learning/finish.do?mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
 		function showMessage(url) {
@@ -94,7 +99,7 @@
 				</td>
 				
 				<td>
-					<c:if test="${param.mode != 'teacher'}">
+					<c:if test="${mode != 'teacher'}">
 						<a href="#" class="button" onclick="return completeItem(${item.uid})"><fmt:message key="label.completed" /></a>
 					</c:if>	
 					<a href="javascript:;" class="button" onclick="viewItem(${item.uid})" ><fmt:message key="label.view" /></a>
@@ -105,7 +110,7 @@
 			<td colspan="3" align="right">
 				<a href="#" class="button" onclick="return checkNew()"><fmt:message key="label.check.for.new" /></a>
 				&nbsp;
-				<c:if test="${param.mode != 'teacher'}">
+				<c:if test="${mode != 'teacher'}">
 					<a href="#" class="button" onclick="return finishSession()">
 						<fmt:message key="label.finished" />
 					</a>
@@ -120,7 +125,7 @@
 			</tr>
 		</c:if>
 	</table>
-	<c:if test="${param.mode != 'teacher'}">
+	<c:if test="${mode != 'teacher'}">
 		<c:if test="${resource.allowAddFiles || resource.allowAddUrls}">
 			<table border="0" align="center" width="100%">
 				<tr>
@@ -153,21 +158,21 @@
 			<c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
 				<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?mode=${mode}");
 					-->
 				</script>
 			</c:when>
 			<c:when test="${resource.allowAddFiles && !resource.allowAddUrls}">
 				<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addfile.jsp'/>");
+						showMessage("<c:url value='/pages/learning/addfile.jsp'/>?mode=${mode}");
 					-->
 				</script>
 			</c:when>
 			<c:when test="${!resource.allowAddFiles && resource.allowAddUrls}">
 				<script type="text/javascript">
 					<!--
-						showMessage("<c:url value='/pages/learning/addurl.jsp'/>");
+						showMessage("<c:url value='/pages/learning/addurl.jsp'/>?mode=${mode}");
 					-->
 				</script>
 			</c:when>
Index: lams_tool_larsrc/web/pages/learning/success.jsp
===================================================================
diff -u -rfb406a57261a31898b62f3c808ffccb853089336 -r1e633dd70ea6f5461605ec545fd608e876354db0
--- lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision fb406a57261a31898b62f3c808ffccb853089336)
+++ lams_tool_larsrc/web/pages/learning/success.jsp	(.../success.jsp)	(revision 1e633dd70ea6f5461605ec545fd608e876354db0)
@@ -8,14 +8,14 @@
 	<body>
 		<script type="text/javascript">
 			var reqIDVar = new Date();
-			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?reqID="+reqIDVar.getTime();
+			window.parent.location.href  = "${tool}/pages/learning/learning.jsp?mode=${mode}&reqID="+reqIDVar.getTime();
 		</script>
 		<div style="align:center">
 			<c:if test="${addType == 1}">
-				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>" target="newResourceFrame">click here to return</a>.
+				Add URL success, <a href="<c:url value='/pages/learning/addurl.jsp'/>?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'/>" target="newResourceFrame">click here to return</a>.
+				Add File success, <a href="<c:url value='/pages/learning/addfile.jsp'/>?mode=${mode}" target="newResourceFrame">click here to return</a>.
 			</c:if>
 		</div>
 	</body>