Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r09963edb439b0a4ddaa251fa19cb2c188310e56c -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 09963edb439b0a4ddaa251fa19cb2c188310e56c)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -221,6 +221,6 @@
 label.authoring.advanced.teachers  =teachers
 event.newposting.subject  =Forum: {0}
 event.newposting.body  ={0}:\n{1}\n\n-- email sent automatically by LAMS
+label.planner.topic=Topic
 
-
 #======= End labels: Exported 215 labels for en AU =====
Index: lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_forum/web/jsps/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -41,7 +41,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/authoring/createPedagogicalPlannerTopic.do' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -43,7 +43,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/pedagogicalPlanner.do?dispatch=createPedagogicalPlannerQuestion' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   					fillForm();
   				}
   			});
Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -40,7 +40,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/pedagogicalPlanner.do?dispatch=createPedagogicalPlannerQuestion' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
===================================================================
diff -u -ra20a8a284fe4d12369cefbec952022b58f437811 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a20a8a284fe4d12369cefbec952022b58f437811)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -1261,15 +1261,18 @@
 	    String title = null;
 	    ResourceItem resourceItem = null;
 	    List<ResourceItem> newItems = new LinkedList<ResourceItem>();
-	    Set<ResourceItem> resourceItems = taskList.getResourceItems();
+	    // we need a copy for later Hibernate-bound processing
+	    LinkedList<ResourceItem> resourceItems = new LinkedList<ResourceItem>(taskList.getResourceItems());
 	    Iterator<ResourceItem> taskListItemIterator = resourceItems.iterator();
-	    // We need to reverse the order, since the items are delivered
-	    // newest-first
-	    LinkedList<ResourceItem> reversedResourceItems = new LinkedList<ResourceItem>();
-	    while (taskListItemIterator.hasNext()) {
-		reversedResourceItems.addFirst(taskListItemIterator.next());
-	    }
-	    taskListItemIterator = reversedResourceItems.iterator();
+	    /*
+	      Not the case anymore (why?):
+	      We need to reverse the order, since the items are delivered newest-first
+	      LinkedList<ResourceItem> reversedResourceItems = new LinkedList<ResourceItem>();
+	      while (taskListItemIterator.hasNext()) {
+	      	reversedResourceItems.addFirst(taskListItemIterator.next());
+	      }
+	      taskListItemIterator = reversedResourceItems.iterator();
+	     */
 	    do {
 		title = plannerForm.getTitle(itemIndex);
 		if (StringUtils.isEmpty(title)) {
@@ -1307,11 +1310,12 @@
 			FormFile file = plannerForm.getFile(itemIndex);
 			resourceItem.setUrl(null);
 			IResourceService service = getResourceService();
-			if (file != null) {
+			if (file != null && !StringUtils.isEmpty(file.getFileName())) {
 			    try {
 				if (hasFile) {
 				    // delete the old file
-				    service.deleteFromRepository(resourceItem.getFileUuid(), resourceItem.getFileVersionId());
+				    service.deleteFromRepository(resourceItem.getFileUuid(),
+					    resourceItem.getFileVersionId());
 				}
 				service.uploadResourceItemFile(resourceItem, file);
 			    } catch (Exception e) {
@@ -1322,11 +1326,11 @@
 				plannerForm.setValid(false);
 				return mapping.findForward(ResourceConstants.SUCCESS);
 			    }
+			    plannerForm.setFileName(itemIndex, resourceItem.getFileName());
+			    plannerForm.setFileUuid(itemIndex, resourceItem.getFileUuid());
+			    plannerForm.setFileVersion(itemIndex, resourceItem.getFileVersionId());
+			    plannerForm.setFile(itemIndex, null);
 			}
-			plannerForm.setFileName(itemIndex, resourceItem.getFileName());
-			plannerForm.setFileUuid(itemIndex, resourceItem.getFileUuid());
-			plannerForm.setFileVersion(itemIndex, resourceItem.getFileVersionId());
-			plannerForm.setFile(itemIndex, null);
 		    }
 		    itemIndex++;
 		}
@@ -1340,9 +1344,9 @@
 		taskListItemIterator.remove();
 		getResourceService().deleteResourceItem(resourceItem.getUid());
 	    }
-	    reversedResourceItems.addAll(newItems);
+	    resourceItems.addAll(newItems);
 
-	    taskList.getResourceItems().addAll(reversedResourceItems);
+	    taskList.getResourceItems().addAll(resourceItems);
 	    getResourceService().saveOrUpdateResource(taskList);
 	} else {
 	    saveErrors(request, errors);
Index: lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_larsrc/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -53,7 +53,10 @@
   					}
  				},
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}
@@ -117,7 +120,7 @@
 						</td>
 						<td>
 							<img class="clearEntry" src="<lams:LAMSURL/>images/icons/cross.png"
-								title="<fmt:message key="msg.planner.clear.entry" />"
+								title="<fmt:message key="label.authoring.basic.resource.delete" />"
 								onclick="javascript:clearEntry(${itemIndex-1})" />
 						</td>
 					</tr>
Index: lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_scribe/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -30,7 +30,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/pedagogicalPlanner.do?dispatch=createPedagogicalPlannerHeading' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}
Index: lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r3e3519176330a8254149c9447702b0c3dead09b5 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3e3519176330a8254149c9447702b0c3dead09b5)
+++ lams_tool_task/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -40,7 +40,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/authoring/createPedagogicalPlannerItem.do' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -r3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 3bfe3be57c0b137a2ec2eb19e895492e9a3ec3aa)
@@ -39,7 +39,10 @@
   			$('#pedagogicalPlannerForm').ajaxSubmit({
   				url: "<c:url value='/pedagogicalPlanner.do?dispatch=createPedagogicalPlannerQuestion' />",
   				success: function(responseText){
-  					$('#body').html(responseText.substring(responseText.search(/<body/i)));
+ 	  				var bodyTag = '<body';
+ 	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
+ 	  				selectedBody = selectedBody.substring(selectedBody.search(bodyTag));
+  					$('#body').html(selectedBody);
   				}
   			});
   		}