Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	11 Apr 2006 07:25:24 -0000	1.6
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	12 Apr 2006 04:38:42 -0000	1.7
@@ -73,10 +73,10 @@
 label.authoring.advance.allow.learner.add.urls=Allow learners to add URLs
 label.authoring.advance.allow.learner.add.files=Allow learners to add Files
 
-lable.next.instruction=Next Instruction
+label.next.instruction=Next Instruction
 label.authoring.save.button=Save
 label.authoring.cancel.button=Cancel
-lable.description=Description:
+label.description=Description:
 
 authoring.exception= There is a problem in shared resources authoring page, the reason is {0}
 
@@ -97,6 +97,7 @@
 error.msg.default.content.not.find=Could not retrieve default content record for this tool.
 
 authoring.save.success=Authoring save successfully.
+msg.no.instruction=No instruction avalialbe.
 #-------------------------END Authoring Labels END-----------------#
 
 #---------------------------------Monitoring ----------------------------------#
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.12 -r1.13
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	11 Apr 2006 07:25:24 -0000	1.12
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	12 Apr 2006 04:38:42 -0000	1.13
@@ -116,25 +116,23 @@
 			parameter="removeItemAttachment">
 			<forward name="success" path="/pages/authoring/parts/itemattachment.jsp" />
 		</action>
-		<action path="/authoring/nextInstruction"
+		
+		<!-- ==========  Display Item  ========== -->
+		<action path="/reviewItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="instructionNavForm" 
 			scope="session" 
 			validate="false"
-			parameter="nextInstruction">
-			<forward name="success" path="/pages/preview/instructionsnav.jsp" />
+			parameter="reviewItem">
+			<forward name="success" path="/pages/itemreview/mainframe.jsp" />
 		</action>
 		
-		<!-- ==========  Display Item  ========== -->
-		<action path="/displayItem"
+		<action path="/nextInstruction"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			name="instructionNavForm" 
 			scope="session" 
 			validate="false"
-			parameter="displayItem">
-			<forward name="url" path=".displayUrl" />
-			<forward name="file" path=".displayFile" />
-			<forward name="website" path=".displayWebsite" />			
-			<forward name="learningobject" path=".displayLearningObj" />
+			parameter="nextInstruction">
+			<forward name="success" path="/pages/itemreview/instructionsnav.jsp" />
 		</action>
 		
\ No newline at end of file
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.18 -r1.19
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	11 Apr 2006 07:25:24 -0000	1.18
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	12 Apr 2006 04:38:42 -0000	1.19
@@ -157,8 +157,14 @@
 
 	private ActionForward nextInstruction(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		InstructionNavForm navForm = (InstructionNavForm) form;
-		navForm.setCurrent(navForm.getCurrent()+1);
-		return findForward(navForm.getType(),mapping);
+		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);
+		}
+		
+		return mapping.findForward(ResourceConstants.SUCCESS);
 	}
 
 
@@ -176,11 +182,17 @@
 			
 			Set instructions = item.getItemInstructions();
 			InstructionNavForm navForm = (InstructionNavForm) form;
+			navForm.setAllInstructions(new ArrayList(instructions));
 			navForm.setTitle(item.getTitle());
 			navForm.setType(item.getType());
-			navForm.setCurrent(1);
 			navForm.setTotal(instructions.size());
-			navForm.setInstructions(instructions);
+			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
@@ -805,7 +817,7 @@
 			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
 			break;
 		case ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT:
-			url = "/pages/learningobject/mainframe.jsp";
+			url = "/pages/learningobj/mainframe.jsp";
 			break;
 		}
 		return url;
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/InstructionNavForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/Attic/InstructionNavForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/InstructionNavForm.java	11 Apr 2006 07:25:23 -0000	1.1
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/InstructionNavForm.java	12 Apr 2006 04:38:41 -0000	1.2
@@ -24,9 +24,11 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.rsrc.web.form;
 
