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.17 -r1.18
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	27 Apr 2006 02:37:45 -0000	1.17
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	27 Apr 2006 04:03:16 -0000	1.18
@@ -151,7 +151,8 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
 			input="/pages/learning/learning.jsp"
 			parameter="finish" >
-			<forward name="success" path="/pages/learning/finish.jsp" />
+			<forward name="finish" path="/pages/learning/finish.jsp" />
+			<forward name="previewfinish" path="/pages/learning/previewfinish.jsp" />
 		</action>
 		
 		<action path="/learning/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.5 -r1.6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	27 Apr 2006 02:37:45 -0000	1.5
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	27 Apr 2006 04:03:16 -0000	1.6
@@ -96,10 +96,11 @@
 	
 	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.
-		Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
-		if(resourceItemUid != null)
+		String resourceItemUid = request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID);
+		if(resourceItemUid != null){
 			doComplete(request);
-		
+			request.setAttribute(ResourceConstants.ATTR_RUN_AUTO,true);
+		}
 		Long sessionId = (Long) request.getSession().getAttribute(
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 		HttpSession ss = SessionManager.getSession();
@@ -123,13 +124,12 @@
 			try {
 				nextActivityUrl = service.finishToolSession(sessionId,userID);
 				request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL,nextActivityUrl);
-				return mapping.findForward("finish");
 			} catch (ResourceApplicationException e) {
 				log.error("Failed get next activity url:" + e.getMessage());
 			}
-		}
-
-		return mapping.findForward("success");
+			return mapping.findForward("finish");
+		}else
+			return mapping.findForward("previewfinish");
 	}
 
 	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	27 Apr 2006 02:37:45 -0000	1.4
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	27 Apr 2006 04:03:16 -0000	1.5
@@ -9,29 +9,22 @@
 		<%@ include file="/common/header.jsp"%>
 		<script language="JavaScript" type="text/JavaScript">
 <!--
-		
-		function finish()
-		{
+		function finishIns(){
 			if(${mode.learner}){
 			   var reqIDVar = new Date();
 			   //if auto run mode, the opener will be null
 			   if(window.parent.opener != null) 
 				   window.parent.opener.parent.frames['learningFrame'].location.href="<c:url value="/learning/completeItem.do"/>?itemUid=${itemUid}&reqID="+reqIDVar.getTime();
 			   else{
-			   //set complete flag and finish this activity as well.
-			       window.parent.opener.parent.frames['learningFrame'].location.href='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&itemUid=${itemUid}"/>';
+			  		//set complete flag and finish this activity as well.
+			        window.parent.location.href='<c:url value="/learning/finish.do?toolSessionID=${toolSessionID}&itemUid=${itemUid}"/>';
 			   }
 			}
 		   if(window.parent.opener != null) {
 				window.parent.opener=null;
 				window.parent.close();
 			}
 		}
-
-		function finishIns(){
-			window.parent.opener=null;
-			window.parent.close();
-		}
 		function nextIns(currIns){
 			document.location.href="<c:url value='/nextInstruction.do?currInstructonId='/>" + currIns;
 		}
Index: lams_tool_larsrc/web/pages/learning/finish.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/finish.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/pages/learning/finish.jsp	27 Apr 2006 02:37:45 -0000	1.1
+++ lams_tool_larsrc/web/pages/learning/finish.jsp	27 Apr 2006 04:03:16 -0000	1.2
@@ -4,7 +4,10 @@
 	<body>
 	<script type="text/javascript">
 	<!--
-		parent.location = ${nextActivityUrl};
+		if(${runAuto})
+			document.location.href = "${nextActivityUrl}";
+		else
+			parent.location = "${nextActivityUrl}";
 	-->        
     </script>
 	
Index: lams_tool_larsrc/web/pages/learning/previewfinish.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/Attic/previewfinish.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learning/previewfinish.jsp	27 Apr 2006 04:03:16 -0000	1.1
@@ -0,0 +1,13 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<html>
+	<head>
+		<%@ include file="/common/header.jsp"%>
+	</head>
+	<body>
+		<div style="align:center">
+			Preview Success.
+		</div>
+	</body>
+</html>
\ No newline at end of file