Index: branches/5.2.x/admin_templates/links/links_edit.tpl
===================================================================
diff -u -N -r13842 -r14090
--- branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 13842)
+++ branches/5.2.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 14090)
@@ -61,48 +61,42 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="LinkId,Name,Description,Url,ReciprocalLinkFound,CreatedById,AutomaticFilename,Filename,CustomTemplate,CategoryId" title="la_section_Link" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="l" field="LinkId" title="!la_fld_Id!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="l" field="Name" title="!la_fld_Name!" size="60" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="!la_fld_Description!" cols="60" rows="5" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Url" title="!la_fld_Url!" size="60" display_original="1"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="l" field="LinkId" title="la_fld_Id" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="l" field="Name" title="la_fld_Name" size="60" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="l" field="Description" title="la_fld_Description" cols="60" rows="5" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Url" title="la_fld_Url" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_label" prefix="l" field="ReciprocalLinkFound" title="la_fld_ReciprocalLinkFound"/>
-			<inp2:m_RenderElement name="inp_edit_user" prefix="l" field="CreatedById" title="!la_fld_LinkOwner!" size="30" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_user" prefix="l" field="CreatedById" title="la_fld_LinkOwner" size="30" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Filename" title="la_fld_Filename" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CustomTemplate" title="la_fld_CustomTemplate" size="60" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="l" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="Status,NewItem,HotItem,PopItem,EditorPick,PriorityCreatedOn,Expire,MetaKeywords,MetaDescription" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
 			<inp2:m_if check="l_DisplayOriginal" display_original="1">
-				<inp2:m_if check="l_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="l" field="Status" title="!la_fld_Status!"/>
-						<td class="control-cell">
-							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-						</td>
-						<td>
-							&nbsp;
-						</td>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="l" 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="l" field="Status" title="!la_fld_Status!" display_original="1"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="Status" title="la_fld_Status" display_original="1"/>
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="NewItem" title="!la_fld_New!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="HotItem" title="!la_fld_Hot!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="PopItem" title="!la_fld_Pop!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="EditorsPick" title="!la_fld_EditorsPick!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Priority" title="!la_fld_Priority!" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="CreatedOn" title="!la_fld_CreatedOn!" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="Expire" title="!la_fld_Expire!" size="12" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="MetaKeywords" title="!la_fld_MetaKeywords!" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l" field="MetaDescription" title="!la_fld_MetaDescription!" cols="60" rows="5"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="NewItem" title="la_fld_New" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="HotItem" title="la_fld_Hot" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="l" field="PopItem" title="la_fld_Pop" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l" field="EditorsPick" title="la_fld_EditorsPick" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Priority" title="la_fld_Priority" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="CreatedOn" title="la_fld_CreatedOn" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="l" field="Expire" title="la_fld_Expire" size="12" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="MetaKeywords" title="la_fld_MetaKeywords" size="60"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="l" field="MetaDescription" title="la_fld_MetaDescription" cols="60" rows="5"/>
 
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="CachedRating,CachedVotesQty,Hits" title="la_section_Counters" original_title="la_section_OriginalValues" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedRating" title="!la_fld_Rating!" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedVotesQty" title="!la_fld_Votes!" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Hits" title="!la_fld_Hits!" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedRating" title="la_fld_Rating" hint_label="la_prompt_RatingLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="CachedVotesQty" title="la_fld_Votes" hint_label="la_prompt_VoteLimits" size="4" display_original="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="l" field="Hits" title="la_fld_Hits" hint_label="la_prompt_HitLimits" size="4" display_original="1"/>
 
 		<!-- custom fields: begin -->
 		<inp2:m_include t="incs/custom_blocks"/>