### Eclipse Workspace Patch 1.0
#P sakai_2-6-x
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_upload.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_upload.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_upload.vm	(working copy)
@@ -23,7 +23,7 @@
 		</p>
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doUpload")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</span>
 		</p>
 	</form>
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_html.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_html.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_html.vm	(working copy)
@@ -29,7 +29,7 @@
 		</p>
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx" class="messageProgress"  style="visibility:hidden">$tlang.getString("processmessage.html")</span>
 		</p>
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources_replace.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources_replace.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources_replace.vm	(working copy)
@@ -29,10 +29,10 @@
 			$tlang.getString("rep.rep")
 		</div>
 		<form name="replaceFileBasicForm" action="#toolForm("ResourcesAction")&special=upload" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
-			<input type="hidden" name="replaceItems" value="$replaceItems" />
-			<input type="hidden" name="eventSubmit_doReplacefile" value="x" />
-			<input type="hidden" name="option" value="replace" />
+			<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
+			<input type="hidden" name="replaceItems" id="replaceItems" value="$replaceItems" />
+			<input type="hidden" name="eventSubmit_doReplacefile" id="eventSubmit_doReplacefile" value="x" />
+			<input type="hidden" name="option" id="option" value="replace" />
 				#foreach ( $i in [1 ..$replaceNumber] )
 					#set($item=$replaceItems.get($i))
 					<fieldset>
@@ -50,11 +50,11 @@
 								</td>
 								<td>
 									#if ($osNames.get($i).length()==0)
-										<input type="file" name="fileName$i" class ="upload" />
+										<input type="file" name="fileName$i" id="fileName$i" class ="upload" />
 									#else
 										$osNames.get($i)<br />
 										$tlang.getString("rep.change") <br />
-										<input type="file" name="fileName$i" size="20" />
+										<input type="file" name="fileName$i" id="fileName$i" size="20" />
 									#end
 								</td>
 						  </tr>
@@ -67,7 +67,7 @@
 									#end
 								</td>
 								<td>
-									<input type="text" name="title$i" value="$titles.get($i)" size="40" />
+									<input type="text" name="title$i" id="title$i" value="$titles.get($i)" size="40" />
 								</td>
 							</tr>
 						</table>
@@ -78,7 +78,7 @@
 									<tr>
 									<td style="vertical-align:middle">$tlang.getString("gen.email1")</td>
 									<td>
-										<select name="notify">
+										<select name="notify" id="notify">
 											<option value="r">$tlang.getString("gen.email2")</option>
 											<option value="o">$tlang.getString("gen.email3")</option>
 											<option value="n" selected="selected">$tlang.getString("gen.email4")</option>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_cwiz_finish.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_resources_cwiz_finish.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_cwiz_finish.vm	(working copy)
@@ -58,8 +58,8 @@
 		
 	
 		<p class="act">
-			<input type="button" class="active" id="finish_button" onclick="document.getElementById('user_action').value='save';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.finish")" accesskey="s" />
-			<input type="button" id="cancel_button" onclick="javascript:document.getElementById('user_action').value='cancel';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" class="active" name="finish_button" id="finish_button" onclick="document.getElementById('user_action').value='save';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.finish")" accesskey="s" />
+			<input type="button" id="cancel_button" name="cancel_button" onclick="javascript:document.getElementById('user_action').value='cancel';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.cancel")" accesskey="x" />
 		</p>
 		
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_options.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_resources_options.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_options.vm	(working copy)
@@ -50,8 +50,8 @@
 			#end
 		</table>
 		<p class="act">
