Index: in-commerce/elements/addresses.elm.tpl
===================================================================
diff -u -N
--- in-commerce/elements/addresses.elm.tpl	(revision 12930)
+++ in-commerce/elements/addresses.elm.tpl	(revision 0)
@@ -1,92 +0,0 @@
-<!--## MY ADDRESS ELEMENT ##-->
-<inp2:m_DefineElement name="my_address_element">
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-	<tr class="listing-row">
-		<td>
-			<strong><inp2:Field field="To"/></strong><br />
-			<inp2:m_if check="Field" name="Company">
-				<inp2:Field field="Company"/><br />
-			</inp2:m_if>
-			<inp2:m_if check="FieldEquals" field="Address1" value="" inverse="inverse">
-				<inp2:Field field="Address1"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="FieldEquals" field="Address2" value="" inverse="inverse">
-				<inp2:Field field="Address2"/><br />
-			</inp2:m_if>
-			<inp2:PrintLocation/><br />
-		</td>
-		<td>
-			<inp2:m_if check="Field" name="Email">
-				<inp2:Field field="Email"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="Field" name="Phone">
-				<inp2:m_Phrase name="lu_Phone"/>: <inp2:Field field="Phone"/><br />
-			</inp2:m_if>
-
-			<inp2:m_if check="Field" name="Fax">
-				<inp2:m_Phrase name="lu_Fax"/>: <inp2:Field field="Fax"/><br />
-			</inp2:m_if>
-		</td>
-		<td>
-			<inp2:m_if check="Field" field="LastUsedAsShipping" value="1"><inp2:m_Phrase label="lu_LastUsedAsShipping"/><br/></inp2:m_if>
-			<inp2:m_if check="Field" field="LastUsedAsBilling" value="1"><inp2:m_Phrase label="lu_LastUsedAsBilling"/></inp2:m_if>
-			<br />
-		</td>
-		<td>
-			<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block" inverse="1">
-				<inp2:m_if check="IsProfileAddress">
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="platform/my_account/my_profile"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a>
-				<inp2:m_else />
-					<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_edit.gif" width="11" height="10" alt="" /> <a href="<inp2:m_Link template="in-commerce/my_account/edit_address" pass="m,addr"/>" class="item-action"><inp2:m_Phrase label="lu_btn_Edit"/></a> &nbsp;&nbsp;
-					&nbsp;|&nbsp; <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_delete.gif" width="11" height="10" alt="" /> <a href="<inp2:DeleteLink/>" onclick="return confirm('<inp2:m_phrase name="lu_comm_DeleteAddress" js_escape="1"/>');" class="item-action"><inp2:m_Phrase label="lu_btn_Delete"/></a>
-				</inp2:m_if>
-			</inp2:m_if>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /MY ADDRESS ELEMENT ##-->
-
-<!--## ADDRESS SHORT ELEMENT ##-->
-<inp2:m_DefineElement name="address_short_element">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
-</inp2:m_DefineElement>
-<!--## /ADDRESS SHORT ELEMENT ##-->
-
-<!--## EDIT ADDRESS ELEMENT ##-->
-<inp2:m_DefineElement name="inp_edit_select_address" style="" is_last="0">
-	<tr>
-		<td class="field-name">
-			<inp2:m_phrase label="$title"/>:<br />
-			<span class="field-hint">
-				<inp2:m_phrase label="lu_hint_OrEnterAddress"/>
-			</span>
-		</td>
-		<td class="field-value">
-			<select class="input-select" name="<inp2:m_param name="type"/>_address_id" onchange="document.getElementById('events[ord][OnSelectAddress]').click();" style="<inp2:m_param name="style"/>">
-				<inp2:m_if check="ord_AllowAddAddress">
-					<option value="-1"><inp2:m_phrase name="lu_opt_NewAddress"/></option>
-				</inp2:m_if>
-				<inp2:ord_PrintAddresses render_as="address_short_element" type="$type" />
-			</select>
-				&nbsp;
-			<input class="button" type="submit" id="events[ord][OnSelectAddress]" name="events[ord][OnSelectAddress]" value="<inp2:m_Phrase label="lu_btn_Select" no_editing="1"/>"/>
-			<a href="<inp2:m_Link template="in-commerce/my_account/my_addresses"/>"><inp2:m_Phrase name="lu_btn_ManageAddresses"/></a>
-		</td>
-	</tr>
-
-	<inp2:m_if check="ord_IsProfileAddress" type="$type">
-		<tr>
-			<td class="field-name" colspan="2">
-				<inp2:m_Phrase label="lu_hint_ProfileAddressWarning"/><br />
-			</td>
-		</tr>
-	</inp2:m_if>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-<!--## /EDIT ADDRESS ELEMENT ##-->
\ No newline at end of file