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.23 -r1.24
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	11 May 2006 06:00:47 -0000	1.23
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	18 May 2006 06:39:06 -0000	1.24
@@ -129,18 +129,11 @@
 		<!-- ==========  Display Item  ========== -->
 		<action path="/reviewItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.ViewItemAction"
-			name="instructionNavForm" 
-			scope="session" 
-			validate="false"
 			parameter="reviewItem">
 			<forward name="success" path="/pages/itemreview/mainframe.jsp" />
 		</action>
-		
 		<action path="/nextInstruction"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.ViewItemAction"
-			name="instructionNavForm" 
-			scope="session" 
-			validate="false"
 			parameter="nextInstruction">
 			<forward name="success" path="/pages/itemreview/instructionsnav.jsp" />
 		</action>
@@ -161,7 +154,6 @@
 			input="/pages/learning/learning.jsp"
 			parameter="finish" >
 			<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/ResourceConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java,v
diff -u -r1.19 -r1.20
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	17 May 2006 03:12:18 -0000	1.19
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	18 May 2006 06:39:06 -0000	1.20
@@ -47,6 +47,7 @@
 	public static final String PARAM_FILE_UUID = "fileUuid";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
 	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
+	public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx";
 	
 	//for request attribute name
 	public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
@@ -65,6 +66,7 @@
 	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
 	public static final String ATTR_SUMMARY_LIST = "summaryList";
 	public static final String ATTR_USER_LIST = "userList";
+	public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
 	
 	//error message keys
 	public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/InstructionNavDTO.java	18 May 2006 06:39:06 -0000	1.1
@@ -0,0 +1,82 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.tool.rsrc.dto;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
+
+/**
+ * 
+ * @author Steve.Ni
+ * @version $Revision$
+ */
+public class InstructionNavDTO {
+	
+	private String title;
+	private int total;
+	private int current;
+	private ResourceItemInstruction instruction;
+	private List allInstructions;
+	private short type;
+
+	public int getCurrent() {
+		return current;
+	}
+	public void setCurrent(int current) {
+		this.current = current;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	public int getTotal() {
+		return total;
+	}
+	public void setTotal(int total) {
+		this.total = total;
+	}
+	public void setType(short type) {
+		this.type = type;
+	}
+	public short getType() {
+		return type;
+	}
+	public ResourceItemInstruction getInstruction() {
+		return instruction;
+	}
+	public void setInstruction(ResourceItemInstruction instruction) {
+		this.instruction = instruction;
+	}
+	public List getAllInstructions() {
+		return allInstructions;
+	}
+	public void setAllInstructions(List allInstructions) {
+		this.allInstructions = allInstructions;
+	}
+	
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Attic/ResourceItem.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	10 Apr 2006 07:15:15 -0000	1.7
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	18 May 2006 06:39:06 -0000	1.8
@@ -71,7 +71,7 @@
             inverse="false"
             cascade="all-delete-orphan"
             sort="unsorted"
-            order-by="sequence_id desc"
+            order-by="sequence_id asc"
         >
 
             <key
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	24 Apr 2006 06:57:51 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	18 May 2006 06:39:06 -0000	1.10
@@ -170,7 +170,7 @@
 	     * @hibernate.set   lazy="false"
 	     * 					cascade="all-delete-orphan"
 	     * 					inverse="false"
-	     * 					order-by="sequence_id desc"
+	     * 					order-by="sequence_id asc"
 	     * @hibernate.collection-key column="item_uid"
 	     * @hibernate.collection-one-to-many
 	     * 			class="org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction"
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.24 -r1.25
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	17 May 2006 06:55:32 -0000	1.24
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	18 May 2006 06:39:06 -0000	1.25
@@ -59,6 +59,7 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+import org.lamsfoundation.lams.tool.rsrc.dto.InstructionNavDTO;
 import org.lamsfoundation.lams.tool.rsrc.model.Resource;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceAttachment;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
@@ -73,7 +74,6 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.lamsfoundation.lams.tool.rsrc.web.form.InstructionNavForm;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
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.9 -r1.10
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	17 May 2006 07:09:35 -0000	1.9
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java	18 May 2006 06:39:06 -0000	1.10
@@ -119,18 +119,15 @@
 			
 		}
 		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
-		if (mode.isLearner()) {
-			// get sessionId from HttpServletRequest
-			String nextActivityUrl = null ;
-			try {
-				nextActivityUrl = service.finishToolSession(sessionId,userID);
-				request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL,nextActivityUrl);
-			} catch (ResourceApplicationException e) {
-				log.error("Failed get next activity url:" + e.getMessage());
-			}
-			return mapping.findForward("finish");
-		}else
-			return mapping.findForward("previewfinish");
+		// get sessionId from HttpServletRequest
+		String nextActivityUrl = null ;
+		try {
+			nextActivityUrl = service.finishToolSession(sessionId,userID);
+			request.setAttribute(ResourceConstants.ATTR_NEXT_ACTIVITY_URL,nextActivityUrl);
+		} catch (ResourceApplicationException e) {
+			log.error("Failed get next activity url:" + e.getMessage());
+		}
+		return mapping.findForward("finish");
 	}
 
 	private ActionForward complete(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	17 May 2006 06:55:32 -0000	1.5
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java	18 May 2006 06:39:06 -0000	1.6
@@ -42,11 +42,12 @@
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.rsrc.ResourceConstants;
+import org.lamsfoundation.lams.tool.rsrc.dto.InstructionNavDTO;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItem;
 import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
 import org.lamsfoundation.lams.tool.rsrc.service.IResourceService;
-import org.lamsfoundation.lams.tool.rsrc.web.form.InstructionNavForm;
 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.springframework.web.context.WebApplicationContext;
@@ -73,79 +74,120 @@
 
         return mapping.findForward(ResourceConstants.ERROR);
 	}