-				<input type="button" class="active" name="savechanges" onclick="javascript:submitform('optionsForm');"  value="$tlang.getString("label.update")" accesskey="s" />
-				<input type="button" name="cancel" onclick="javascript:document.getElementById('sakai_action').value='doCancelOptions';submitform('optionsForm');"   value="$tlang.getString("label.cancel")" accesskey="x" />
+				<input type="button" class="active" name="savechanges" id="savechanges" onclick="javascript:submitform('optionsForm');"  value="$tlang.getString("label.update")" accesskey="s" />
+				<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('sakai_action').value='doCancelOptions';submitform('optionsForm');"   value="$tlang.getString("label.cancel")" accesskey="x" />
 		</p>
 	</form>
 </div>
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources_deleteConfirm.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources_deleteConfirm.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources_deleteConfirm.vm	(working copy)
@@ -6,9 +6,9 @@
 		$tlang.getString("del.del")
 	</h3>
 	<form action="#toolForm("ResourcesAction")" name="deleteFileForm" method="post" >
-		<input type="hidden" name="deleteResourceIds" value="$deleteResourceIds" />
-		<input type="hidden" name="view" value="general" />
-		<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
+		<input type="hidden" name="deleteResourceIds" id="deleteResourceIds" value="$deleteResourceIds" />
+		<input type="hidden" name="view" id="view" value="general" />
+		<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
 		#if ($deleteItems.size()>0)
 			<table class ="listHier lines" cellspacing="0" summary="$tlang.getString("del.table")" border="0" cellpadding="0">
 				<tr>
@@ -48,8 +48,8 @@
 				#end
 			</table>
 			<p class ="act">
-				<input type="submit" class="active"  name="eventSubmit_doDelete" value="$tlang.getString("del.del1")" accesskey="s" />
-				<input type="submit" name="eventSubmit_doCancel" value="$tlang.getString("gen.cancel")" accesskey="x" />
+				<input type="submit" class="active"  name="eventSubmit_doDelete" id="eventSubmit_doDelete" value="$tlang.getString("del.del1")" accesskey="s" />
+				<input type="submit" name="eventSubmit_doCancel" id="eventSubmit_doCancel" value="$tlang.getString("gen.cancel")" accesskey="x" />
 			</p>
 		#end
 	</form>
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_url.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_url.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_url.vm	(working copy)
@@ -23,7 +23,7 @@
 		</p>
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.url")</span>
 		</p>
 	</form>
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_properties.vm	(working copy)
@@ -89,7 +89,7 @@
 				$tlang.getString("edit.quota")
 			</label>
 			<span>	
-				<input type="hidden" name="setQuota${DOT}$i" value="true" />
+				<input type="hidden" name="setQuota${DOT}$i" id="setQuota${DOT}$i" value="true" />
 				<input type="checkbox" name="hasQuota${DOT}$i" id="hasQuota${DOT}$i" value="true"#if($model.hasQuota()) checked="checked" #end style="border:none" />
 				<input type="text" size="10" name="quota${DOT}$i" id="quota${DOT}$i" value="$!model.quota" />
 			</span>
@@ -211,7 +211,7 @@
 				<caption class="skip" style="display:none">$tlang.getString("edit.access4")</caption>
 				<tr>
 					<th id="selected${DOT}$i" style="width:2em;padding-left:.4em">
-						<input type="checkbox" id="selectall${DOT}$i" title="toggle select all" />
+						<input type="checkbox" id="selectall${DOT}$i" name="selectall${DOT}$i" title="toggle select all" />
 					</th>
 					<th id="groupname${DOT}$i">
 						$tlang.getString("edit.group1")
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources_show.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources_show.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources_show.vm	(working copy)
@@ -18,9 +18,9 @@
 		#if ($alertMessage)<div class="alertMessage">$tlang.getString("gen.alert") $validator.escapeHtml($alertMessage)</div>#end
 		#if ($collectionFlag == "true")
 			 <form name="showForm" action="#toolForm("ResourcesAction")" method="post">
-				<input type="hidden" name="source" value="0" />
-				<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
-				<input type="hidden" name="from" value="revise" />
+				<input type="hidden" name="source" id="source" value="0" />
+				<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
+				<input type="hidden" name="from" id="from" value="revise" />
 				
 				#if (($service.allowGetCollection($collectionId)) && ($service.allowGetProperties($collectionId)))
 					<div class ="chefBreadCrumb">
@@ -147,9 +147,9 @@
 								<tr>
 									<td>
 										#if ($selectallflag == "true")
