Index: content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
===================================================================
--- content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java	(revision 1408)
+++ content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java	(working copy)
@@ -1334,11 +1334,13 @@
 				resource.setContentType(fp.getRevisedMimeType());
 				resource.setResourceType(pipe.getAction().getTypeId());
 				int notification = NotificationService.NOTI_NONE;
+				System.out.println("notify none " + notification );
 				Object obj = fp.getRevisedListItem();
 				if(obj != null && obj instanceof ListItem)
 				{
 					((ListItem) obj).updateContentResourceEdit(resource);
 					notification = ((ListItem) obj).getNotification();
+					System.out.println("notify item " + notification );
 				}
 				
 				ResourcePropertiesEdit resourceProperties = resource.getPropertiesEdit();
@@ -1371,6 +1373,7 @@
 				
 				try
 				{
+				    System.out.println("commit " + notification);
 					ContentHostingService.commitResource(resource, notification);
 					item_added = true;
 					new_resources.add(resource);
Index: content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
===================================================================
--- content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm	(revision 1516)
+++ content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm	(working copy)
@@ -97,6 +97,7 @@
 				$tlang.getString("gen.location")
 				<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0"  alt="folder" />
 				#foreach ($item in $collectionPath)
+					#set($qid=$item.id.replaceAll("'","\\'").replaceAll("\"", "&quot;"))
 					#if($item.isLast())
 						$validator.escapeHtml("$item.name")
 						#if($upOneLevel)
@@ -109,7 +110,7 @@
 						#end
 					#elseif($item.canRead())
 						<a href="#" 
-							onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$item.id';document.getElementById('navRoot').value='$item.root';document.getElementById('showForm').submit();"
+							onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$qid';document.getElementById('navRoot').value='$item.root';document.getElementById('showForm').submit();"
 							title= "$tlang.getString('sh.go')">
 							$validator.escapeHtml("$item.name")
 						</a> /
@@ -246,6 +247,8 @@
 			#set($itemcount = 0)
 			#set ($unit ="em")
 			#foreach($item in $site)
+				#set($qid=$item.id.replaceAll("'","\\'").replaceAll("\"", "&quot;"))
+				#set($dqid=$item.id.replaceAll("\"", "&quot;"))
 				#set($itemcount = $itemcount + 1)
 				#set ($width = "$!{item.depth}$unit")
 				#if ($item.depth==0)	
@@ -272,9 +275,9 @@
 					<td headers="checkboxes">
 						#if($item.depth > 0 && $item.hasMultipleItemActions())
 							<input type="checkbox" name="selectedMembers" id="list$num" 
-									#if($selectedItems.contains("$item.id"))checked="checked"#end
+									#if($selectedItems.contains($item.id))checked="checked"#end
 									onclick="#foreach($key in $item.multipleItemActions.keySet())adjustCount(this, '$key');#end"
-									value="$item.id" /><label for="list$num" class="skip">Select</label>
+									value="$dqid" /><label for="list$num" class="skip">Select</label>
 							#foreach($key in $item.multipleItemActions.keySet())$counter.increment("$key") $counter.increment("selectall")#if($selectedItems.contains($item.id))$counter.increment("${key}selected")#end#end
 						#end
 					</td>
@@ -289,9 +292,9 @@
 									#else
 										<a href="#"
 											#if($item.isExpanded())
-												onclick="javascript:document.getElementById('sakai_action').value='doCollapse_collection';document.getElementById('collectionId').value='$item.Id';document.getElementById('showForm').submit();"
+												onclick="javascript:document.getElementById('sakai_action').value='doCollapse_collection';document.getElementById('collectionId').value='$qid';document.getElementById('showForm').submit();"
 											#else
-												onclick="javascript:document.getElementById('sakai_action').value='doExpand_collection';document.getElementById('collectionId').value='$item.Id';document.getElementById('showForm').submit();"
+												onclick="javascript:document.getElementById('sakai_action').value='doExpand_collection';document.getElementById('collectionId').value='$qid';document.getElementById('showForm').submit();"
 											#end
 											title= "$item.expandLabel"><img src="#imageLink($item.expandIconLocation)" border= "0" alt="$item.expandLabel"  /></a></span>
 									#end
@@ -322,7 +325,7 @@
 									&#169;
 								#elseif($item.isCollection())
 									<a href="#"
-										onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$item.id';document.getElementById('navRoot').value='$validator.escapeUrl($item.root)';document.getElementById('showForm').submit();"
+										onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$qid';document.getElementById('navRoot').value='$validator.escapeUrl($item.root)';document.getElementById('showForm').submit();"
 										title= "$item.hoverText">
 										$validator.escapeHtml(${item.name})
 									</a>
@@ -348,7 +351,7 @@
 							#set ($itemsOnLine = 0)
 							#foreach($action in $item.pasteActions)
 								#if($itemsOnLine > 0)|#end
-								<a class=" highlightlink" title="$labeler.getLabel($action) here" href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');"><img src = "#imageLink("silk/page_paste.gif")" border="0"  alt="$labeler.getLabel($action)"/></a> 
+								<a class=" highlightlink" title="$labeler.getLabel($action) here" href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');"><img src = "#imageLink("silk/page_paste.gif")" border="0"  alt="$labeler.getLabel($action)"/></a> 
 								#set ($itemsOnLine = $itemsOnLine + 1)
 							#end
 						#end
@@ -371,7 +374,7 @@
 ##										<a href="#"  onmousedown="document.getElementById('menu-$actionCount').style.display='none';">$tlang.getString("button.closemenu")</a>
 ##										</li>
 										#foreach($action in $item.addActions)
-											<li><a  href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">$labeler.getLabel($action)</a></li>
+											<li><a  href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">$labeler.getLabel($action)</a></li>
 										#end
 										<li style="height:1px;width:1px;display:inline;">
 											<a href="#"  class="skip" onfocus="document.getElementById('menu-$actionCount').style.display='none';document.getElementById('last-$actionCount').focus()" >$tlang.getString("button.endadd")</a>
@@ -402,7 +405,7 @@
 ##										</li>
 										#foreach($action in $item.otherActions)
 											<li>
-												<a  href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">
+												<a  href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">
 													$labeler.getLabel($action)
 												</a>
 											</li>
@@ -507,6 +510,7 @@
 					#end
 					################################################################ Eng Paging widgets
 					#foreach($item in $other_sites)
+						#set($qid=$item.id.replaceAll("'","\\'").replaceAll("\"", "&quot;"))
 						############################### Show top level folder #################
 						#set($itemcount = $itemcount + 1)
 						#set ($width = "$!{item.depth}$unit")
@@ -534,9 +538,9 @@
 							<td headers="checkboxes">
 								#if($item.depth > 0 && $item.hasMultipleItemActions())
 									<input type="checkbox" name="selectedMembers" id="list$num" 
-											#if($selectedItems.contains("$item.id"))checked="checked"#end
+											#if($selectedItems.contains($item.id))checked="checked"#end
 											onclick="#foreach($key in $item.multipleItemActions.keySet())adjustCount(this, '$key');#end"
-											value="$item.id" /><label for="list$num" class="skip">Select</label>
+											value="$dqid" /><label for="list$num" class="skip">Select</label>
 									#foreach($key in $item.multipleItemActions.keySet())$counter.increment("$key") $counter.increment("selectall")#if($selectedItems.contains($item.id))$counter.increment("${key}selected")#end#end
 								#end
 							</td>
@@ -551,9 +555,9 @@
 											#else
 												<a href="#"
 													#if($item.isExpanded())
-														onclick="javascript:document.getElementById('sakai_action').value='doCollapse_collection';document.getElementById('collectionId').value='$item.Id';document.getElementById('showForm').submit();"
+														onclick="javascript:document.getElementById('sakai_action').value='doCollapse_collection';document.getElementById('collectionId').value='$qid';document.getElementById('showForm').submit();"
 													#else
-														onclick="javascript:document.getElementById('sakai_action').value='doExpand_collection';document.getElementById('collectionId').value='$item.Id';document.getElementById('showForm').submit();"
+														onclick="javascript:document.getElementById('sakai_action').value='doExpand_collection';document.getElementById('collectionId').value='$qid';document.getElementById('showForm').submit();"
 													#end
 													title= "$item.expandLabel"><img src="#imageLink($item.expandIconLocation)" border= "0" alt="$item.expandLabel" hspace="0" /></a></span>
 											#end
@@ -584,7 +588,7 @@
 											&#169;
 										#elseif($item.isCollection())
 											<a href="#"
-												onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$item.id';document.getElementById('navRoot').value='$validator.escapeUrl($item.root)';document.getElementById('showForm').submit();"
+												onclick="javascript:document.getElementById('sakai_action').value='doNavigate';document.getElementById('collectionId').value='$qid';document.getElementById('navRoot').value='$validator.escapeUrl($item.root)';document.getElementById('showForm').submit();"
 												title= "$item.hoverText">
 												$validator.escapeHtml(${item.name})
 											</a>
@@ -610,7 +614,7 @@
 									#set ($itemsOnLine = 0)
 									#foreach($action in $item.pasteActions)
 										#if($itemsOnLine > 0)|#end
-										<a class=" highlightlink" title="$labeler.getLabel($action) here" href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');"><img src = "#imageLink("silk/page_paste.gif")" border="0"  alt="$labeler.getLabel($action)"/></a> 
+										<a class=" highlightlink" title="$labeler.getLabel($action) here" href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');"><img src = "#imageLink("silk/page_paste.gif")" border="0"  alt="$labeler.getLabel($action)"/></a> 
 										#set ($itemsOnLine = $itemsOnLine + 1)
 									#end
 								#end
@@ -632,7 +636,7 @@
 ##												</li>
 							    #foreach($action in $item.addActions)
 												<li>
-													<a  href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">$labeler.getLabel($action)</a>
+													<a  href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">$labeler.getLabel($action)</a>
 												</li>
 							    #end
 										<li style="height:1px;width:1px;display:inline;">
@@ -660,7 +664,7 @@
 ##												</li>											
 												#foreach($action in $item.otherActions)
 													<li>
-														<a  href="javascript:document.getElementById('selectedItemId').value='$item.id';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">
+														<a  href="javascript:document.getElementById('selectedItemId').value='$qid';document.getElementById('rt_action').value='${action.typeId}${ACTION_DELIMITER}$action.id';document.getElementById('sakai_action').value='doDispatchAction';submitform('showForm');">
 															$labeler.getLabel($action)
 														</a>
 													</li>