Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== diff -u -rca5f4ba9be98d3653d3820b885376003c6bf2b55 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision ca5f4ba9be98d3653d3820b885376003c6bf2b55) +++ lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -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/model/ResourceItem.java =================================================================== diff -u -r57a8fd80863308a6aae133850dbe2de4acd15abf -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 57a8fd80863308a6aae133850dbe2de4acd15abf) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java (.../ResourceItem.java) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -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/rsrcApplicationContext.xml =================================================================== diff -u -r36d1e75abd559af0c4ec769ee5dd353f9ed4ffb7 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 36d1e75abd559af0c4ec769ee5dd353f9ed4ffb7) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml (.../rsrcApplicationContext.xml) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -105,7 +105,9 @@ - PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java =================================================================== diff -u -r57a8fd80863308a6aae133850dbe2de4acd15abf -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 57a8fd80863308a6aae133850dbe2de4acd15abf) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -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 =================================================================== diff -u -r65296e0451eae1b3515d347b885318fc0a290e96 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/web/common/messages.jsp (.../messages.jsp) (revision 65296e0451eae1b3515d347b885318fc0a290e96) +++ lams_tool_larsrc/web/common/messages.jsp (.../messages.jsp) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -13,8 +13,7 @@
- +
Index: lams_tool_larsrc/web/includes/css/rsrc.css =================================================================== diff -u -r65296e0451eae1b3515d347b885318fc0a290e96 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/web/includes/css/rsrc.css (.../rsrc.css) (revision 65296e0451eae1b3515d347b885318fc0a290e96) +++ lams_tool_larsrc/web/includes/css/rsrc.css (.../rsrc.css) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -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 =================================================================== diff -u -rca5f4ba9be98d3653d3820b885376003c6bf2b55 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision ca5f4ba9be98d3653d3820b885376003c6bf2b55) +++ lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -86,10 +86,8 @@
-
- - - + + <%@ include file="/common/messages.jsp" %>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp =================================================================== diff -u -ra0999444e5cac377c2e02a67a3583c84e8e82ca2 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision a0999444e5cac377c2e02a67a3583c84e8e82ca2) +++ lams_tool_larsrc/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -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 = ""+uuid+"&preferDownload=false"; + launchPopup(myUrl,"Website"); + }else if(idx ==4){ + var myUrl = ""+uuid+"&preferDownload=false"; + launchPopup(myUrl,"LearningObject"); + } + } function editItem(idx){ @@ -128,7 +138,4 @@ - - <%@ include file="/common/messages.jsp" %> - Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -rca5f4ba9be98d3653d3820b885376003c6bf2b55 -r2699ca5080d7ebf1fbcd84c3f5060428b6fbb192 --- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision ca5f4ba9be98d3653d3820b885376003c6bf2b55) +++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 2699ca5080d7ebf1fbcd84c3f5060428b6fbb192) @@ -32,7 +32,7 @@ ${resource.title} " - onclick="preview()" class="button"> + onclick="previewItem(2,${resource.fileUuid},${resource.fileVersionId})" class="button"> " @@ -47,9 +47,10 @@ + ${resource.title} " - onclick="preview()" class="button"> + onclick="previewItem(3,${resource.fileUuid},${resource.fileVersionId})" class="button"> " @@ -64,13 +65,14 @@ + ${resource.title} " - onclick="preview()" class="button"> + onclick="previewItem(4,${resource.fileUuid},${resource.fileVersionId})" class="button"> " - onclick="editItem(${status.index})" class=" "> + onclick="editItem(${status.index})" class="button"> "