Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rca5f4ba9be98d3653d3820b885376003c6bf2b55 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision ca5f4ba9be98d3653d3820b885376003c6bf2b55)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -68,4 +68,12 @@
 			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
 			parameter="removeInstruction">
 			<forward name="success" path="/pages/authoring/parts/instructions.jsp" />
-		</action>
\ No newline at end of file
+		</action>
+		
+		<!-- ==========  Preview Learning Object Item  ========== -->
+		<action path="/previewLearningObj"
+			type="org.lamsfoundation.lams.tool.rsrc.web.action.AuthoringAction"
+			parameter="previewLearningObj">
+			<forward name="success" path=".previewLearningObj" />
+		</action>
+		
\ No newline at end of file
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -r57a8fd80863308a6aae133850dbe2de4acd15abf -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 57a8fd80863308a6aae133850dbe2de4acd15abf)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java	(.../ResourceConstants.java)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -47,6 +47,7 @@
 	public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList";
 	public static final String ATTR_DELETED_RESOURCE_LIST = "deleteResourceList";
 	public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList";
+	public static final String ATT_LEARNING_OBJECT = "cpPackage";
 	
 	//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/model/ResourceItem.hbm.xml
===================================================================
diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision a0999444e5cac377c2e02a67a3583c84e8e82ca2)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml	(.../ResourceItem.hbm.xml)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -69,7 +69,7 @@
             name="itemInstructions"
             lazy="true"
             inverse="false"
-            cascade="all"
+            cascade="all-delete-orphan"
             sort="unsorted"
             order-by="sequence_id desc"
         >
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -133,9 +133,24 @@
 	  	if (param.equals("removeInstruction")) {
 	  		return removeInstruction(mapping, form, request, response);
 	  	}
+	  	
+	    //-----------------------Preview Learning Object function ---------------------------
+	  	if (param.equals("previewLearningObj")) {
+       		return previewLearningObj(mapping, form, request, response);
+        }
         return mapping.findForward(ResourceConstants.ERROR);
 	}
 	
+	private ActionForward previewLearningObj(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 = getResourceList(request);
+			ResourceItem item = resourceList.get(itemIdx);
+			request.getSession().setAttribute(ResourceConstants.ATT_LEARNING_OBJECT,item);
+		}		
+		return mapping.findForward(ResourceConstants.SUCCESS);
+	}
+
 	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){
@@ -750,11 +765,13 @@
 		List resourceList = getResourceList(request);
 		int itemIdx = NumberUtils.stringToInt(itemForm.getItemIndex(),-1);
 		ResourceItem item;
-		if(itemIdx == -1){
+		
+		if(itemIdx == -1){ //add
 			item = new ResourceItem();
 			resourceList.add(item);
-		}else
+		}else //edit
 			item = (ResourceItem) resourceList.get(itemIdx);
+		
 		item.setType(itemForm.getItemType());
 		item.setTitle(itemForm.getTitle());
 		item.setCreateByAuthor(true);
Index: lams_tool_larsrc/web/WEB-INF/tiles-defs.xml
===================================================================
diff -u -r2116db454fd0ec719a6deeaacd9d10306d341b93 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 2116db454fd0ec719a6deeaacd9d10306d341b93)
+++ lams_tool_larsrc/web/WEB-INF/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -29,7 +29,16 @@
     	<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"/>
@@ -41,5 +50,9 @@
 	<!-- 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>
