Index: branches/5.2.x/admin_templates/users/user_address_edit.tpl
===================================================================
diff -u -N -r14953 -r15166
--- branches/5.2.x/admin_templates/users/user_address_edit.tpl	(.../user_address_edit.tpl)	(revision 14953)
+++ branches/5.2.x/admin_templates/users/user_address_edit.tpl	(.../user_address_edit.tpl)	(revision 15166)
@@ -1,74 +1,74 @@
-<inp2:adm_SetPopupSize width="750" height="570"/>
-<inp2:m_include t="incs/header" body_properties="" />
-<inp2:m_RenderElement name="combined_header" prefix="u" section="in-portal:user_list" title_preset="user_address_edit"/>
-
-<!-- ToolBar -->
-<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-	<tr>
-		<td>
-			<script type="text/javascript">
-				a_toolbar = new ToolBar();
-
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'select',
-						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
-						function() {
-							submit_event('addr', '<inp2:addr_SaveEvent/>');
-						}
-					)
-				);
-
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'cancel',
-						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
-						function() {
-							cancel_edit('addr','OnCancel','<inp2:addr_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
-						}
-					)
-				);
-
-				a_toolbar.AddButton(
-					new ToolBarButton(
-						'reset_edit',
-						'<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>',
-						function() {
-							reset_form('addr', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
-						}
-					)
-				);
-
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</table>
-
-<inp2:addr_SaveWarning name="grid_save_warning"/>
-<inp2:addr_ErrorWarning name="form_error_warning"/>
-
-<inp2:m_RenderElement name="inp_edit_hidden" prefix="addr" field="PortalUserId"/>
-
-<div id="scroll_container">
-	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="addr" field="AddressId" title="la_fld_Id"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="la_fld_FullName"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="la_fld_AddressLine1"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="la_fld_AddressLine2"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping"/>
-		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling"/>
-		<inp2:m_RenderElement name="inp_label" prefix="addr" field="IsProfileAddress"/>
-		<inp2:m_RenderElement name="inp_edit_filler" />
-	</table>
-</div>
-
+<inp2:adm_SetPopupSize width="750" height="570"/>
+<inp2:m_include t="incs/header" body_properties="" />
+<inp2:m_RenderElement name="combined_header" prefix="u" section="in-portal:user_list" title_preset="user_address_edit"/>
+
+<!-- ToolBar -->
+<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
+	<tr>
+		<td>
+			<script type="text/javascript">
+				a_toolbar = new ToolBar();
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'select',
+						'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+						function() {
+							submit_event('addr', '<inp2:addr_SaveEvent/>');
+						}
+					)
+				);
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							cancel_edit('addr','OnCancel','<inp2:addr_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+						}
+					)
+				);
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'reset_edit',
+						'<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>',
+						function() {
+							reset_form('addr', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						}
+					)
+				);
+
+				a_toolbar.Render();
+			</script>
+		</td>
+	</tr>
+</table>
+
+<inp2:addr_SaveWarning name="grid_save_warning"/>
+<inp2:addr_ErrorWarning name="form_error_warning"/>
+
+<inp2:m_RenderElement name="inp_edit_hidden" prefix="addr" field="PortalUserId"/>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<inp2:m_RenderElement name="inp_id_label" prefix="addr" field="AddressId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="la_fld_FullName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="la_fld_AddressLine1"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="la_fld_AddressLine2"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping"/>
+		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling"/>
+		<inp2:m_RenderElement name="inp_label" prefix="addr" field="IsProfileAddress"/>
+		<inp2:m_RenderElement name="inp_edit_filler" />
+	</table>
+</div>
+
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file