-											<input type="checkbox" name="selectedMembers" checked value="$memberId" />
+											<input type="checkbox" name="selectedMembers" id="selectedMembers" checked value="$memberId" />
 										#else
-											<input type="checkbox" name="selectedMembers" value="$memberId" />					
+											<input type="checkbox" name="selectedMembers" id="selectedMembers" value="$memberId" />					
 										#end
 									</td>
 									#set ($depth = ($service.getDepth($memberId, $collectionId) - 1))
@@ -313,8 +313,8 @@
 		#else
 
 			 <form name="showForm" action="#toolForm("ResourcesAction")" method="post">
-				<input type="hidden" name="source" value="0" />
-				<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
+				<input type="hidden" name="source" id="source" value="0" />
+				<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
 			 </form>
 				 <div class ="chefBreadCrumb">
 				 	$tlang.getString("gen.location") #if($collectionDisplayName)$validator.escapeHtml($collectionDisplayName)#end
Index: content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_select.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_select.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_select.vm	(working copy)
@@ -117,9 +117,9 @@
 	</div>
 
 	<form name="attachForm" id="attachForm" action="#toolForm("FilePickerAction" "Main")" method="post">
-		<input type="hidden" name="source" value="0" />
-		<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
-		<input type="hidden" name="from" value="list" />
+		<input type="hidden" name="source" id="source" value="0" />
+		<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
+		<input type="hidden" name="from" id="from" value="list" />
 		<input type="hidden" name="sakai_action" id="sakai_action" value="" />
 		<input type="hidden" name="selectedItemId" id="selectedItemId" value="" />
 		<input type="hidden" name="rt_action" id="rt_action" value="" />
@@ -359,18 +359,18 @@
 									<div class="instruction" style="margin-bottom:.3em;">Viewing $topMsgPos - $btmMsgPos of $allMsgNumber items</div>
 									#if ("$pagesize" != "0")
 										#if ($goPPButton == "true")
-											<input type="button" name="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('sakai_action').value='doList_first';document.getElementById('attachForm').submit();" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('sakai_action').value='doList_first';document.getElementById('attachForm').submit();" />
 										#else
-											<input type="button" name="List_first" value="|&lt;" disabled="disabled" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" disabled="disabled" />
 										#end
 										#if ($goPPButton == "true")
-											<input type="button" name="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_prev';document.getElementById('attachForm').submit();" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_prev';document.getElementById('attachForm').submit();" />
 										#else
-											<input type="button" name="List_prev" value="&lt;" disabled="disabled" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" disabled="disabled" />
 										#end
 									#end
 									<!-- $pagesize  "$pagesize" -->
-									<select name="selectPageSize" onchange="javascript:blur(); document.getElementById('sakai_action').value='doChange_pagesize';document.getElementById('attachForm').submit();">
+									<select name="selectPageSize" id="selectPageSize" onchange="javascript:blur(); document.getElementById('sakai_action').value='doChange_pagesize';document.getElementById('attachForm').submit();">
 										<option value="5"#if("$pagesize" == "5") selected="selected"#end>$tlang.getString("lis.show5")</option>
 										<option value="10"#if("$pagesize" == "10") selected="selected"#end>$tlang.getString("lis.show10")</option>
 										<option value="20"#if("$pagesize" == "20") selected="selected"#end>$tlang.getString("lis.show20")</option>
@@ -380,14 +380,14 @@
 									</select>
 									#if ("$pagesize" != "0")
 										#if ($goNPButton == "true")
-											<input type="button" name="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_next';document.getElementById('attachForm').submit();" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_next';document.getElementById('attachForm').submit();" />
 										#else
-											<input type="button" name="List_next" value="&gt;" disabled="disabled" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" disabled="disabled" />
 										#end
 										#if ($goNPButton == "true")
-											<input type="button" name="List_last" value="&gt;|" title="Last" onclick="javascript: document.getElementById('sakai_action').value='doList_last';document.getElementById('attachForm').submit();" />
+											<input type="button" name="List_last" id="List_last" value="&gt;|" title="Last" onclick="javascript: document.getElementById('sakai_action').value='doList_last';document.getElementById('attachForm').submit();" />
 										#else
