Index: branches/5.1.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r13606 -r13658
--- branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 13606)
+++ branches/5.1.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 13658)
@@ -260,45 +260,13 @@
 		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">
 			<inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
 			<td class="control-cell">
-				<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 style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
+					&nbsp;
 				</div>
 
-				<table cellpadding="0" cellspacing="3">
-					<tr>
-						<td style="width: 63px; height: 21px;" id="<inp2:{$prefix}_InputName field='$field'/>_place_holder">
-							&nbsp;
-						</td>
-						<td>
-							<input class="button" type="button" onclick="UploadsManager.StartUpload('<inp2:{$prefix}_InputName field='$field'/>')" value="Upload"/>
-						</td>
-					</tr>
-				</table>
+				<div id="<inp2:{$prefix}_InputName field='$field'/>_queueinfo" class="uploader-queue"></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' format='file_names'/>"><br/>
+				<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" id="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field' format='file_names'/>">
 				<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="">
@@ -313,6 +281,7 @@
 							multiple : '<inp2:{$prefix}_FieldOption field="$field" option="multiple"/>',
 							prefix : '<inp2:m_Param name="prefix"/>',
 							field : '<inp2:m_Param name="field"/>',
+							thumb_format: '<inp2:{$prefix}_FieldOption field="$field" option="thumb_format"/>',
 							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"/>',