+import java.util.List;
 import java.util.Set;
 
 import org.apache.struts.action.ActionForm;
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceItemInstruction;
 
 /**
  * 
@@ -39,16 +41,10 @@
 	private String title;
 	private int total;
 	private int current;
-	private Set instructions;
+	private ResourceItemInstruction instruction;
+	private List allInstructions;
 	private short type;
-	
-	
-	public Set getInstructions() {
-		return instructions;
-	}
-	public void setInstructions(Set instructions) {
-		this.instructions = instructions;
-	}
+
 	public int getCurrent() {
 		return current;
 	}
@@ -73,5 +69,17 @@
 	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/web/pages/authoring/parts/addurl.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	11 Apr 2006 07:25:23 -0000	1.6
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	12 Apr 2006 04:38:42 -0000	1.7
@@ -38,7 +38,7 @@
 					</tr>
 					<tr>
 						<td width="130px"><fmt:message key="label.authoring.basic.resource.description.input"/></td>
-						<td><lams:STRUTS-textarea rows="5" cols="55" tabindex="2" property="description"/> </td>
+						<td><lams:STRUTS-textarea rows="5" cols="55" property="description"/> </td>
 					</tr>						
 					<tr>
 						<td width="130px"><fmt:message key="label.authoring.basic.resource.url.input"/></td>
@@ -63,7 +63,7 @@
 						<td width="100px" align="right" valign="bottom">
 							<input onclick="cancelResourceItem()" type="button" name="cancel" value="<fmt:message key="label.cancel"/>" class="buttonStyle">
 						</td>						
-						<td width="100%" align="right" valign="bottom">
+						<td width="150px" align="right" valign="bottom">
 							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.url"/>" class="buttonStyle">
 						</td>
 					</tr>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/itemdisplay/instructionsnav.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/pages/itemdisplay/mainframe.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	12 Apr 2006 04:38:42 -0000	1.1
@@ -0,0 +1,94 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="formBean" value="<%= session.getAttribute("instructionNavForm") %>" />
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+	<head>
+		<title>${formBean.title}</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+		<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+		<!-- this is the custom CSS for hte tool -->
+		<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+		<link href="<html:rewrite page='/includes/css/rsrc.css'/>" rel="stylesheet" type="text/css">
+		<script language="JavaScript" type="text/JavaScript">
+<!--
+		
+		function finish()
+		{
+			window.parent.opener.location.href='urlcontent.do?method=setContentDone&sessionId=27534&urlId=7365&mode=resume&actor=learner';
+			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;
+		}
+//-->
+</script>
+		<!--progress:UpdateLearnerProgress/-->
+	</head>
+
+
+	<body bgcolor="#9DC5EC" border="1" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+		<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" class="body">
+			<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>
+				</td>
+				<td width="5%" height="15" align="right" bgcolor="#282871">
+					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">Instructions&nbsp;</font>
+				</td>
+				<td width="2%"  bgcolor="#282871"></td>
+			</tr>
+			<tr valign="top">
+				<td></td>
+				<td colspan="2" valign="middle" bgcolor="#FFFFFF">
+					<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>
+								<P>
+								<span style="align:center">
+								<c:choose>
+									<c:when test="${formBean.instruction == null}">
+										<fmt:message key="msg.no.instruction"/>
+									</c:when>
+									<c:otherwise>
+										${formBean.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>
+									<c:otherwise>
+										<input name="FinishInstruction" type="button" class="buttonStyle" style="width:150" id="FinishInstruction" onClick="javascript:finishIns()" value="<fmt:message key='label.finish'/>" />
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td></td>
+			</tr>
+			<tr>
+				<td colspan="3" bgcolor="#282871" height="5"></td>
+			</tr>
+		</table>
+	</body>
+</html>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemreview/mainframe.jsp	12 Apr 2006 04:38:42 -0000	1.1
@@ -0,0 +1,25 @@
+<%-- 
+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 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 
+--%>
+<%@ include file="/common/taglibs.jsp" %>
+<frameset rows="150,*" frameborder="no">
+	<frame src="<c:url value="/pages/itemreview/instructionsnav.jsp"/>" name=headerFrame" marginheight="0" scrolling="NO">
+	<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="contentFrame" marginheight="0" scrolling="YES">
+</frameset>
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.1 -r1.2
--- lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	11 Apr 2006 07:25:24 -0000	1.1
+++ lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	12 Apr 2006 04:38:42 -0000	1.2
@@ -20,11 +20,10 @@
 --%>
 <%@ include file="/common/taglibs.jsp" %>
 <html>
-<body>
-	<frameset cols="25%,75%" rows="*">
-		<frame src="navigatortree.jsp" name="navigatorFrame" marginheight="0"  scrolling="YES">
-		<frame src="defaultcontent.jsp" name="contentFrame" marginheight="0" scrolling="YES">
-	</frameset>
+<frameset cols="25%,75%" rows="*">
+	<frame src="navigatortree.jsp" name="navigatorFrame" marginheight="0"  scrolling="YES">
+	<frame src="defaultcontent.jsp" name="contentFrame" marginheight="0" scrolling="YES">
+</frameset>
 	
 <table bgcolor="#9DC5EC" width="100%" border="0" cellspacing="0" cellpadding="0" align="center" summary="This table is being used for layout purposes only">
 <TR><TD>
@@ -42,5 +41,4 @@
 		</table>
 </TD></TR>
 </table>	
-</body>
 </html>
\ No newline at end of file
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.4 -r1.5
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	11 Apr 2006 07:25:24 -0000	1.4
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	12 Apr 2006 04:38:42 -0000	1.5
@@ -19,36 +19,40 @@
   http://www.gnu.org/licenses/gpl.txt 
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale = "true">
-    <head>
-      <html:base/>
-      <meta http-equiv="pragma" content="no-cache">
-      <meta http-equiv="cache-control" content="no-cache">
-		<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-	    <link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
-		<!-- this is the custom CSS for hte tool -->
-		<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
-    	  <style>
+<html:html locale="true">
+<head>
+	<html:base />
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+	<!-- this is the custom CSS for hte tool -->
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>" rel="stylesheet" type="text/css">
+	<style>
 			a, A:link, a:visited, a:active
 				{color: #0000aa; text-decoration: none; font-family: Tahoma, Verdana; font-size: 15px}
 			A:hover
 				{color: #ff0000; text-decoration: none; font-family: Tahoma, Verdana; font-size: 15px}
 		</style>
-	  <script language="JavaScript" type="text/JavaScript">
+	<script language="JavaScript" type="text/JavaScript">
 	        <!--
 	      	parent.contentFrame.location = "<c:url value="/download/?uuid=${cpPackage.fileUuid}&preferDownload=false"/>";
 	      	parent.contentFrame.focus();
 	        //-->
 	  </script>
-	  
-	  <!-- for javascript tree -->
-	  <script language="JavaScript" type="text/JavaScript">
+
+	<!-- for javascript tree -->
+	<script language="JavaScript" type="text/JavaScript">
 	        <!--
 	        <c:set var="downloadUrlPrefix">
 	        	<c:url value="/download/${cpPackage.fileUuid}/${cpPackage.fileVersionId}/"/>
@@ -64,33 +68,40 @@
   			</x:transform>
   			-->
   	  </script>
-	  <script language="JavaScript" src="${ctxPath}/includes/javascript/tree.js"></script>
-	  <script language="JavaScript" src="${ctxPath}/includes/javascript/tree_tpl.js"></script>
+	<script language="JavaScript" src="${ctxPath}/includes/javascript/tree.js"></script>
+	<script language="JavaScript" src="${ctxPath}/includes/javascript/tree_tpl.js"></script>
 </head>
-    
+
 <body>
- 
-    <table width="95%" border="0" cellspacing="0" cellpadding="0" align="center" summary="This table is being used for layout purposes only">
-	<tr><td>
-	
-	 <c:choose>
-	 	<c:when test="${empty cpPackage.organizationXml}">
-	 		<p class="body">The content package details are missing.</p>
-	 	</c:when>
-	 	<c:otherwise>		
-			<p class="body"><c:out value="${cpPackage.title}"/></p>
-			<p class="lightBody"><fmt:message key="lable.description"/><BR><c:out value="${cpPackage.description}"  escapeXml="false" /><BR>
 
-			<script language="JavaScript">
-				<!--//
-					new tree (TREE_ITEMS, TREE_TPL);
-				//-->
-			</script>
-			</div>
-		
-	 	</c:otherwise>
-	</c:choose>		
-	</td></tr>
+	<table width="100%" border="0" cellspacing="3" cellpadding="3" align="center" summary="This table is being used for layout purposes only">
+		<tr>
+			<td>
+
+				<c:choose>
+					<c:when test="${empty cpPackage.organizationXml}">
+						<p class="body">
+							The content package details are missing.
+						</p>
+					</c:when>
+					<c:otherwise>
+						<h2>
+							<c:out value="${cpPackage.title}" />
+						</h2>
+						<c:out value="${cpPackage.description}" escapeXml="false" />
+						<P>
+
+							<script language="JavaScript">
+								<!--//
+									new tree (TREE_ITEMS, TREE_TPL);
+								//-->
+							</script>
+						</div>
+
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
 	</table>
 </body>
-</html:html>
\ No newline at end of file
+</html:html>