-											<input type="button" name="List_last" value="&gt;|" disabled="disabled" />
+											<input type="button" name="List_last" id="List_last" value="&gt;|" disabled="disabled" />
 										#end
 									#end
 								</div></div>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_deleteFinish.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_resources_deleteFinish.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_deleteFinish.vm	(working copy)
@@ -6,7 +6,7 @@
 		$tlang.getString("del.del")
 	</h3>
 	<form action="#toolForm("ResourcesAction")" name="deleteFileForm" method="post" >
-		<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
+		<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
 		#if ($deleteItems.size()>0)
 			<table class ="listHier lines" cellspacing="0" summary="$tlang.getString("del.table")" border="0" cellpadding="0">
 				<tr>
@@ -50,8 +50,8 @@
 				#end
 			</table>
 			<p class ="act">
-				<input type="submit" class="active"  name="eventSubmit_doFinalizeDelete" value="$tlang.getString("del.del1")" accesskey="s" />
-				<input type="submit" name="eventSubmit_doCancel" value="$tlang.getString("label.cancel")" accesskey="x" />
+				<input type="submit" class="active"  name="eventSubmit_doFinalizeDelete" id="eventSubmit_doFinalizeDelete" value="$tlang.getString("del.del1")" accesskey="s" />
+				<input type="submit" name="eventSubmit_doCancel" id="eventSubmit_doCancel" value="$tlang.getString("label.cancel")" accesskey="x" />
 			</p>
 		#end
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_properties.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_resources_properties.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_properties.vm	(working copy)
@@ -27,7 +27,7 @@
 					<label for="displayName_display${DOT}$i">
 						$tlang.getString("title.name") 
 					</label>
-					<input type="text" size="40" id="displayName_display${DOT}$i" disabled="disabled" value="$validator.escapeHtml("$!item.name")" />
+					<input type="text" size="40" id="displayName_display${DOT}$i" name="displayName_display${DOT}$i" disabled="disabled" value="$validator.escapeHtml("$!item.name")" />
 					<input type="hidden" id="displayName${DOT}$i" name="displayName${DOT}$i" value="$validator.escapeHtml("$!item.name")" />
 				#end
 			</p>
@@ -63,8 +63,8 @@
 		#end
 	
 		<p class="act">
-			<input type="button" class="active" id="finish_button" onclick="document.getElementById('user_action').value='save';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.update")" accesskey="s" />
-			<input type="button" id="cancel_button" onclick="javascript:document.getElementById('user_action').value='cancel';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" class="active" id="finish_button" name="finish_button" onclick="document.getElementById('user_action').value='save';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.update")" accesskey="s" />
+			<input type="button" id="cancel_button" name="cancel_button" onclick="javascript:document.getElementById('user_action').value='cancel';submitform('$DETAILS_FORM_NAME');" value="$tlang.getString("label.cancel")" accesskey="x" />
 		</p>
 		
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources_more.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources_more.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources_more.vm	(working copy)
@@ -189,11 +189,11 @@
 	
 	<form name="moreForm" action="#toolForm("ResourcesAction")" method="post" >
 		<p class="act">
-			<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
-			<input type="hidden" name="id" value="$id" />
-			<input type="hidden" name="from" value = "list" />
-			<input type="hidden" name="view" value="general" />
-			<input type="submit" name="eventSubmit_doCancel" value="$tlang.getString("more.cancel")" accesskey="x" />
+			<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
+			<input type="hidden" name="id" id="id" value="$id" />
+			<input type="hidden" name="from" id="from" value = "list" />
+			<input type="hidden" name="view" id="view" value="general" />
+			<input type="submit" name="eventSubmit_doCancel" id="eventSubmit_doCancel" value="$tlang.getString("more.cancel")" accesskey="x" />
 		</p>
 	</form>
 </div>
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_uploads.vm	(working copy)
@@ -88,7 +88,7 @@
 		
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doUpload")&flow=save';submitform('addContentForm');" value="$tlang.getString("label.finupl")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx" class="messageProgress" style="visibility:hidden">$tlang.getString("processmessage.file")</span>
 		</p>
 		#if($upload_limit)
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_text.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_text.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_text.vm	(working copy)
@@ -22,7 +22,7 @@
 		</p>
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doContinue")';submitform('addContentForm');" value="$tlang.getString("label.continue")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel"  onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx" class="messageProgress"  style="visibility:hidden">$tlang.getString("processmessage.text")</span>
 		</p>
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources_reorder.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources_reorder.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources_reorder.vm	(working copy)
@@ -107,8 +107,8 @@
 			</tbody>
 		</table>
 		<p class="act" style="margin:0;padding:.3em 0;">
