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.5 -r1.6
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	10 Apr 2006 07:15:15 -0000	1.5
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	11 Apr 2006 07:25:24 -0000	1.6
@@ -73,9 +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.authoring.save.button=Save
 label.authoring.cancel.button=Cancel
+lable.description=Description:
 
 authoring.exception= There is a problem in shared resources authoring page, the reason is {0}
 
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.11 -r1.12
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	7 Apr 2006 07:25:31 -0000	1.11
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	11 Apr 2006 07:25:24 -0000	1.12
@@ -116,11 +116,25 @@
 			parameter="removeItemAttachment">
 			<forward name="success" path="/pages/authoring/parts/itemattachment.jsp" />
 		</action>
+		<action path="/authoring/nextInstruction"
+			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" />
+		</action>
 		
-		<!-- ==========  Preview Learning Object Item  ========== -->
-		<action path="/previewLearningObj"
+		<!-- ==========  Display Item  ========== -->
+		<action path="/displayItem"
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
-			parameter="previewLearningObj">
-			<forward name="success" path=".previewLearningObj" />
+			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" />
 		</action>
 		
\ No newline at end of file
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.10 -r1.11
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	10 Apr 2006 07:15:15 -0000	1.10
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	11 Apr 2006 07:25:23 -0000	1.11
@@ -52,6 +52,7 @@
 	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
 	public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST =  "deletedItemAttachmmentList";;
 	public static final String ATT_LEARNING_OBJECT = "cpPackage";
+	public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl";
 	
 	//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/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.17 -r1.18
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	10 Apr 2006 07:15:15 -0000	1.17
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	11 Apr 2006 07:25:24 -0000	1.18
@@ -71,9 +71,11 @@
 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;
 
+
 /**
  * @author Steve.Ni
  * @version $Revision$
@@ -140,31 +142,55 @@
 	  	if (param.equals("removeItemAttachment")) {
 	  		return removeItemAttachment(mapping, form, request, response);
 	  	}
+	  	//for preview top frame html page use:
+	  	if (param.equals("nextInstruction")) {
+	  		return nextInstruction(mapping, form, request, response);
+	  	}
 	  	
-	    //-----------------------Preview Learning Object function ---------------------------
-	  	if (param.equals("previewLearningObj")) {
-       		return previewLearningObj(mapping, form, request, response);
+	    //-----------------------Display Learning Object function ---------------------------
+	  	if (param.equals("reviewItem")) {
+       		return reviewItem(mapping, form, request, response);
         }
         return mapping.findForward(ResourceConstants.ERROR);
 	}
 
 
+	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);
+	}
+
+
 	private ActionForward removeItemAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		request.setAttribute("itemAttachment", null);
-    	return mapping.findForward("success");
+    	return mapping.findForward(ResourceConstants.SUCCESS);
     }
 
 
-	private ActionForward previewLearningObj(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+	private ActionForward reviewItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
 		if(itemIdx != -1){
 			List<ResourceItem> resourceList = getResourceItemList(request);
 			ResourceItem item = resourceList.get(itemIdx);
-			request.getSession().setAttribute(ResourceConstants.ATT_LEARNING_OBJECT,item);
-		}		
-		return mapping.findForward(ResourceConstants.SUCCESS);
+			
+			Set instructions = item.getItemInstructions();
+			InstructionNavForm navForm = (InstructionNavForm) form;
+			navForm.setTitle(item.getTitle());
+			navForm.setType(item.getType());
+			navForm.setCurrent(1);
+			navForm.setTotal(instructions.size());
+			navForm.setInstructions(instructions);
+			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);
+		}
+		return mapping.findForward(ResourceConstants.ERROR);
 	}
 
+
 	private ActionForward removeItem(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		int itemIdx = NumberUtils.stringToInt(request.getParameter(ResourceConstants.PARAM_ITEM_INDEX),-1);
 		if(itemIdx != -1){
@@ -311,7 +337,7 @@
 			attachmentList.addAll(resource.getAttachments());
 		} catch (Exception e) {
 			log.error(e);
-			return mapping.findForward("error");
+			return mapping.findForward(ResourceConstants.ERROR);
 		}
 		
 		//init it to avoid null exception in following handling
@@ -764,7 +790,27 @@
 		}
 		return forward;
 	}
-	
+
+	private Object getReviewUrl(ResourceItem item) {
+		short type = item.getType();
+		String url = null;
+		switch (type) {
+		case ResourceConstants.RESOURCE_TYPE_URL:
+			url = item.getUrl();
+			break;
+		case ResourceConstants.RESOURCE_TYPE_FILE:
+			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
+			break;
+		case ResourceConstants.RESOURCE_TYPE_WEBSITE:
+			url = "/download/?uuid="+item.getFileUuid()+"&preferDownload=false";
+			break;
+		case ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT:
+			url = "/pages/learningobject/mainframe.jsp";
+			break;
+		}
+		return url;
+	}
+
 	/**
 	 * This method will populate resource item information to its form for edit use.
 	 * @param itemIdx
@@ -886,10 +932,10 @@
 		if(type == ResourceConstants.RESOURCE_TYPE_URL){
 			item.setUrl(itemForm.getUrl());
 		}
-		if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
-				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
+//		if(type == ResourceConstants.RESOURCE_TYPE_WEBSITE 
+//				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
 			item.setDescription(itemForm.getDescription());
-		}
+//		}
 		
 	}
 
@@ -910,11 +956,11 @@
 //			if(!validator.isValid(itemForm.getUrl()))
 //				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_INVALID_URL));
 		}
-		if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE 
-				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
+//		if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE 
+//				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT){
 			if(StringUtils.isBlank(itemForm.getDescription()))
 				errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(ResourceConstants.ERROR_MSG_DESC_BLANK));
-		}
+//		}
 		if(itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_WEBSITE 
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
 				||itemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE){
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/InstructionNavForm.java	11 Apr 2006 07:25:23 -0000	1.1
@@ -0,0 +1,77 @@
+/****************************************************************
+ * 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: InstructionNavForm.java,v 1.1 2006/04/11 07:25:23 steven Exp $ */
+package org.lamsfoundation.lams.tool.rsrc.web.form;
+
+import java.util.Set;
+
+import org.apache.struts.action.ActionForm;
+
+/**
+ * 
+ * @author Steve.Ni
+ * @struts.form name="instructionNavForm"
+ * @version $Revision: 1.1 $
+ */
+public class InstructionNavForm extends ActionForm {
+	
+	private String title;
+	private int total;
+	private int current;
+	private Set instructions;
+	private short type;
+	
+	
+	public Set getInstructions() {
+		return instructions;
+	}
+	public void setInstructions(Set instructions) {
+		this.instructions = instructions;
+	}
+	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;
+	}
+	
+}
Index: lams_tool_larsrc/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/Attic/tiles-defs.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/WEB-INF/tiles-defs.xml	7 Apr 2006 00:46:23 -0000	1.4
+++ lams_tool_larsrc/web/WEB-INF/tiles-defs.xml	11 Apr 2006 07:25:24 -0000	1.5
@@ -29,16 +29,7 @@
     	<put name="header" value="/common/header.jsp"/>
     	<put name="footer" value="/common/footer.jsp"/>
 	</definition>
