Index: branches/RC/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -r9305 -r9334
--- branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9305)
+++ branches/RC/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 9334)
@@ -179,25 +179,21 @@
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
 		<td>
 			<inp2:m_if check="m_Param" name="thumbnail">
-				<table cellspacing="0" cellpadding="0">
-					<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
+					<img src="<inp2:{$prefix}_Field field="$field" format="resize:{$thumbnail}"/>" alt=""/><br />
+					<table cellpadding="0" cellspacing="0">
 						<tr>
 							<td>
-								<img src="<inp2:{$prefix}_Field field="$field" format="resize:{$thumbnail}"/>" alt=""/><br />
+								<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
+								<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
 							</td>
-						</tr>
-						<tr>
 							<td>
-								<img src="img/spacer.gif" width="1" height="5" alt=""/>
+								<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="la_btn_DeleteImage"/></label>
 							</td>
 						</tr>
-					</inp2:m_if>
-					<tr>
-						<td>
-							<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
-						</td>
-					</tr>
-				</table>
+					</table>
+				</inp2:m_if>
+				<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
 			<inp2:m_else/>
 				<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" class="<inp2:m_param name="class"/>">
 				<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
@@ -213,8 +209,78 @@
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box_ml" class="" size="" maxlength="">
+<inp2:m_DefineElement name="inp_edit_swf_upload" class="" is_last="" style="">
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+		<td class="uploader-text">
+			<div class="uploader-main" id="<inp2:{$prefix}_InputName field="$field"/>_progress">
+				<div class="uploader-percent" id="<inp2:{$prefix}_InputName field="$field"/>_percent">0%</div>
+				<div class="uploader-left">
+					<div class="uploader-done" id="<inp2:{$prefix}_InputName field="$field"/>_done"></div>
+				</div>
+				<table style="border-collapse: collapse; width: 100%;">
+					<tr>
+						<td style="width: 120px">Uploading:</td><td id="<inp2:{$prefix}_InputName field="$field"/>_progress_filename"></td>
+					</tr>
+					<tr>
+						<td>Progress:</td><td id="<inp2:{$prefix}_InputName field="$field"/>_progress_progress"></td>
+					</tr>
+					<tr>
+						<td>Time elapsed:</td><td id="<inp2:{$prefix}_InputName field="$field"/>_progress_elapsed"></td>
+					</tr>
+					<tr>
+						<td>Time remaining:</td><td id="<inp2:{$prefix}_InputName field="$field"/>_progress_remaining"></td>
+					</tr>
+					<tr>
+						<td colspan="2" style="text-align: center"><a href="javascript:UploadsManager.CancelUpload('<inp2:{$prefix}_InputName field="$field"/>')">Cancel</a></td>
+					</tr>
+				</table>
+			</div>
+
+			<div>
+				<input class="button" type="button" onclick="UploadsManager.Browse('<inp2:{$prefix}_InputName field="$field"/>')" value="Browse"/>
+				<input class="button" type="button" onclick="UploadsManager.StartUpload('<inp2:{$prefix}_InputName field="$field"/>')" value="Upload"/>
+			</div>
+
+			<div id="<inp2:{$prefix}_InputName field="$field"/>_queueinfo"></div>
+			<div id="<inp2:{$prefix}_InputName field="$field"/>_holder"></div>
+
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" id="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>"><br/>
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[tmp_ids]" id="<inp2:{$prefix}_InputName field="$field"/>[tmp_ids]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[tmp_names]" id="<inp2:{$prefix}_InputName field="$field"/>[tmp_names]" value="">
+			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[tmp_deleted]" id="<inp2:{$prefix}_InputName field="$field"/>[tmp_deleted]" value="">
+
+			<script type="text/javascript">
+				UploadsManager.AddUploader('<inp2:{$prefix}_InputName field="$field"/>',
+					{
+						allowedFiletypesDescription : '<inp2:{$prefix}_FieldOption field="$field" option="files_description" js_escape="1"/>',
+						allowedFiletypes : '<inp2:{$prefix}_FieldOption field="$field" option="file_types"/>',
+						allowedFilesize : '<inp2:{$prefix}_FieldOption field="$field" option="max_size"/>',
+						multiple : '<inp2:{$prefix}_FieldOption field="$field" option="multiple"/>',
+						prefix : '<inp2:m_Param name="prefix"/>',
+						field : '<inp2:m_Param name="field"/>',
+						urls : '<inp2:{$prefix}_Field field="$field" format="file_urls" js_escape="1"/>',
+						names : '<inp2:{$prefix}_Field field="$field" format="file_names" js_escape="1"/>',
+						sizes : '<inp2:{$prefix}_Field field="$field" format="file_sizes" js_escape="1"/>',
+						flashsid : '<inp2:m_SID/>',
+						uploadURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnUploadFile" field="#FIELD#" id="#ID#" flashsid="#SID#" js_escape="1" no_amp="1" />',
+						deleteURL : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnDeleteFile" field="#FIELD#" file="#FILE#" js_escape="1" no_amp="1"/>',
+						tmp_url : '<inp2:m_t pass="m,$prefix" {$prefix}_event="OnViewFile" tmp="1" field="#FIELD#" file="#FILE#" id="#ID#" js_escape="1" no_amp="1" />',
+						IconPath: '../../admin/editor/cmseditor/editor/images'
+					}
+				)
+			</script>
+
+		</td>
+		<td class="error"><inp2:{$prefix}_Error field="$field"/>&nbsp;</td>
+		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box_ml" class="" size="" onblur="" maxlength="">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if check="{$prefix}_HasError" field="$field" >error</inp2:m_if>">
 			<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="$field" ><span class="error"> *</span></inp2:m_if>:</span><br>