-
+	/**
+	 * Return next instrucion to page. It need four input parameters, mode, itemIndex or itemUid, and insIdx.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		InstructionNavForm navForm = (InstructionNavForm) form;
-		List list = navForm.getAllInstructions();
-		if(list != null && navForm.getCurrent() < list.size()){
-			//current is start from 1, so, this will return next.
-			navForm.setInstruction((ResourceItemInstruction) list.get(navForm.getCurrent()));
-			navForm.setCurrent(navForm.getCurrent()+1);
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		ResourceItem item = getResourceItem(request, mode);
+		if(item == null){
+			return mapping.findForward(ResourceConstants.ERROR);
 		}
 		
+		int currIns = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_CURRENT_INSTRUCTION_INDEX),0);
+		
+		Set instructions = item.getItemInstructions();
+		InstructionNavDTO navDto = new InstructionNavDTO();
+		//For Learner upload item, its instruction will display description/comment fields in ReosourceItem.
+		if(!item.isCreateByAuthor()){
+			List<ResourceItemInstruction> navItems = new ArrayList<ResourceItemInstruction>(1);
+			//create a new instruction and put ResourceItem description into it: just for display use.
+			ResourceItemInstruction ins = new ResourceItemInstruction();
+			ins.setSequenceId(1);
+			ins.setDescription(item.getDescription());
+			navItems.add(ins);
+			navDto.setAllInstructions(navItems);
+			instructions.add(ins);
+		}else{
+			navDto.setAllInstructions(new ArrayList(instructions));
+		}
+		navDto.setTitle(item.getTitle());
+		navDto.setType(item.getType());
+		navDto.setTotal(instructions.size());
+		if(instructions.size() > 0){
+			navDto.setInstruction((ResourceItemInstruction) new ArrayList(instructions).get(currIns));
+			navDto.setCurrent(currIns+1);
+		}else{
+			navDto.setCurrent(0);
+			navDto.setInstruction(null);
+		}
+			
+		request.setAttribute(ResourceConstants.ATTR_RESOURCE_INSTRUCTION,navDto);
 		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
+	/**
+	 * Display main frame to display instrcution and item content.
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 */
 	private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-		ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
