Index: branches/5.2.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13842 -r14090
--- branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13842)
+++ branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 14090)
@@ -89,9 +89,8 @@
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename">
 				<td class="control-cell">
 					<table border="0">
 						<tr>
@@ -122,17 +121,15 @@
 
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ImportSource"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -164,8 +161,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
@@ -176,22 +172,19 @@
 			<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
 		</inp2:m_DefineElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory"/>
+		<inp2:m_RenderElement design="form_row" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory">
 			<td class="control-cell">
 				<b><inp2:l.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
 				<input type="hidden" name="<inp2:l.import_InputName field='CategoryId'/>" value="<inp2:l.import_Field field='CategoryId' db='db'/>" />
 				<a href="javascript:openSelector('l.import', '<inp2:adm_SelectorLink prefix="l.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="CategoryId"/>
-		</tr>
+		</inp2:m_RenderElement>
 	<!-- CATEGORY SELECTOR: END -->
 
 		<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
+		<inp2:m_RenderElement design="form_row" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
 			<td class="control-cell">
 				<table cellspacing="0" cellpadding="0">
 					<tr>
@@ -216,8 +209,8 @@
 					</tr>
 				</table>
 			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="CheckDuplicatesMethod"/>
-		</tr>
+		</inp2:m_RenderElement>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>