-			<input id="save" value="$tlang.getString("sort.save")" type="button" class="active" onclick="submitThis('reorderForm','save');" /> 
-			<input id="cancel" value="$tlang.getString("sort.cancel")" type="button" onclick="submitThis('reorderForm','cancel');" />																			
+			<input name="save" id="save" value="$tlang.getString("sort.save")" type="button" class="active" onclick="submitThis('reorderForm','save');" /> 
+			<input name="cancel" id="cancel" value="$tlang.getString("sort.cancel")" type="button" onclick="submitThis('reorderForm','cancel');" />																			
 		</p>
 	</form>						
 
Index: content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
===================================================================
--- content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java	(revision 62635)
+++ content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java	(working copy)
@@ -5122,6 +5122,17 @@
 		}
 
 		String webdav_instructions = ServerConfigurationService.getString("webdav.instructions.url");
+		int extIndex = webdav_instructions.indexOf(".html");
+		String webdav_doc = webdav_instructions.substring(0,extIndex).trim();
+		String locale = new ResourceLoader().getLocale().getLanguage();
+		
+		if (locale.equalsIgnoreCase("en") || (locale == null) || (locale.trim().length()==0)){
+			webdav_instructions = ServerConfigurationService.getString("webdav.instructions.url");
+		}else{
+			webdav_instructions = webdav_doc + "_" + locale + ".html";
+		}
+		
+		
 		context.put("webdav_instructions" ,webdav_instructions);
 
 		// TODO: Consider whether we should return a trivial session
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_urls.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_urls.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_urls.vm	(working copy)
@@ -89,7 +89,7 @@
 		
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotifxxx','saveChanges','addContentForm');document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doAddUrls")&flow=save';submitform('addContentForm');" value="$tlang.getString("label.urlnow")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addContentForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addContentForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span id="submitnotifxxx"  class="messageProgress"  style="visibility:hidden">$tlang.getString("processmessage.url")</span>
 		</p>
 	</form>
Index: content/content-tool/tool/src/webapp/vm/content/chef_resources-customize.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/chef_resources-customize.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/chef_resources-customize.vm	(working copy)
@@ -15,8 +15,8 @@
 		<form action="#toolForm($action)" method="post">
 			</fieldset>
 			<p class="act">
-				<input type="submit" name="$form-submit" value="$tlang.getString("gen.save")" />
-				<input type="submit" name="$form-cancel" value="$tlang.getString("gen.cancel")" />
+				<input type="submit" name="$form-submit" id="$form-submit" value="$tlang.getString("gen.save")" />
+				<input type="submit" name="$form-cancel" id="$form-cancel" value="$tlang.getString("gen.cancel")" />
 			</p>
 		</form>
 	</div>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_attach.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_attach.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_filepicker_attach.vm	(working copy)
@@ -44,9 +44,9 @@
 	</div>
 
 	<form name="attachForm" id="attachForm" action="#toolForm("FilePickerAction" "Main")" method="post" enctype="multipart/form-data">
-		<input type="hidden" name="source" value="0" />
-		<input type="hidden" name="collectionId" value="$validator.escapeHtml($collectionId)" />
-		<input type="hidden" name="from" value="list" />
+		<input type="hidden" name="source" id="source" value="0" />
+		<input type="hidden" name="collectionId" id="collectionId" value="$validator.escapeHtml($collectionId)" />
+		<input type="hidden" name="from" id="from" value="list" />
 		<input type="hidden" name="sakai_action" id="sakai_action" value="" />
 		#if($attached.isEmpty())
 		#else