Index: lams_tool_larsrc/web/common/defaultFrame.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/common/defaultFrame.jsp	(revision 0)
+++ lams_tool_larsrc/web/common/defaultFrame.jsp	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,31 @@
+<!-- 
+  Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  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/common/footerFrame.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/common/footerFrame.jsp	(revision 0)
+++ lams_tool_larsrc/web/common/footerFrame.jsp	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,16 @@
+<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>
\ No newline at end of file
Index: lams_tool_larsrc/web/common/headerFrame.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/common/headerFrame.jsp	(revision 0)
+++ lams_tool_larsrc/web/common/headerFrame.jsp	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp" %>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+
+<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 bgcolor="#9DC5EC" width="100%" border="0" cellpadding="0" cellspacing="0" summary="This table is being used for layout purposes only">
+		  <tr> 
+		    <td width="136" height="10"></td>
+		    <td width="92%" height="10"></td>
+		  </tr>
+		  <tr bgcolor="#282871"> 
+		    <td width="100%" height="15" align="left">
+		    		<img height=8 width=8 src="${ctxPath}/includes/images/spacer.gif">
+		    		<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">
+		    		Preview:
+					</font>
+		    </td>        
+		  </tr>
+		</table>
+		</TD></TR>
+		</table>
+</TD></TR>
+</table>
\ No newline at end of file
Index: lams_tool_larsrc/web/includes/images/spacer.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/includes/javascript/tree.js
===================================================================
diff -u
--- lams_tool_larsrc/web/includes/javascript/tree.js	(revision 0)
+++ lams_tool_larsrc/web/includes/javascript/tree.js	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,139 @@
+// Title: Tigra Tree
+// Description: See the demo at url
+// URL: http://www.softcomplex.com/products/tigra_menu_tree/
+// Version: 1.1
+// Date: 11-12-2002 (mm-dd-yyyy)
+// Notes: This script is free. Visit official site for further details.
+
+function tree (a_items, a_template) {
+
+	this.a_tpl      = a_template;
+	this.a_config   = a_items;
+	this.o_root     = this;
+	this.a_index    = [];
+	this.o_selected = null;
+	this.n_depth    = -1;
+	
+	var o_icone = new Image(),
+		o_iconl = new Image();
+	o_icone.src = a_template['icon_e'];
+	o_iconl.src = a_template['icon_l'];
+	a_template['im_e'] = o_icone;
+	a_template['im_l'] = o_iconl;
+	for (var i = 0; i < 64; i++)
+		if (a_template['icon_' + i]) {
+			var o_icon = new Image();
+			a_template['im_' + i] = o_icon;
+			o_icon.src = a_template['icon_' + i];
+		}
+	
+	this.toggle = function (n_id) {	var o_item = this.a_index[n_id]; o_item.open(o_item.b_opened) };
+	this.select = function (n_id) { return this.a_index[n_id].select(); };
+	this.mout   = function (n_id) { this.a_index[n_id].upstatus(true) };
+	this.mover  = function (n_id) { this.a_index[n_id].upstatus() };
+
+	this.a_children = [];
+	for (var i = 0; i < a_items.length; i++)
+		new tree_item(this, i);
+
+	this.n_id = trees.length;
+	trees[this.n_id] = this;
+	
+	for (var i = 0; i < this.a_children.length; i++) {
+		document.write(this.a_children[i].init());
+		this.a_children[i].open();
+	}
+}
+function tree_item (o_parent, n_order) {
+
+	this.n_depth  = o_parent.n_depth + 1;
+	this.a_config = o_parent.a_config[n_order + (this.n_depth ? 2 : 0)];
+	if (!this.a_config) return;
+
+	this.o_root    = o_parent.o_root;
+	this.o_parent  = o_parent;
+	this.n_order   = n_order;
+	this.b_opened  = !this.n_depth;
+
+	this.n_id = this.o_root.a_index.length;
+	this.o_root.a_index[this.n_id] = this;
+	o_parent.a_children[n_order] = this;
+
+	this.a_children = [];
+	for (var i = 0; i < this.a_config.length - 2; i++)
+		new tree_item(this, i);
+
+	this.get_icon = item_get_icon;
+	this.open     = item_open;
+	this.select   = item_select;
+	this.init     = item_init;
+	this.upstatus = item_upstatus;
+	this.is_last  = function () { return this.n_order == this.o_parent.a_children.length - 1 };
+}
+
+function item_open (b_close) {
+	var o_idiv = get_element('i_div' + this.o_root.n_id + '_' + this.n_id);
+	if (!o_idiv) return;
+	
+	if (!o_idiv.innerHTML) {
+		var a_children = [];
+		for (var i = 0; i < this.a_children.length; i++)
+			a_children[i]= this.a_children[i].init();
+		o_idiv.innerHTML = a_children.join('');
+	}
+	o_idiv.style.display = (b_close ? 'none' : 'block');
+	
+	this.b_opened = !b_close;
+	var o_jicon = document.images['j_img' + this.o_root.n_id + '_' + this.n_id],
+		o_iicon = document.images['i_img' + this.o_root.n_id + '_' + this.n_id];
+	if (o_jicon) o_jicon.src = this.get_icon(true);
+	if (o_iicon) o_iicon.src = this.get_icon();
+	this.upstatus();
+}
+
+function item_select (b_deselect) {
+	if (!b_deselect) {
+		var o_olditem = this.o_root.o_selected;
+		this.o_root.o_selected = this;
+		if (o_olditem) o_olditem.select(true);
+	}
+	var o_iicon = document.images['i_img' + this.o_root.n_id + '_' + this.n_id];
+	if (o_iicon) o_iicon.src = this.get_icon();
+	get_element('i_txt' + this.o_root.n_id + '_' + this.n_id).style.fontWeight = b_deselect ? 'normal' : 'bold';
+	
+	this.upstatus();
+	return Boolean(this.a_config[1]);
+}
+
+function item_upstatus (b_clear) {
+	window.setTimeout('window.status="' + (b_clear ? '' : this.a_config[0] + (this.a_config[1] ? ' ('+ this.a_config[1] + ')' : '')) + '"', 10);
+}
+
+function item_init () {
+	var a_offset = [],
+		o_current_item = this.o_parent;
+	for (var i = this.n_depth; i > 1; i--) {
+		a_offset[i] = '<img src="' + this.o_root.a_tpl[o_current_item.is_last() ? 'icon_e' : 'icon_l'] + '" border="0" align="absbottom">';
+		o_current_item = o_current_item.o_parent;
+	}
+	//NDPNDP: if the link href='0', then display non-link fields
+	return  '<table cellpadding="0" cellspacing="0" border="0"><tr><td nowrap>' + (this.n_depth ? a_offset.join('') + (this.a_children.length
+		? '<a href="javascript: trees[' + this.o_root.n_id + '].toggle(' + this.n_id + ')" onmouseover="trees[' + this.o_root.n_id + '].mover(' + this.n_id + ')" onmouseout="trees[' + this.o_root.n_id + '].mout(' + this.n_id + ')"><img src="' + this.get_icon(true) + '" border="0" align="absbottom" name="j_img' + this.o_root.n_id + '_' + this.n_id + '"></a>'
+		: '<img src="' + this.get_icon(true) + '" border="0" align="absbottom">') : '') 
+		+ (this.a_config[1]  == 0?'': ('<a href="' + this.a_config[1] + '" target="' + this.o_root.a_tpl['target'] + '" onclick="return trees[' + this.o_root.n_id + '].select(' + this.n_id + ')" ondblclick="trees[' + this.o_root.n_id + '].toggle(' + this.n_id + ')" onmouseover="trees[' + this.o_root.n_id + '].mover(' + this.n_id + ')" onmouseout="trees[' + this.o_root.n_id + '].mout(' + this.n_id + ')" class="t' + this.o_root.n_id + 'i" id="i_txt' + this.o_root.n_id + '_' + this.n_id + '">'))+'<img src="' + this.get_icon() + '" border="0" align="absbottom" name="i_img' + this.o_root.n_id + '_' + this.n_id + '" class="t' + this.o_root.n_id + 'im">' + this.a_config[0] + (this.a_config[1]== 0?'':'</a>')+'</td></tr></table>' + (this.a_children.length ? '<div id="i_div' + this.o_root.n_id + '_' + this.n_id + '" style="display:none"></div>' : '');
+	/** 
+	return '<table cellpadding="0" cellspacing="0" border="0"><tr><td nowrap>' + (this.n_depth ? a_offset.join('') + (this.a_children.length
+		? '<a href="javascript: trees[' + this.o_root.n_id + '].toggle(' + this.n_id + ')" onmouseover="trees[' + this.o_root.n_id + '].mover(' + this.n_id + ')" onmouseout="trees[' + this.o_root.n_id + '].mout(' + this.n_id + ')"><img src="' + this.get_icon(true) + '" border="0" align="absbottom" name="j_img' + this.o_root.n_id + '_' + this.n_id + '"></a>'
+		: '<img src="' + this.get_icon(true) + '" border="0" align="absbottom">') : '') 
+		+ '<a href="' + this.a_config[1] + '" target="' + this.o_root.a_tpl['target'] + '" onclick="return trees[' + this.o_root.n_id + '].select(' + this.n_id + ')" ondblclick="trees[' + this.o_root.n_id + '].toggle(' + this.n_id + ')" onmouseover="trees[' + this.o_root.n_id + '].mover(' + this.n_id + ')" onmouseout="trees[' + this.o_root.n_id + '].mout(' + this.n_id + ')" class="t' + this.o_root.n_id + 'i" id="i_txt' + this.o_root.n_id + '_' + this.n_id + '"><img src="' + this.get_icon() + '" border="0" align="absbottom" name="i_img' + this.o_root.n_id + '_' + this.n_id + '" class="t' + this.o_root.n_id + 'im">' + this.a_config[0] + '</a></td></tr></table>' + (this.a_children.length ? '<div id="i_div' + this.o_root.n_id + '_' + this.n_id + '" style="display:none"></div>' : '');
+		**/
+}
+
+function item_get_icon (b_junction) {
+	return this.o_root.a_tpl['icon_' + ((this.n_depth ? 0 : 32) + (this.a_children.length ? 16 : 0) + (this.a_children.length && this.b_opened ? 8 : 0) + (!b_junction && this.o_root.o_selected == this ? 4 : 0) + (b_junction ? 2 : 0) + (b_junction && this.is_last() ? 1 : 0))];
+}
+
+var trees = [];
+get_element = document.all ?
+	function (s_id) { return document.all[s_id] } :
+	function (s_id) { return document.getElementById(s_id) };
Index: lams_tool_larsrc/web/includes/javascript/tree_tpl.js
===================================================================
diff -u
--- lams_tool_larsrc/web/includes/javascript/tree_tpl.js	(revision 0)
+++ lams_tool_larsrc/web/includes/javascript/tree_tpl.js	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,36 @@
+/*
+	Feel free to use your custom icons for the tree. Make sure they are all of the same size.
+	User icons collections are welcome, we'll publish them giving all regards.
+*/
+
+var TREE_TPL = {
+	'target'  : 'contentFrame',	// name of the frame links will be opened in
+							// other possible values are: _blank, _parent, _search, _self and _top
+
+	'icon_e'  : 'icons/empty.gif', // empty image
+	'icon_l'  : 'icons/line.gif',  // vertical line
+
+        'icon_32' : 'icons/base.gif',   // root leaf icon normal
+        'icon_36' : 'icons/base.gif',   // root leaf icon selected
+	
+	'icon_48' : 'icons/base.gif',   // root icon normal
+	'icon_52' : 'icons/base.gif',   // root icon selected
+	'icon_56' : 'icons/base.gif',   // root icon opened
+	'icon_60' : 'icons/base.gif',   // root icon selected
+	
+	'icon_16' : 'icons/folder.gif', // node icon normal
+	'icon_20' : 'icons/folderopen.gif', // node icon selected
+	'icon_24' : 'icons/folderopen.gif', // node icon opened
+	'icon_28' : 'icons/folderopen.gif', // node icon selected opened
+
+	'icon_0'  : 'icons/page.gif', // leaf icon normal
+	'icon_4'  : 'icons/page.gif', // leaf icon selected
+	
+	'icon_2'  : 'icons/joinbottom.gif', // junction for leaf
+	'icon_3'  : 'icons/join.gif',       // junction for last leaf
+	'icon_18' : 'icons/plusbottom.gif', // junction for closed node
+	'icon_19' : 'icons/plus.gif',       // junctioin for last closed node
+	'icon_26' : 'icons/minusbottom.gif',// junction for opened node
+	'icon_27' : 'icons/minus.gif'       // junctioin for last opended node
+};
+
Index: lams_tool_larsrc/web/layout/frame.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/layout/frame.jsp	(revision 0)
+++ lams_tool_larsrc/web/layout/frame.jsp	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,60 @@
+<!-- 
+  Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  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">
+		<frameset cols="25%,75%" rows="*">
+			<frame src="../<%=navigator%>" name="navigatorFrame" marginheight="0"  scrolling="YES">
+			<frame src="../<%=content%>" name="contentFrame" marginheight="0" scrolling="YES">
+		</frameset>
+		<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>
+
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -30,14 +30,14 @@
 		launchPopup(myUrl,title);
 	}
 	