-	<!-- for .frameBaseDef -->
-	<definition name=".frameBaseDef" path="/layout/frame.jsp">
-		<put name="title" value="Frame Base Template Page"/>
-		<put name="pageHeader" value = "Frame Base Template"/>
-		<put name="header" value="/common/headerFrame.jsp"/>
-		<put name="headerHeight" value = "30"/>
-		<put name="content" value="/common/defaultFrame.jsp" />	
- 		<put name="footer" value="/common/footerFrame.jsp"/>
-		<put name="footerHeight" value = "20"/>
-	</definition>
+	
 	<!-- B: Authoring -->
 	<definition name="tiles:authoring/main" extends="tiles:layout">
     	<put name="pageTitleKey" value="Shared resource authoring"/>
@@ -49,10 +40,4 @@
 	
 	<!-- B: Monitoring -->
 	
-	<!-- E: Monitoring -->
-	<definition name=".previewLearningObj" extends=".frameBaseDef" >
-		<put name="title" value="Preview Learning Object Content Package"/>
-		<put name="pageHeader" value = "Manage Content Packages"/>
-  		<put name="navigator" value="/pages/learningobj/navigatortree.jsp" />	
-	</definition>	
 </tiles-definitions>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_larsrc/web/common/defaultFrame.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/common/footerFrame.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/header.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/web/common/header.jsp	24 Mar 2006 06:23:56 -0000	1.2