@@ -288,18 +288,18 @@
 									<span class="instruction" style="margin-bottom:.3em;">Viewing $topMsgPos - $btmMsgPos of $allMsgNumber items</span>
 									#if ("$pagesize" != "0")
 										#if ($goPPButton == "true")
-											<input type="button" name="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_first")'; submitform('attachForm');" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_first")'; submitform('attachForm');" />
 										#else
-											<input type="button" name="List_first" value="|&lt;" disabled="disabled" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" disabled="disabled" />
 										#end
 										#if ($goPPButton == "true")
-											<input type="button" name="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_prev")'; submitform('attachForm');" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_prev")'; submitform('attachForm');" />
 										#else
-											<input type="button" name="List_prev" value="&lt;" disabled="disabled" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" disabled="disabled" />
 										#end
 									#end
 									<!-- $pagesize  "$pagesize" -->
-									<select name="selectPageSize" onchange="javascript:blur(); document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doChange_pagesize")';submitform('attachForm');">
+									<select name="selectPageSize" id="selectPageSize" onchange="javascript:blur(); document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doChange_pagesize")';submitform('attachForm');">
 										<option value="5"#if("$pagesize" == "5") selected="selected"#end>$tlang.getString("lis.show5")</option>
 										<option value="10"#if("$pagesize" == "10") selected="selected"#end>$tlang.getString("lis.show10")</option>
 										<option value="20"#if("$pagesize" == "20") selected="selected"#end>$tlang.getString("lis.show20")</option>
@@ -309,14 +309,14 @@
 									</select>
 									#if ("$pagesize" != "0")
 										#if ($goNPButton == "true")
-											<input type="button" name="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_next")'; submitform('attachForm');" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_next")'; submitform('attachForm');" />
 										#else
-											<input type="button" name="List_next" value="&gt;" disabled="disabled" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" disabled="disabled" />
 										#end
 										#if ($goNPButton == "true")
-											<input type="button" name="List_last" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_last")'; submitform('attachForm');" />
+											<input type="button" name="List_last" id="List_last" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('attachForm').action='#toolLink("FilePickerAction" "doList_last")'; submitform('attachForm');" />
 										#else
-											<input type="button" name="List_last" value="&gt;|" disabled="disabled" />
+											<input type="button" name="List_last" id="List_last" value="&gt;|" disabled="disabled" />
 										#end
 									#end
 								</div>
Index: content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/content/sakai_resources_list.vm	(working copy)
@@ -126,7 +126,7 @@
 							#foreach($key in $listActions.keySet())
 								#set($action = $listActions.get("$key"))
 								#if($itemsOnLine > 0)|#end
-								<input id="${action.id}-button" type="button" value="$!action.label"
+								<input id="${action.id}-button" name="${action.id}-button" type="button" value="$!action.label"
 									onclick="javascript:document.getElementById('sakai_action').value='doMultiItemDispatch';document.getElementById('rt_action').value='$action.id';document.getElementById('showForm').submit();"
 									disabled="disabled" alt="$!action.id" />
 								
@@ -467,18 +467,18 @@
 									<div class="instruction" style="margin-bottom:.3em;">Viewing $topMsgPos - $btmMsgPos of $allMsgNumber items</div>
 									#if ("$pagesize" != "0")
 										#if ($goPPButton == "true")
-											<input type="button" name="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('sakai_action').value='doList_first';document.getElementById('showForm').submit();" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" title="First" onclick="javascript: document.getElementById('sakai_action').value='doList_first';document.getElementById('showForm').submit();" />
 										#else
-											<input type="button" name="List_first" value="|&lt;" disabled="disabled" />
+											<input type="button" name="List_first" id="List_first" value="|&lt;" disabled="disabled" />
 										#end
 										#if ($goPPButton == "true")
