Index: branches/5.2.x/admin_templates/orders/orders_edit.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 14089)
@@ -60,75 +60,67 @@
 
 <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_id_label" prefix="ord" field="OrderId" title="!la_fld_OrderId!"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="la_fld_OrderId"/>
 
 			<inp2:m_if check="ord_OrderEditable">
-				<inp2:m_if check="ord_FieldVisible" field="Number">
-					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
-						<td class="control-cell">
-							<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
-							-<inp2:m_inc param="tab_index" by="1"/>
-							<input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
-						</td>
-						<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
+						-<inp2:m_inc param="tab_index" by="1"/>
+						<input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
+					</td>
+				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode" >
-					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="!la_fld_Status!"/>
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="la_fld_Status"/>
 				<inp2:m_else/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
 				</inp2:m_if>
 
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="OrderDate" title="la_fld_Date"/>
 
-				<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
+				<inp2:m_RenderElement name="inp_edit_user" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
 					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
 					<inp2:m_else/>
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
 					</inp2:m_if>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
 			<inp2:m_else/>
-				<inp2:m_if check="ord_FieldVisible" field="Number">
-					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="Number" title="!la_fld_OrderNumber!"/>
-						<td class="control-cell">
-							<inp2:ord_Field field="OrderNumber"/>
-						</td>
-						<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<inp2:ord_Field field="OrderNumber"/>
+					</td>
+				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="!la_fld_Username!" size="15"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="la_fld_Status"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="la_fld_Date"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="PortalUserId" title="la_fld_Username" size="15"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="!la_fld_OrderIP!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderIP" title="la_fld_OrderIP"/>
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord" field="OnHold" title="la_fld_OnHold"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Affiliate!"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Affiliate"/>
 					<inp2:m_if check="ord_FieldEquals" field="AffiliateId" value="0">
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!" as_label="1"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser" as_label="1"/>
 					<inp2:m_else/>
-						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="!la_fld_AffiliateUser!"/>
+						<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateId" title="la_fld_AffiliateUser"/>
 					</inp2:m_if>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="!la_fld_AffiliateCommission!" currency="selected"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="AffiliateCommission" title="la_fld_AffiliateCommission" currency="selected"/>
 
-				<inp2:m_RenderElement name="subsection" title="!la_section_Comments!"/>
-					<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
-					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
+				<inp2:m_RenderElement name="subsection" title="la_section_Comments"/>
+					<inp2:m_RenderElement name="inp_label" prefix="ord" field="UserComment" title="la_fld_UserComment" control_options="{min_height: 100}" rows="10" cols="40"/>
+					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="la_fld_AdminComment" control_options="{min_height: 100}" rows="10" cols="40"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>