Index: branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl
===================================================================
diff -u -N -r14572 -r14614
--- branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 14572)
+++ branches/5.2.x/core/admin_templates/forms/form_field_edit.tpl	(.../form_field_edit.tpl)	(revision 14614)
@@ -20,19 +20,19 @@
 				 ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
-				
+
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
 					go_to_id('formflds', '<inp2:formflds_PrevId/>');
 					}
 				));
-	
+
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
 						go_to_id('formflds', '<inp2:formflds_NextId/>');
 					}
 				));
 
 				a_toolbar.Render();
-							
+
 				<inp2:m_if check="formflds_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
@@ -64,28 +64,57 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldName" title="la_prompt_FieldName" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="FieldLabel" title="la_prompt_FieldLabel" size="40"/>
 
-		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="la_tab_AdminUI"/>
+		<inp2:m_RenderElement name="subsection" prefix="formflds" fields="Prompt,ElementType,Validation,UploadExtensions,UploadMaxSize,ValueList,DefaultValue,Priority,Required,DisplayInGrid,Visibility,EmailCommunicationRole" title="la_tab_AdminUI"/>
 			<!--<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Heading" title="la_prompt_heading" size="40"/>-->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Prompt" title="la_prompt_FieldPrompt" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="ElementType" title="la_prompt_InputType" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="Validation" title="la_prompt_validation"/>
+
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadExtensions" style="width: 200px;"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="UploadMaxSize" style="width: 200px;"/>
+
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formflds" field="ValueList" title="la_prompt_ValueList" allow_html="0" cols="40" rows="5"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="DefaultValue" title="la_prompt_DefaultValue" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="formflds" field="Priority" title="la_field_Priority" size="10"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required" title="la_fld_Required"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="DisplayInGrid" title="la_fld_DisplayInGrid"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="formflds" field="Visibility" title="la_fld_Visibility"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="Required"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="DisplayInGrid"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="formflds" field="Visibility"/>
 
 			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
-				<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="EmailCommunicationRole" title="la_fld_EmailCommunicationRole" has_empty="1"/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="formflds" field="EmailCommunicationRole" has_empty="1"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="IsSystem" title="la_fld_IsSystem"/>
+				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="formflds" field="IsSystem"/>
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
 
+<inp2:m_if check="formflds_FieldsVisible" fields="UploadExtensions,UploadMaxSize">
+	<script type="text/javascript">
+		var $field_mask = '<inp2:formflds_InputName field="#FIELD_NAME#" js_escape="1"/>';
+
+		function syncUploadSettings() {
+			if ( $( get_control($field_mask, 'ElementType') ).val() == 'upload' ) {
+				$( get_control($field_mask, 'UploadExtensions', 'row') ).show();
+				$( get_control($field_mask, 'UploadMaxSize', 'row') ).show();
+			}
+			else {
+				$( get_control($field_mask, 'UploadExtensions', 'row') ).hide();
+				$( get_control($field_mask, 'UploadMaxSize', 'row') ).hide();
+			}
+		}
+
+		$(document).ready(
+			function () {
+				$( get_control($field_mask, 'ElementType') ).change(syncUploadSettings);
+			}
+		);
+
+		syncUploadSettings();
+	</script>
+</inp2:m_if>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file