-											<input type="button" name="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_prev';document.getElementById('showForm').submit();" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" title="Previous $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_prev';document.getElementById('showForm').submit();" />
 										#else
-											<input type="button" name="List_prev" value="&lt;" disabled="disabled" />
+											<input type="button" name="List_prev" id="List_prev" value="&lt;" disabled="disabled" />
 										#end
 									#end
 									<!-- $pagesize  "$pagesize" -->
-									<select name="selectPageSize" onchange="javascript:blur(); document.getElementById('sakai_action').value='doChange_pagesize';document.getElementById('showForm').submit();">
+									<select name="selectPageSize" id="selectPageSize" onchange="javascript:blur(); document.getElementById('sakai_action').value='doChange_pagesize';document.getElementById('showForm').submit();">
 										<option value="5"#if("$pagesize" == "5") selected="selected"#end>$tlang.getString("lis.show5")</option>
 										<option value="10"#if("$pagesize" == "10") selected="selected"#end>$tlang.getString("lis.show10")</option>
 										<option value="20"#if("$pagesize" == "20") selected="selected"#end>$tlang.getString("lis.show20")</option>
@@ -488,14 +488,14 @@
 									</select>
 									#if ("$pagesize" != "0")
 										#if ($goNPButton == "true")
-											<input type="button" name="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_next';document.getElementById('showForm').submit();" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" title="Next $pagesize" onclick="javascript: document.getElementById('sakai_action').value='doList_next';document.getElementById('showForm').submit();" />
 										#else
-											<input type="button" name="List_next" value="&gt;" disabled="disabled" />
+											<input type="button" name="List_next" id="List_next" value="&gt;" disabled="disabled" />
 										#end
 										#if ($goNPButton == "true")
-											<input type="button" name="List_last" value="&gt;|" title="Last" onclick="javascript: document.getElementById('sakai_action').value='doList_last';document.getElementById('showForm').submit();" />
+											<input type="button" name="List_last" id="List_last" value="&gt;|" title="Last" onclick="javascript: document.getElementById('sakai_action').value='doList_last';document.getElementById('showForm').submit();" />
 										#else
-											<input type="button" name="List_last" value="&gt;|" disabled="disabled" />
+											<input type="button" name="List_last" id="List_last" value="&gt;|" disabled="disabled" />
 										#end
 									#end
 								</div></div>
@@ -721,7 +721,7 @@
 		<div id="bottompadding" style="height:12em"> </div> 
 		
 		#foreach($key in $listActions.keySet())
-			<input type="hidden" id="${key}-count" value="$counter.getValue("${key}selected")" />
+			<input type="hidden" id="${key}-count" name="${key}-count" value="$counter.getValue("${key}selected")" />
 		#end		
 	</form>						
 </div>
Index: content/content-tool/tool/src/webapp/vm/resources/sakai_create_folders.vm
===================================================================
--- content/content-tool/tool/src/webapp/vm/resources/sakai_create_folders.vm	(revision 62635)
+++ content/content-tool/tool/src/webapp/vm/resources/sakai_create_folders.vm	(working copy)
@@ -70,7 +70,7 @@
 *#
 		<p class="act">
 			<input type="button" class="active" name="savechanges" id="saveChanges" onclick="javascript:showNotif('submitnotif03','saveChanges','addFolderForm');document.getElementById('addFolderForm').action='#toolLink("ResourcesHelperAction" "doCreateFolders")&flow=save';submitform('addFolderForm');" value="$tlang.getString("label.finfldr")" accesskey="s" />
-			<input type="button" name="cancel" onclick="javascript:document.getElementById('addFolderForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addFolderForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
+			<input type="button" name="cancel" id="cancel" onclick="javascript:document.getElementById('addFolderForm').action='#toolLink("ResourcesHelperAction" "doCancel")';submitform('addFolderForm');" value="$tlang.getString("label.cancel")" accesskey="x" />
 			<span class="messageProgress"  id="submitnotif03" style="visibility:hidden">$tlang.getString("processmessage.folders")</span>
 		</p>
 	</form>