+++ lams_tool_larsrc/web/common/header.jsp	11 Apr 2006 07:25:23 -0000	1.3
@@ -28,8 +28,8 @@
     <link href="<html:rewrite page='/includes/css/fckeditor_style.css'/>" rel="stylesheet" type="text/css">
 
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
-    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 	
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/fckcontroller.js'/>"></script>
     <script type="text/javascript" src="<html:rewrite page='/includes/javascript/tabcontroller.js'/>"></script>    
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/web/common/headerFrame.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/web/layout/ frame.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/layout/Attic/ frame.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/layout/ frame.jsp	11 Apr 2006 07:25:24 -0000	1.1
@@ -0,0 +1,57 @@
+<%-- 
+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" %>
+<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">
+</head>
+    
+	<tiles:importAttribute/>
+	<bean:define id="headerHeight" name="headerHeight" type="String"/>
+	<bean:define id="header" name="header" type="String"/>
+	<bean:define id="navigator" name="navigator" type="String"/>
+	<bean:define id="content" name="content" type="String"/>
+	<bean:define id="footerHeight" name="footerHeight" type="String"/>
+	<bean:define id="footer" name="footer" type="String"/>
+
+	<frameset rows="<%=headerHeight%>,*,<%=footerHeight%>" frameborder="no">
+		<frame src="../<%=header%>" name=headerFrame" marginheight="0" scrolling="NO">
+		<frame src="../<%=content%>" name="contentFrame" marginheight="0" scrolling="YES">
+		<frame src="../<%=footer%>" name="footerFrame" marginheight="0" scrolling="NO">
+	</frameset>
+	
+	<noframes><body>
+		This tool requires the support of frames. Your browser does not support frames.
+	</body></noframes>
+
+</html:html>
+
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_larsrc/web/layout/frame.jsp'.
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.10 -r1.11
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	7 Apr 2006 07:25:31 -0000	1.10
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	11 Apr 2006 07:25:24 -0000	1.11
@@ -20,25 +20,12 @@
 		area.style.display="none";
 	}
 
