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.2 -r1.3
--- lams_tool_larsrc/conf/language/ApplicationResources.properties	3 Apr 2006 07:04:28 -0000	1.2
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties	4 Apr 2006 07:05:55 -0000	1.3
@@ -36,8 +36,8 @@
 
 label.authoring.basic.resource.url=URL:
 label.authoring.basic.resource.file=File:
-label.authoring.basic.resource.website=PACKAGE:
-label.authoring.basic.resource.learning.object=Learning Object:
+label.authoring.basic.resource.website=Website:
+label.authoring.basic.resource.learning.object=Learning object:
 
 label.authoring.basic.resource.verify.url=Verify URL
 label.authoring.basic.resource.preview=Preview
@@ -85,7 +85,7 @@
 error.resource.item.desc.blank= Description can not be blank
 error.resource.item.invalid.url= Invalid URL format.
 
-authoring.save.success=Authoring save success.
+authoring.save.success=Authoring save successfully.
 #-------------------------END Authoring Labels END-----------------#
 
 #---------------------------------Monitoring ----------------------------------#
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	24 Mar 2006 06:23:56 -0000	1.2
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	4 Apr 2006 07:05:55 -0000	1.3
@@ -105,7 +105,9 @@
         </property>
         <property name="transactionAttributes">
             <props>
-                <prop key="createRootTopic">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="create*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
             </props>
         </property>
     </bean>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java,v
diff -u -r1.6 -r1.7
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	3 Apr 2006 13:24:23 -0000	1.6
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java	4 Apr 2006 07:05:55 -0000	1.7
@@ -136,7 +136,7 @@
 		}
 		/**
 	     * @hibernate.set   lazy="true"
-	     * 					cascade="all"
+	     * 					cascade="all-delete-orphan"
 	     * 					inverse="false"
 	     * 					order-by="sequence_id desc"
 	     * @hibernate.collection-key column="item_uid"
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.12 -r1.13
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	3 Apr 2006 13:24:23 -0000	1.12
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	4 Apr 2006 07:05:55 -0000	1.13
@@ -311,11 +311,14 @@
 				//new Resource, create it.
 				resourcePO = resource;
 				resourcePO.setContentId(resourceForm.getToolContentID());
+				resourcePO.setCreated(new Timestamp(new Date().getTime()));
+				resourcePO.setUpdated(new Timestamp(new Date().getTime()));
 			}else{
 				Long uid = resourcePO.getUid();
 				PropertyUtils.copyProperties(resourcePO,resource);
 				//get back UID
 				resourcePO.setUid(uid);
+				resourcePO.setUpdated(new Timestamp(new Date().getTime()));
 			}
 			resourcePO.setCreatedBy(resourceUser);
 			
@@ -362,6 +365,7 @@
 			resourcePO.setAttachments(attPOSet);
 			//************************* Handle resource items *******************
 			//Handle resource items
+			Set itemList = new LinkedHashSet();
 			List topics = getResourceList(request);
 	    	iter = topics.iterator();
 	    	while(iter.hasNext()){
@@ -370,11 +374,13 @@
     				//This flushs user UID info to message if this user is a new user. 
     				item.setCreateBy(resourceUser);
     				item.setCreateDate(new Timestamp(new Date().getTime()));
+    				itemList.add(item);
 	    		}
 	    	}
+	    	resourcePO.setResourceItems(itemList);
 	    	//delete them from database.
-	    	List delTopics = getDeletedResourceList(request);
-	    	iter = delTopics.iterator();
+	    	List delResourceItemList = getDeletedResourceList(request);
+	    	iter = delResourceItemList.iterator();
 	    	while(iter.hasNext()){
 	    		ResourceItem item = (ResourceItem) iter.next();
 	    		iter.remove();
@@ -396,6 +402,7 @@
 
 		ActionMessages messages = new ActionMessages();
 		messages.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("authoring.save.success"));
+		this.addMessages(request,messages);
     	String mode = (String) request.getSession().getAttribute(ResourceConstants.MODE);
     	if(StringUtils.equals(mode,ResourceConstants.AUTHOR_MODE))
     		return mapping.findForward("author");
Index: lams_tool_larsrc/web/common/messages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/messages.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_larsrc/web/common/messages.jsp	29 Mar 2006 07:06:09 -0000	1.1
+++ lams_tool_larsrc/web/common/messages.jsp	4 Apr 2006 07:05:55 -0000	1.2
@@ -13,8 +13,7 @@
 <logic:messagesPresent message="true">
     <div class="message" id="successMessages">
         <html:messages id="message" message="true">
-            <html:img pageKey="icon.information.img" 
-                altKey="icon.information" styleClass="icon"/>
+            <html:img page="/includes/images/iconInformation.gif" styleClass="icon"/>
             <c:out value="${message}" escapeXml="false"/><br/>
         </html:messages>
     </div>
Index: lams_tool_larsrc/web/includes/css/rsrc.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/includes/css/rsrc.css,v
diff -u -r1.3 -r1.4
--- lams_tool_larsrc/web/includes/css/rsrc.css	29 Mar 2006 07:06:09 -0000	1.3
+++ lams_tool_larsrc/web/includes/css/rsrc.css	4 Apr 2006 07:05:55 -0000	1.4
@@ -22,6 +22,29 @@
 	background-color:#B4C8FE;
 }
 
+div.error, div.message {
+    background-color: #ffffcc;
+    border: 1px solid #000;
+    color: #000000;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    margin: 10px auto;
+    padding: 3px;
+    text-align: left;
+    vertical-align: bottom;
+}
+
+/* use a different color for the errors */
+div.error {
+	border: 2px solid red;
+}
+
+img.validationWarning, div.errors img.icon, div.messages img.icon {
+    border: 0;
+    width: 14px;
+    height: 13px;
+    vertical-align: top;
+}
 div.message img.icon {
     vertical-align: middle;
 }
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/authoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp	3 Apr 2006 07:04:28 -0000	1.5
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp	4 Apr 2006 07:05:55 -0000	1.6
@@ -86,10 +86,8 @@
 <div class="tabbody">
 <table align=center> 	  
 				<tr>   