-	function previewItem(idx,uuid,versionId){
+	function previewItem(type,idx,uuid,versionId){
 		//2:file, 3:website,4:learning object
-		if(idx == 2){
-		}else if(idx ==3){
+		if(type == 2){
+		}else if(type ==3){
 			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
 			launchPopup(myUrl,"Website");
-		}else if(idx ==4){
-			var myUrl = "<c:url value='/download/?uuid='/>"+uuid+"&preferDownload=false";
+		}else if(type ==4){
+			var myUrl = "<c:url value='/previewLearningObj.do?itemIndex='/>"+idx;
 			launchPopup(myUrl,"LearningObject");
 		}
 		
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 -r0c4f17efc49e7012360fb98ac98b7e4a005fea9f
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -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,${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(2,${status.index},${resource.fileUuid},${resource.fileVersionId})" 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,${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(3,${status.index},${resource.fileUuid},${resource.fileVersionId})" 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,${resource.fileUuid},${resource.fileVersionId})" class="button">
+				onclick="previewItem(4,${status.index},${resource.fileUuid},${resource.fileVersionId})" 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/learningobj/icons/.cvsignore
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/learningobj/icons/.cvsignore	(revision 0)
+++ lams_tool_larsrc/web/pages/learningobj/icons/.cvsignore	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1 @@
+Thumbs.db
Index: lams_tool_larsrc/web/pages/learningobj/icons/base.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/empty.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/folder.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/folderopen.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/join.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/joinbottom.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/line.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/minus.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/minusbottom.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/page.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/plus.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/icons/plusbottom.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(revision 0)
+++ lams_tool_larsrc/web/pages/learningobj/navigatortree.jsp	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,96 @@
+<!-- 
+  Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  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">
+    	  <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">
+	        <!--
+	      	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">
+	        <!--
+	        <c:set var="downloadUrlPrefix">
+	        	<c:url value="/download/${cpPackage.fileUuid}/${cpPackage.fileVersionId}/"/>
+	        </c:set>
+	        <c:set var="downloadUrlSuffix">
+	        	<c:url value="?preferDownload=false"/>
+	        </c:set>
+			<x:parse xml="${cpPackage.organizationXml}" var="xml"/>
+			<c:import var="xsl" url="xmltree.xsl"/>
+			<x:transform xml="${xml}" xslt="${xsl}">
+  				<x:param name="urlPrefix" value="${downloadUrlPrefix}"/>
+  				<x:param name="urlSuffix" value="${downloadUrlSuffix}"/>
+  			</x:transform>
+  			-->
+  	  </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"><c:out value="${cpPackage.description}"/><BR>
+
+			<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
Index: lams_tool_larsrc/web/pages/learningobj/xmltree.xsl
===================================================================
diff -u
--- lams_tool_larsrc/web/pages/learningobj/xmltree.xsl	(revision 0)
+++ lams_tool_larsrc/web/pages/learningobj/xmltree.xsl	(revision 0c4f17efc49e7012360fb98ac98b7e4a005fea9f)
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!-- 
+  Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  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 
+-->
+
+   <xsl:stylesheet 
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+      version="1.0">
+
+   <xsl:output method="html"></xsl:output>
+   
+   <xsl:param name="urlPrefix"/>
+   <xsl:param name="urlSuffix"/>
+
+   <xsl:template match="/">
+      <xsl:apply-templates/>
+   </xsl:template>
+   
+   <xsl:template match="organizations">
+var TREE_ITEMS = [
+      		<xsl:apply-templates/>
+];
+   </xsl:template>
+   
+
+   <xsl:template match="item">
+	<xsl:choose>
+		<xsl:when test="@resource">
+			['<xsl:value-of select="@title" />','<xsl:value-of select="$urlPrefix" /><xsl:value-of select="@resource"/><xsl:value-of select="urlSuffix" />',
+		    <xsl:apply-templates/>
+		    ],
+		</xsl:when>
+		<xsl:otherwise>
+		    ['<xsl:value-of select="@title" />',0,
+		    <xsl:apply-templates/>
+		    ],		    
+		</xsl:otherwise>
+	</xsl:choose>
+   </xsl:template>
+   
+   </xsl:stylesheet>
\ No newline at end of file