-	function verifyUrl(myUrl, title){
-		launchPopup(myUrl,title);
+	function previewItem(type,idx){
+		//1:url, 2:file, 3:website,4:learning object
+		var myUrl = "<c:url value='/reviewItem.do?itemIndex='/>"+idx;
+		launchPopup(myUrl,"Review");
 	}
 	
-	function previewItem(type,idx,uuid,versionId){
-		//2:file, 3:website,4:learning object
-		if(type == 2){
-			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
-			launchPopup(myUrl,"File");
-		}else if(type ==3){
-			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
-			launchPopup(myUrl,"Website");
-		}else if(type ==4){
-			var myUrl = "<c:url value='/previewLearningObj.do?itemIndex='/>"+idx;
-			launchPopup(myUrl,"LearningObject");
-		}
-		
-	}
-	
 	function editItem(idx){
 		 var reqIDVar = new Date();
 		var url = "<c:url value="/authoring/editItemInit.do?itemIndex="/>" + idx +"&reqID="+reqIDVar.getTime();
Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	6 Apr 2006 06:58:12 -0000	1.4
+++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp	11 Apr 2006 07:25:23 -0000	1.5
@@ -1,7 +1,9 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <head>
+	<c:set var="lams"><lams:LAMSURL /></c:set>
 	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<!-- 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 -->
@@ -36,6 +38,10 @@
 						<td><html:text property="title" size="55" tabindex="1" /></td>
 					</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>
+					</tr>						
+					<tr>
 						<td width="130px"><fmt:message key="label.authoring.basic.resource.file.input"/></td>
 						<td>
 						<c:set var="itemAttachment" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
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.5 -r1.6
--- lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	31 Mar 2006 06:02:01 -0000	1.5
+++ lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp	11 Apr 2006 07:25:23 -0000	1.6
@@ -1,8 +1,10 @@
 <%@ include file="/common/taglibs.jsp" %>
 <html>
 <head>
+	<c:set var="lams"><lams:LAMSURL /></c:set>
 	<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
     <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">
@@ -35,6 +37,10 @@
 						<td><html:text property="title" size="55"/></td>
 					</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>
+					</tr>						
+					<tr>
 						<td width="130px"><fmt:message key="label.authoring.basic.resource.url.input"/></td>
 						<td><html:text property="url" size="55"/></td>
 					</tr>	
@@ -54,6 +60,9 @@
 						<td>
 							<%@ include file="instructions.jsp" %>
 						</td>
+						<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">
 							<input onclick="submitResourceItem()" type="button" name="add" value="<fmt:message key="label.authoring.basic.add.url"/>" class="buttonStyle">
 						</td>
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	5 Apr 2006 07:01:29 -0000	1.7
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	11 Apr 2006 07:25:23 -0000	1.8
@@ -14,7 +14,7 @@
 		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="vu" value="<fmt:message key="label.authoring.basic.resource.verify.url" />" 
-				onclick="verifyUrl('${resource.url}','VerifyURL')" class="button">
+				onclick="previewItem(1,${status.index})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei" value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -32,7 +32,7 @@
 		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
-				onclick="previewItem(2,${status.index},${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(2,${status.index})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -50,7 +50,7 @@
 		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
-				onclick="previewItem(3,${status.index},${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(3,${status.index})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -68,7 +68,7 @@
 		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
-				onclick="previewItem(4,${status.index},${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(4,${status.index})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
Index: lams_tool_larsrc/web/pages/itemdisplay/instructionsnav.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemdisplay/Attic/instructionsnav.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemdisplay/instructionsnav.jsp	11 Apr 2006 07:25:23 -0000	1.1
@@ -0,0 +1,105 @@
+<%@ 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="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+
+<!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" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+		<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" class="body">
+			<tr>
+				<td width="10" align="left">
+					&nbsp;
+				</td>
+				<td width="628" height="15" align="left" bgcolor="#282871">
+					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">${resourceItem.title} </font>
+				</td>
+				<td width="335" height="15" align="right" bgcolor="#282871">
+					<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">Instructions&nbsp;</font>
+				</td>
+			</tr>
+			<tr valign="top">
+				<td height="5">
+					<img width="16" height="5" src="../../images/spacer.gif" alt="space.gif" />
+				</td>
+				<td height="5" colspan="2" bgcolor="#FFFFFF">
+					<img width="100" height="5" src="../../images/spacer.gif" alt="space.gif" />
+				</td>
+			</tr>
+			<tr valign="top">
+				<td valign="middle">
+					&nbsp;
+				</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">
+
+
+
+								<span class="subHeader">Step ${formBean.current}  of ${formBean.total)}</span>
+								<br>
+								${formBean.instructions[${formBean.current}].description}
+
+							</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='lable.next.instruction'/>" />
+									</c:when>
+									<c:otherwise>
+										<input name="FinishInstruction" type="button" class="buttonStyle" id="FinishInstruction" 
+											onClick="javascript:finishIns()"
+											value="<fmt:message key='lable.finish'/>" />
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr valign="top">
+				<td height="5">
+					<img width="10" height="5" src="${tool}includes/images/spacer.gif" alt="space.gif" />
+				</td>
+				<td height="5" colspan="2" bgcolor="#FFFFFF">
+					<img width="100" height="5" src="${tool}includes/images/spacer.gif" alt="space.gif" />
+				</td>
+			</tr>
+		</table>
+	</body>
+</html>
Index: lams_tool_larsrc/web/pages/itemdisplay/mainframe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/itemdisplay/Attic/mainframe.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/itemdisplay/mainframe.jsp	11 Apr 2006 07:25:23 -0000	1.1
@@ -0,0 +1,29 @@
+<%-- 
+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" %>
+<html>
+<body>
+	<frameset rows="30,*" frameborder="no">
+		<frame src="instructionsnav.jsp" name=headerFrame" marginheight="0" scrolling="NO">
+		<frame src="<c:url value='${resourceItemReviewUrl}'/>" name="contentFrame" marginheight="0" scrolling="YES">
+	</frameset>
+</body>
+</html>
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/learningobj/defaultcontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learningobj/defaultcontent.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learningobj/defaultcontent.jsp	11 Apr 2006 07:25:24 -0000	1.1
@@ -0,0 +1,31 @@
+<%-- 
+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" %>
+
+<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>
+      <table width="95%" border="0" cellspacing="0" cellpadding="0" align="center" summary="This table is being used for layout purposes only">
+		<TR><TD class="body">
+			Please click on a link on the left to start.
+		</TD></TR>
+		</table>
+</TD></TR>
+</table>
\ No newline at end of file
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_larsrc/web/pages/learningobj/mainframe.jsp	11 Apr 2006 07:25:24 -0000	1.1
@@ -0,0 +1,46 @@
+<%-- 
+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" %>
+<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>
+	
+<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>
+      <table width="95%" border="0" cellspacing="0" cellpadding="0" align="center" summary="This table is being used for layout purposes only">
+		<TR><TD>
+		<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">
+		  <tr bgcolor="#282871"> 
+		    <td >
+				    <td width="136" height="8"></td>
+				    <td width="92%" height="8" align="right" ></td>
+		    </td>        
+		  </tr>
+		</table>
+		</TD></TR>
+		</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.3 -r1.4
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	10 Apr 2006 07:15:15 -0000	1.3
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	11 Apr 2006 07:25:24 -0000	1.4
@@ -79,7 +79,7 @@
 	 	</c:when>
 	 	<c:otherwise>		
 			<p class="body"><c:out value="${cpPackage.title}"/></p>
-			<p class="lightBody"><c:out value="${cpPackage.description}"/><BR>
+			<p class="lightBody"><fmt:message key="lable.description"/><BR><c:out value="${cpPackage.description}"  escapeXml="false" /><BR>
 
 			<script language="JavaScript">
 				<!--//