-				<td NOWRAP class=error>
-					<c:if test="${sbmtSuccess}"> 			
-						<img src="${tool}images/success.gif" align="left" width=20 height=20>  <font size=2> <bean:message key="submit.successful"/> </font> </img>
-					</c:if> 			
+				<td NOWRAP>
+						<%@ include file="/common/messages.jsp" %>
 				</td>
 				</tr> 
 </table>
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.7 -r1.8
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	31 Mar 2006 06:02:01 -0000	1.7
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	4 Apr 2006 07:05:55 -0000	1.8
@@ -30,7 +30,17 @@
 		launchPopup(myUrl,title);
 	}
 	
-	function previewItem(idx){
+	function previewItem(idx,uuid,versionId){
+		//2:file, 3:website,4:learning object
+		if(idx == 2){
+		}else if(idx ==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";
+			launchPopup(myUrl,"LearningObject");
+		}
+		
 	}
 	
 	function editItem(idx){
@@ -128,7 +138,4 @@
 				</iframe>
 			</td>
 		</tr>
-		<tr><td colspan="2">
-			<%@ include file="/common/messages.jsp" %>
-		</td></tr>
 	</table>
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.5 -r1.6
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	3 Apr 2006 07:04:28 -0000	1.5
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	4 Apr 2006 07:05:55 -0000	1.6
@@ -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="preview()" class="button">
+				onclick="previewItem(2,${resource.fileUuid},${resource.fileVersionId})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -47,9 +47,10 @@
 		<td width="200px" align="right">
 			<fmt:message key="label.authoring.basic.resource.website" />
 		</td>
+		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
-				onclick="preview()" class="button">
+				onclick="previewItem(3,${resource.fileUuid},${resource.fileVersionId})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
@@ -64,13 +65,14 @@
 		<td width="200px" align="right">
 			<fmt:message key="label.authoring.basic.resource.learning.object" />
 		</td>
+		<td>${resource.title}</td>
 		<td width="50px">
 			<input type="button" name="pi" value="<fmt:message key="label.authoring.basic.resource.preview" />"
-				onclick="preview()" class="button">
+				onclick="previewItem(4,${resource.fileUuid},${resource.fileVersionId})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="ei"  value="<fmt:message key="label.authoring.basic.resource.edit" />"
-				onclick="editItem(${status.index})" class="	">
+				onclick="editItem(${status.index})" class="button">
 		</td>
 		<td width="50px">
 			<input type="button" name="di" value="<fmt:message key="label.authoring.basic.resource.delete" />"