Index: branches/5.2.x/admin_templates/orders/export/export.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 14089)
@@ -34,7 +34,7 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="ord.export" field="ExportFormat" title="la_fld_ExportFormat" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
@@ -43,19 +43,17 @@
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets"/>
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets">
 				<td class="control-cell">
 					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:ord.export_InputName field="ExportPresets"/>" id="<inp2:ord.export_InputName field="ExportPresets"/>" onchange="update_fields(this.value)">
 						<inp2:ord.export_PredefinedOptions field="ExportPresets" block="inp_option_item" selected="selected"/>
 					</select>
 					&nbsp;&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="la_Text_Delete"/>" onclick="delete_preset()">
 				</td>
-			</tr>
+			</inp2:m_RenderElement>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -87,8 +85,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="ord.export" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="ExportSavePreset" title="la_fld_ExportSavePreset" size="2" maxlength="1" onclick="update_preset_field(this.checked)"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportPresetName" title="la_fld_ExportPresetName" size="20" />
@@ -113,7 +110,7 @@
 		$kf.elements['events[ord.export]'].value = tmp;
 		Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" js_escape="1" no_amp="1"/>', delete_busy, '', function() {
 			presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
-			
+
 			for (i=0; i< presets.options.length; i++) {
 				if (presets.options[i].selected) {
 					presets.options.remove[i];