Index: branches/5.1.x/admin_templates/articles/articles_edit.tpl
===================================================================
diff -u -N -r13460 -r13925
--- branches/5.1.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 13460)
+++ branches/5.1.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 13925)
@@ -68,38 +68,24 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
 
 			<!-- excerpt: begin -->
-			<inp2:m_if check="n_FieldVisible" field="Excerpt">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Excerpt" title="la_fld_Excerpt"/>
-					<td class="control-cell">
-						<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
-						<script type="text/javascript">
-							Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100});
-						</script>
-						<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="n" field="Excerpt"/>
-
-					<inp2:m_if check="n_DisplayOriginal" pass_params="1">
-						<inp2:m_RenderElement prefix="n" field="Excerpt" name="inp_original_label"/>
-					</inp2:m_if>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
+				<td class="control-cell">
+					<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
+					<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
+				</td>
+			</inp2:m_RenderElement>
 			<!-- excerpt: end -->
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Filename" title="la_fld_Filename" size="70" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
 			<inp2:m_if check="n_DisplayOriginal" display_original="1">
-				<inp2:m_if check="n_FieldVisible" field="Status">
-					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>
-						<td class="control-cell">
-							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-						</td>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="n" field="Status" title="la_fld_Status">
+					<td class="control-cell">
+						<inp2:m_Phrase label="la_UseGridToApproveDecline" />
+					</td>
+				</inp2:m_RenderElement>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/>
 			</inp2:m_if>