Index: branches/5.2.x/admin_templates/category_properties.tpl
===================================================================
diff -u -N -r13843 -r14091
--- branches/5.2.x/admin_templates/category_properties.tpl	(.../category_properties.tpl)	(revision 13843)
+++ branches/5.2.x/admin_templates/category_properties.tpl	(.../category_properties.tpl)	(revision 14091)
@@ -1,32 +1,28 @@
 <inp2:m_RenderElement name="subsection" title="la_In-news"/>
 
 <inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field="">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell">
+			<input type="text" name="<inp2:{$prefix}_InputName field="$field" />" id="<inp2:{$prefix}_InputName field="$field" />" value="<inp2:{$prefix}_Field field="$field" />" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
 
-				<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
-					<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					<inp2:m_else/>
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					</inp2:m_if>
-				</select>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
+				<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
+					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				</inp2:m_if>
+			</select>
+		</td>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="la_fld_cust_n_ItemTemplate" size="50"/>
 
-<inp2:m_RenderElement name="subsection" title="!la_section_RssProperties!"/>
-<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="!la_fld_RssSource!" size="50"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="!la_fld_RssUpdateInterval!" has_empty="1"/>
+<inp2:m_RenderElement name="subsection" title="la_section_RssProperties"/>
+<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_RssSource" type_field="cust_RssSource" title="la_fld_RssSource" size="50"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssUpdateInterval" type_field="cust_RssUpdateIntervalType" title="la_fld_RssUpdateInterval" has_empty="1"/>
 
-<inp2:m_RenderElement name="subsection" title="!la_section_RssExpiration!"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="!la_fld_RssDefaultExpiration!" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="!la_fld_RssExpireInterval!" has_empty="1"/>
-<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="!la_fld_RssDeleteExpired!"/>
+<inp2:m_RenderElement name="subsection" title="la_section_RssExpiration"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssDefaultExpiration" type_field="cust_RssDefaultExpirationType" title="la_fld_RssDefaultExpiration" has_empty="1"/>
+<inp2:m_RenderElement name="inp_edit_type" prefix="c" field="cust_RssExpireInterval" type_field="cust_RssExpireIntervalType" title="la_fld_RssExpireInterval" has_empty="1"/>
+<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="cust_RssDeleteExpired" title="la_fld_RssDeleteExpired"/>