-		ResourceItem item = null;
-		if(mode.isAuthor()){
-			int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
-			//authoring: does not save item yet, so only has ItemList from session and identity by Index
-			List<ResourceItem> resourceList = getResourceItemList(request);
-			item = resourceList.get(itemIdx);
-		}else if(mode.isLearner() || mode.isTeacher()){
-			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
-			//save itemUid to HttpSession
-			request.getSession().setAttribute(ResourceConstants.ATTR_RESOURCE_ITEM_UID,itemUid);
-			Long sessionId =  (Long) request.getSession().getAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID);
-			//learning, list from database, so get item by Uid
-//			get back the resource and item list and display them on page
+		String mode = request.getParameter(AttributeNames.ATTR_MODE);
+		ResourceItem item = getResourceItem(request, mode);
+
+		String idStr = request.getParameter(ResourceConstants.ATTR_TOOL_SESSION_ID);
+		Long sessionId = NumberUtils.createLong(idStr);
+		//mark this item access flag if it is learner
+		if(ToolAccessMode.LEARNER.toString().equals(mode)){
 			IResourceService service = getResourceService();			
-			item = service.getResourceItemByUid(itemUid);
 			HttpSession ss = SessionManager.getSession();
 			//get back login user DTO
 			UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-			service.setItemAccess(itemUid,new Long(user.getUserID().intValue()),sessionId);
+			service.setItemAccess(item.getUid(),new Long(user.getUserID().intValue()),sessionId);
 		}
-		if(item != null){
-			Set instructions = item.getItemInstructions();
-			InstructionNavForm navForm = (InstructionNavForm) form;
-			//For Learner upload item, its instruction will display description/comment fields in ReosourceItem.
-			if(!item.isCreateByAuthor()){
-				List<ResourceItemInstruction> navItems = new ArrayList<ResourceItemInstruction>(1);
-				//create a new instruction and put ResourceItem description into it: just for display use.
-				ResourceItemInstruction ins = new ResourceItemInstruction();
-				ins.setSequenceId(1);
-				ins.setDescription(item.getDescription());
-				navItems.add(ins);
-				navForm.setAllInstructions(navItems);
-				instructions.add(ins);
-			}else{
-				navForm.setAllInstructions(new ArrayList(instructions));
-			}
-			navForm.setTitle(item.getTitle());
-			navForm.setType(item.getType());
-			navForm.setTotal(instructions.size());
-			if(instructions.size() > 0){
-				navForm.setCurrent(1);
-				navForm.setInstruction((ResourceItemInstruction) instructions.iterator().next());
-			}else{
-				navForm.setCurrent(0);
-				navForm.setInstruction(null);
-			}
-			if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT)
-				request.getSession().setAttribute(ResourceConstants.ATT_LEARNING_OBJECT,item);
-			//set url to content frame
-			request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,getReviewUrl(item));
-			return mapping.findForward(ResourceConstants.SUCCESS);
+		
+		if(item == null){
+			return mapping.findForward(ResourceConstants.ERROR);
 		}
+		if(item.getType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT)
+			request.getSession().setAttribute(ResourceConstants.ATT_LEARNING_OBJECT,item);
+		//set url to content frame
+		request.setAttribute(ResourceConstants.ATTR_RESOURCE_REVIEW_URL,getReviewUrl(item));
 		
-		return mapping.findForward(ResourceConstants.ERROR);
+		//these attribute will be use to instruction navigator page
+		request.setAttribute(AttributeNames.ATTR_MODE,mode);
+		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX));
+		request.setAttribute(ResourceConstants.PARAM_ITEM_INDEX,itemIdx);
+		Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+		request.setAttribute(ResourceConstants.PARAM_RESOURCE_ITEM_UID,itemUid);
+		request.setAttribute(ResourceConstants.ATTR_TOOL_SESSION_ID,sessionId);
+		
+		return mapping.findForward(ResourceConstants.SUCCESS);
+		
 	}
 	//*************************************************************************************
 	// Private method 
 	//*************************************************************************************
