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'/>" />