+	/**
+	 * Return resoruce item according to ToolAccessMode.
+	 * @param request
+	 * @param mode
+	 * @return
+	 */
+	private ResourceItem getResourceItem(HttpServletRequest request, String mode) {
+		ResourceItem item = null;		
+		if(ToolAccessMode.AUTHOR.toString().equals(mode)){
+			int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),0);
+			//authoring: does not save item yet, so only has ItemList from session and identity by Index
+			List<ResourceItem> resourceList = getResourceItemList(request);
+			item = resourceList.get(itemIdx);
+		}else if(ToolAccessMode.LEARNER.toString().equals(mode) || ToolAccessMode.TEACHER.toString().equals(mode)){
+			Long itemUid = NumberUtils.createLong(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID));
+//			get back the resource and item list and display them on page
+			IResourceService service = getResourceService();			
+			item = service.getResourceItemByUid(itemUid);
+		}
+		return item;
+	}
+	
 	private IResourceService getResourceService() {
 	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
 	      return (IResourceService) wac.getBean(ResourceConstants.RESOURCE_SERVICE);
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/InstructionNavForm.java'.
Fisheye: No comparison available.  Pass `N' to diff?
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.12 -r1.13
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	17 May 2006 06:55:32 -0000	1.12
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	18 May 2006 06:39:06 -0000	1.13
@@ -22,7 +22,7 @@
 
 	function previewItem(type,idx){
 		//1:url, 2:file, 3:website,4:learning object
-		var myUrl = "<c:url value='/reviewItem.do?itemIndex='/>"+idx;
+		var myUrl = "<c:url value='/reviewItem.do?mode=author&itemIndex='/>"+idx;
 		launchPopup(myUrl,"Review");
 	}
 	
Index: lams_tool_larsrc/web/pages/itemreview/initnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemreview/initnav.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemreview/initnav.jsp	18 May 2006 06:39:06 -0000	1.1
@@ -0,0 +1,23 @@
+<%--
+To avoid use HttpSession (LDEV-199), try to 
+use request.setAttribute() transfer value. But this page is embeded into a Frame html page, directly 
+request can not block on frame page, so use this trick page redirect request, then server side could handle this 
+request using this page as target 
+--%>
+
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean" value="<%= session.getAttribute("instructionNavForm") %>" />
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+	<head>
+	</head>
+	<body bgcolor="#9DC5EC" border="1" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+		<c:redirect url="/nextInstruction.do">
+			<c:param name="mode" value="${param.mode}"/>
+			<c:param name="itemIndex" value="${param.itemIndex}"/>
+			<c:param name="itemUid" value="${param.itemUid}"/>
+			<c:param name="toolSessionID" value="${param.toolSessionID}"/>
+		</c:redirect>
+	</body>
+</html>
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.6 -r1.7
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	4 May 2006 01:21:50 -0000	1.6
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	18 May 2006 06:39:06 -0000	1.7
@@ -1,23 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%= session.getAttribute("instructionNavForm") %>" />
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 	<head>
-		<title>${formBean.title}</title>
+		<title>${instructions.title}</title>
 	
 		<%@ include file="/common/header.jsp"%>
 		<script language="JavaScript" type="text/JavaScript">
 <!--
 		function finishIns(){
-			if(${mode.learner}){
+			if(${param.mode == "learner"}){
 			   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=${itemUid}&reqID="+reqIDVar.getTime();
+				    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?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=${toolSessionID}&itemUid=${itemUid}"/>';
+			        window.parent.location.href='<c:url value="/learning/finish.do?toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
 			   }
 			}
 		   if(window.parent.opener != null) {
@@ -26,7 +25,7 @@
 			}
 		}
 		function nextIns(currIns){
-			document.location.href="<c:url value='/nextInstruction.do?currInstructonId='/>" + currIns;
+			document.location.href="<c:url value='/nextInstruction.do'/>?insIdx=" + currIns + "&itemUid=${param.itemUid}&itemIndex=${param.itemIndex}&mode=${param.mode}";
 		}
 //-->
 </script>
@@ -39,7 +38,7 @@
 			<tr>
 				<td width="2%"  bgcolor="#282871"></td>
 				<td width="81%" height="15" align="left" bgcolor="#282871">
-					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">${formBean.title} </font>
+					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">${instructions.title} </font>
 				</td>
 				<td width="5%" height="15" align="right" bgcolor="#282871">
 					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">Instructions&nbsp;</font>
@@ -52,23 +51,23 @@
 					<table width="100%" height="100%" border="0" cellpadding="3" class="body" summary="This table is being used for layout purposes only">
 						<tr>
 							<td width="85%" valign="top">
-								<h2>Step ${formBean.current} of ${formBean.total}</h2>
+								<h2>Step ${instructions.current} of ${instructions.total}</h2>
 								<P>
 								<span style="align:center">
 								<c:choose>
-									<c:when test="${formBean.instruction == null}">
+									<c:when test="${instructions.instruction == null}">
 										<fmt:message key="msg.no.instruction"/>
 									</c:when>
 									<c:otherwise>
-										${formBean.instruction.description}
+										${instructions.instruction.description}
 									</c:otherwise>
 								</c:choose>
 								</span>
 							</td>
 							<td width="15%" valign="middle">
 								<c:choose>
-									<c:when test="${formBean.current < formBean.total}">
-										<input name="NextInstruction" type="button" class="buttonStyle" id="NextInstruction" onClick="javascript:nextIns(${formBean.current})" value="<fmt:message key='label.next.instruction'/>" />
+									<c:when test="${instructions.current < instructions.total}">
+										<input name="NextInstruction" type="button" class="buttonStyle" id="NextInstruction" onClick="javascript:nextIns(${instructions.current})" value="<fmt:message key='label.next.instruction'/>" />
 									</c:when>
 									<c:otherwise>
 										<input name="FinishInstruction" type="button" class="buttonStyle" style="width:150" id="FinishInstruction" onClick="javascript:finishIns()" value="<fmt:message key='label.finish'/>" />
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.3 -r1.4
--- lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	8 May 2006 06:52:06 -0000	1.3
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	18 May 2006 06:39:06 -0000	1.4
@@ -20,6 +20,7 @@
 --%>
 <%@ include file="/common/taglibs.jsp" %>
 <frameset rows="110,*" frameborder="no">
-	<frame src="<c:url value="/pages/itemreview/instructionsnav.jsp"/>" name=headerFrame" marginheight="0" scrolling="NO">
+	<frame src="<c:url value="/pages/itemreview/initnav.jsp"/>?mode=${mode}&itemIndex=${itemIndex}&itemUid=${itemUid}&toolSessionID=${toolSessionID}" 
+	name=headerFrame" marginheight="0" scrolling="NO">
 	<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="resourceFrame" marginheight="0" scrolling="YES">
 </frameset>
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.13 -r1.14
--- lams_tool_larsrc/web/pages/learning/learning.jsp	17 May 2006 07:18:39 -0000	1.13
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	18 May 2006 06:39:06 -0000	1.14
@@ -24,7 +24,7 @@
  		    return false;
 		}
 		function viewItem(itemUid){
-			var myUrl = "<c:url value="/reviewItem.do"/>?itemUid=" + itemUid;
+			var myUrl = "<c:url value="/reviewItem.do"/>?mode=learner&toolSessionID=${toolSessionID}&itemUid=" + itemUid;
 			launchPopup(myUrl,"LearnerView");
 		}
 		function completeItem(itemUid){
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/learning/previewfinish.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/pages/learning/start.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/start.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/pages/learning/start.jsp	4 May 2006 01:21:50 -0000	1.3
+++ lams_tool_larsrc/web/pages/learning/start.jsp	18 May 2006 06:39:06 -0000	1.4
@@ -5,7 +5,7 @@
 		<c:choose>
 			<c:when test="${runAuto}">
 				<script type="text/javascript">
-					document.location = "<c:url value="/reviewItem.do"/>?itemUid=${itemUid}";
+					document.location = "<c:url value="/reviewItem.do"/>?mode=learner&toolSessionID=${toolSessionID}&itemUid=${itemUid}";
 				</script>
 			</c:when>
 			<c:otherwise>
Index: lams_tool_larsrc/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	17 May 2006 07:17:54 -0000	1.5
+++ lams_tool_larsrc/web/pages/monitoring/monitoring.jsp	18 May 2006 06:39:06 -0000	1.6
@@ -21,7 +21,7 @@
 	        } 
 	        
 		    function viewItem(itemUid){
-				var myUrl = "<c:url value="/reviewItem.do"/>?itemUid=" + itemUid;
+				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid;
 				launchPopup(myUrl,"MonitoringReview");
 			}
 	    </script>