Page MenuHomeIn-Portal Phabricator
Files F726961

onlinestore
No OneTemporary
Actions

File Metadata

Created
Mon, Jan 6, 3:51 AM

onlinestore
View Options

Index: branches/1.1.x/platform/blocks/login/form_register.tpl
===================================================================
--- branches/1.1.x/platform/blocks/login/form_register.tpl (revision 13468)
+++ branches/1.1.x/platform/blocks/login/form_register.tpl (revision 13469)
@@ -1,335 +1,334 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_if check="u_RegistrationEnabled">
<form method="post" action="<inp2:m_FormAction />" id="registration_form">
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_NewCustomers"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_Phrase label="lu_PleaseRegister"/><br/>
<br/>
<inp2:m_if check="u_HasError" field="any" except="ValidateLogin">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemInForm"/>
</td>
</tr>
</table>
</inp2:m_if>
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
<table class="form-data">
<inp2:m_if check="u_UseUsernames">
<tr>
<td>
<strong><inp2:m_phrase label="lu_username"/>*:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Login"/>" value="<inp2:u_Field name="Login"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Login"/></td>
</tr>
</inp2:m_if>
<tr>
<td>
<strong><inp2:m_phrase label="lu_email"/>*:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Email"/>" value="<inp2:u_Field name="Email"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Email"/></td>
</tr>
<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
<tr>
<td>
<strong><inp2:m_phrase label="lu_password"/>*:</strong>
</td>
<td>
<input type="password" name="<inp2:u_InputName field="Password"/>" value="" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Password"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_repeat_password"/>*:</strong>
</td>
<td>
<input type="password" name="<inp2:u_InputName field="VerifyPassword"/>" value="" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="VerifyPassword"/></td>
</tr>
</inp2:m_if>
<tr>
<td class="block-data">
<strong><inp2:m_phrase label="lu_birth_date"/>*:</strong><br>
</td>
<td class="block-data" style="white-space: nowrap">
<script src="inc/calendar.js"></script>
<input type="text" name="<inp2:u_InputName field="dob_date"/>" id="<inp2:u_InputName field="dob_date"/>" value="<inp2:u_Field name="dob_date" format="_regional_InputDateFormat"/>" style="width: 100px;" datepickerIcon="img/calendar.gif"/>
<script type="text/javascript">
initCalendar('<inp2:u_InputName field="dob_date"/>', "<inp2:u_Format input_format="1" field="dob_date"/>");
</script>
(<inp2:u_Format field="dob_date" input_format="1" human="true"/>, ex. <inp2:u_Format field="dob_date" sample="true"/>)
<input type="hidden" name="<inp2:u_InputName field="dob_time"/>" value="" />
</td>
<td width="170" class="error"><inp2:u_Error field="dob_date"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_first_name"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="FirstName"/>" value="<inp2:u_Field name="FirstName"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="FirstName"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_last_name"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="LastName"/>" value="<inp2:u_Field name="LastName"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="LastName"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_company"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Company"/>" value="<inp2:u_Field name="Company"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Company"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_address_line"/> 1:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Street"/>" value="<inp2:u_Field name="Street"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Street"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_address_line"/> 2:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Street2"/>" value="<inp2:u_Field name="Street2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Street2"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_city"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="City"/>" value="<inp2:u_Field name="City"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:u_Error field="City"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_state"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="State"/>" value="<inp2:u_Field name="State"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:u_Error field="State"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_ZipCode"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Zip"/>" value="<inp2:u_Field name="Zip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:u_Error field="Zip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_country"/>:</strong>
</td>
<td>
<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
- <option value=""></option>
- <inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:u_Error field="Country"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_phone"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Phone"/>" value="<inp2:u_Field name="Phone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:u_Error field="Phone"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_fax"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Fax"/>" value="<inp2:u_Field name="Fax"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:u_Error field="Fax"/></td>
</tr>
<inp2:m_if check="m_AllowAffiliateRegistration">
<tr>
<td>
<strong><inp2:m_phrase label="lu_comm_RegisterAsAffiliate"/>:</strong>
</td>
<td>
<input type="checkbox" name="RegisterAsAffiliate" id="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
</td>
<td class="error">&nbsp;</td>
</tr>
</inp2:m_if>
<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
<tr>
<td>
<strong><inp2:m_phrase label="lu_comm_SSNField"/>*:</strong>
</td>
<td>
<input type="text" name="SSN" id="SSN" value="<inp2:m_get var="SSN" />" />
</td>
<td class="error">
<inp2:m_if check="m_getequals" var="SSNRequiredError" value="1">
<inp2:m_Phrase label="lu_comm_FieldIsRequired" />
</inp2:m_if>&nbsp;
</td>
</tr>
<inp2:m_DefineElement name="affiliate_payment_type_elem">
<tr>
<td>
<input type="radio" name="PaymentTypeId" id="PaymentTypeId_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="PaymentTypeId" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if> />
</td>
<td>
<label for="PaymentTypeId_<inp2:Field name="PaymentTypeId" />"><inp2:Field name="Name" /></label>
</td>
</tr>
<inp2:m_if check="Field" name="Description">
<tr>
<td>&nbsp;</td>
<td><inp2:Field name="Description" />&nbsp;</td>
</tr>
</inp2:m_if>
</inp2:m_DefineElement>
<tr>
<td style="vertical-align: top;">
<strong><inp2:m_phrase label="lu_comm_ChooseAffiliatePaymentType"/>:</strong>
</td>
<td colspan="2">
<table class="block-no-border">
<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_elem" />
<tr><td colspan="2">&nbsp;</td></tr>
</table>
</td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_comm_Comments"/>:</strong>
</td>
<td>
<textarea name="Comments" id="Comments" cols="35" rows="5"><inp2:m_get var="Comments" /></textarea>
</td>
<td class="error">&nbsp;</td>
</tr>
<tr>
<td colspan="2">
<input type="checkbox" name="AgreeToAffiliateTerms" id="AgreeToAffiliateTerms" />
<strong><inp2:m_Phrase label="lu_comm_IAgreeTo" />
<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
<inp2:m_Phrase label="lu_comm_TermsAndConditions" /></strong>
<script type="text/javascript">
function showAffiliateAgreement()
{
window.open('<inp2:m_Link template="in-commerce/my_account/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
}
</script>
</td>
<td class="error">
<inp2:m_if check="m_getequals" var="MustAgreeToTerms" value="1">
<inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError"/>
</inp2:m_if>&nbsp;
</td>
</tr>
</inp2:m_if>
<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
<tr>
<td>
<strong><inp2:m_phrase label="lu_captcha"/>:</strong>
</td>
<td>
<img src="<inp2:m_t pass="m" template="inc/captcha_image" var="u_captcha_code" w="150" h="30"/>" /><br/>
</td>
<td width="170" class="error">&nbsp;</td>
</tr>
<tr>
<td>
&nbsp;
</td>
<td>
<inp2:m_phrase label="lu_captcha_prompt"/><br/>
<input type="text" name="<inp2:u_InputName field="Captcha"/>" value="" style="width: 80px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Captcha"/></td>
</tr>
</inp2:m_if>
<tr>
<td colspan="3" valign="bottom" height="35">
<input type="hidden" name="shop_cart_template" value="in-commerce/checkout/shop_cart" />
<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_Register" no_editing="1"/>" />
<input class="hidden" type="submit" id="events[u][OnRefreshForm]" name="events[u][OnRefreshForm]" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
<script type="text/javascript">
function toggle_affiliate()
{
document.getElementById('events[u][OnRefreshForm]').click();
}
</script>
</inp2:m_if>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl
===================================================================
--- branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl (revision 13468)
+++ branches/1.1.x/in-commerce/blocks/my_account/address_edit.tpl (revision 13469)
@@ -1,182 +1,181 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<form method="post" action="<inp2:m_FormAction />">
<table class="block-no-border">
<tr>
<td class="block-header" colspan="2">
<inp2:m_Phrase label="lu_comm_MyAddresses"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_if check="addr_HasError" field="any">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemWithForm"/>
</td>
</tr>
</table>
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<strong><inp2:m_Phrase label="lu_AddressModificationBlocked"/></strong>
<inp2:m_else/>
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
<table class="form-data">
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_FullName"/> *:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="To"/>" value="<inp2:addr_Field name="To"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="To"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_Company"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Company"/>" value="<inp2:addr_Field name="Company"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Company"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1 *:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Address1"/>" value="<inp2:addr_Field name="Address1"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Address1"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Address2"/>" value="<inp2:addr_Field name="Address2"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Address2"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_City"/> *:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="City"/>" value="<inp2:addr_Field name="City"/>" style="width: 100px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="City"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_state"/> *:</strong></td>
<td>
<input type="text" name="<inp2:addr_InputName field="State"/>" value="<inp2:addr_Field name="State"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:addr_Error field="State"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/> *:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Zip"/>" value="<inp2:addr_Field name="Zip"/>" style="width: 60px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Zip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_country"/> *:</strong></td>
<td>
<select name="<inp2:addr_InputName field="Country"/>" style="width: 300px;">
- <option value=""></option>
- <inp2:addr_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:addr_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:addr_Error field="Country"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Phone"/> *:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Phone"/>" value="<inp2:addr_Field name="Phone"/>" style="width: 150px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Phone"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Fax"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Fax"/>" value="<inp2:addr_Field name="Fax"/>" style="width: 150px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Fax"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Email"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:addr_InputName field="Email"/>" value="<inp2:addr_Field field="Email"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:addr_Error field="Email"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_LastUsedAsShipping"/>:</strong>
</td>
<td class="block-data">
<input type="checkbox" name="<inp2:addr_InputName field="LastUsedAsShipping"/>" value="1"<inp2:m_if check="addr_Field" field="LastUsedAsShipping" value="1"> checked</inp2:m_if> />
</td>
<td width="170" class="error"><inp2:addr_Error field="LastUsedAsShipping"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_LastUsedAsBilling"/>:</strong>
</td>
<td class="block-data">
<input type="checkbox" name="<inp2:addr_InputName field="LastUsedAsBilling"/>" value="1"<inp2:m_if check="addr_Field" field="LastUsedAsBilling" value="1"> checked</inp2:m_if> />
</td>
<td width="170" class="error"><inp2:addr_Error field="LastUsedAsBilling"/></td>
</tr>
<tr>
<td colspan="3" valign="bottom" height="35">
<input class="button" type="submit" name="events[addr][<inp2:addr_SaveEvent/>]" value="<inp2:m_if check="addr_IsNewMode"><inp2:m_Phrase label="lu_comm_Create"/><inp2:m_else/><inp2:m_Phrase label="lu_comm_Update"/></inp2:m_if>"/>
<input type="hidden" name="<inp2:addr_InputName field="PortalUserId"/>" value="<inp2:addr_Field field="PortalUserId"/>" />
<input type="hidden" name="next_template" value="in-commerce/my_account/address"/>
</td>
</tr>
</table>
</inp2:m_if>
</td>
</tr>
</table>
</form>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl
===================================================================
--- branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl (revision 13468)
+++ branches/1.1.x/in-commerce/blocks/my_account/my_profile.tpl (revision 13469)
@@ -1,194 +1,193 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<form method="post" action="<inp2:m_FormAction />">
-<table class="block-no-border">
- <tr>
+<table class="block-no-border">
+ <tr>
<td class="block-header" colspan="2">
<inp2:m_Phrase label="lu_comm_PersonalInfo"/>
-
- </td>
- </tr>
+
+ </td>
+ </tr>
<tr>
<td class="block-data">
<inp2:m_if check="u_HasError" field="any">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemWithForm"/>
-
+
</td>
</tr>
</table>
</inp2:m_if>
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
-
+
<table class="form-data">
- <tr>
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Password"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="password" name="<inp2:u_InputName field="Password"/>" value="" style="width: 100px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Password"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_VerifyPassword"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="password" name="<inp2:u_InputName field="VerifyPassword"/>" value="" style="width: 100px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="VerifyPassword"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_FirstName"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="FirstName"/>" value="<inp2:u_Field name="FirstName"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="FirstName"/></td>
</tr>
-
+
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_LastName"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="LastName"/>" value="<inp2:u_Field name="LastName"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="LastName"/></td>
</tr>
-
+
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_company"/>:</strong>
</td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Company"/>" value="<inp2:u_Field name="Company"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Company"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Phone"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Phone"/>" value="<inp2:u_Field name="Phone"/>" style="width: 150px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Phone"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Fax"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Fax"/>" value="<inp2:u_Field name="Fax"/>" style="width: 150px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Fax"/></td>
</tr>
- <tr>
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_BirthDate"/> *:</strong><br>
- </td>
+ </td>
<td class="block-data">
<script src="inc/calendar.js"></script>
<input type="text" name="<inp2:u_InputName field="dob_date"/>" id="<inp2:u_InputName field="dob_date"/>" value="<inp2:u_Field name="dob_date" format="_regional_InputDateFormat"/>" style="width: 100px;" datepickerIcon="img/calendar.gif"/>
<script type="text/javascript">
initCalendar('<inp2:u_InputName field="dob_date"/>', "<inp2:u_Format field="dob_date" input_format="1"/>");
</script>
(<inp2:u_Format field="dob_date" input_format="1" human="true"/>, ex. <inp2:u_Format field="dob_date" sample="true"/>)
</td>
<td width="170" class="error"><inp2:u_Error field="dob_date"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Email"/> *:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Email"/>" value="<inp2:u_Field field="Email"/>" style="width: 200px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Email"/></td>
- </tr>
-
- <tr>
+ </tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Street"/>" value="<inp2:u_Field name="Street"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Street"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Street2"/>" value="<inp2:u_Field name="Street2"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Street2"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_City"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="City"/>" value="<inp2:u_Field name="City"/>" style="width: 100px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="City"/></td>
- </tr>
+ </tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_state"/>:</strong></td>
<td>
<input type="text" name="<inp2:u_InputName field="State"/>" value="<inp2:u_Field name="State"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:u_Error field="State"/></td>
</tr>
- <tr>
+ <tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/>:</strong>
- </td>
+ </td>
<td class="block-data">
<input type="text" name="<inp2:u_InputName field="Zip"/>" value="<inp2:u_Field name="Zip"/>" style="width: 60px;" />
</td>
<td width="170" class="error"><inp2:u_Error field="Zip"/></td>
- </tr>
+ </tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_country"/>:</strong></td>
<td>
<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
- <option value=""></option>
- <inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:u_Error field="Country"/></td>
</tr>
<tr>
<td colspan="3" valign="bottom" height="35">
<input class="button" type="submit" id="events[u][OnUpdate]" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_Update" no_editing="1"/>"/>
<input type="hidden" name="next_template" value="in-commerce/my_account/account"/>
</td>
- </tr>
+ </tr>
</table>
</td>
</tr>
-
+
</table>
</form>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl
===================================================================
--- branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl (revision 13468)
+++ branches/1.1.x/in-commerce/blocks/checkout/billing_address.tpl (revision 13469)
@@ -1,251 +1,250 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:ord_ShowDefaultAddress type="billing"/>
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_comm_BillingInfo"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_if check="ord_HasError" field="any">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemInForm"/>
</td>
</tr>
</table>
</inp2:m_if>
<inp2:m_Phrase label="lu_comm_PleaseEnterBillingAddress"/>
<br />
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
<inp2:m_if check="m_LoggedIn">
<!-- address selector: begin -->
<inp2:m_Phrase label="lu_comm_SelectAddress"/>:
<inp2:m_DefineElement name="address_elem">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
</inp2:m_DefineElement>
<select name="billing_address_id" onchange="document.getElementById('events[ord][OnSelectAddress]').click();">
<inp2:m_if check="ord_AllowAddAddress">
<option value="-1"><inp2:m_phrase name="lu_comm_NewAddress"/></option>
</inp2:m_if>
<inp2:ord_PrintAddresses render_as="address_elem" type="billing" />
</select>
&nbsp;
<input class="button" type="submit" id="events[ord][OnSelectAddress]" name="events[ord][OnSelectAddress]" value="<inp2:m_Phrase label="lu_comm_Select" no_editing="1"/>"/>
<a href="<inp2:m_Link template="in-commerce/my_account/address"/>"><inp2:m_Phrase name="lu_comm_ManageAddresses"/></a>
<br />
<inp2:m_Phrase label="lu_comm_OrEnterAddress"/>:<br />
<inp2:m_if check="ord_IsProfileAddress" type="billing">
<inp2:m_Phrase label="lu_comm_ProfileAddressWarning"/><br />
</inp2:m_if>
<!-- address selector: end -->
</inp2:m_if>
<table class="form-data">
<inp2:m_if check="ord_OrderHasTangibleItems">
<inp2:m_if check="m_LoggedIn"><inp2:m_else/>
<tr>
<td><strong><inp2:m_Phrase label="lu_SameAsShipping"/>:</strong></td>
<td>
<input type="checkbox" name="same_address" onclick="document.getElementById('events[ord][OnUpdate]').click();" value="1"<inp2:m_if check="m_GetEquals" name="same_address" value="1"> checked</inp2:m_if>" />
</td>
<td class="error"></td>
</tr>
</inp2:m_if>
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block" inverse="1">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FullName"/>*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingTo"/>" value="<inp2:ord_Field name="BillingTo"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="BillingTo" /></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Company"/>:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingCompany"/>" value="<inp2:ord_Field name="BillingCompany"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="BillingCompany" /></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingAddress1"/>" value="<inp2:ord_Field name="BillingAddress1"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingAddress1" /></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingAddress2"/>" value="<inp2:ord_Field name="BillingAddress2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingAddress2" /></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_City"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingCity"/>" value="<inp2:ord_Field name="BillingCity"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingCity" /></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_State"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingState"/>" value="<inp2:ord_Field name="BillingState"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingState"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_ZipCode"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingZip"/>" value="<inp2:ord_Field name="BillingZip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingZip" /></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
<td>
<select name="<inp2:ord_InputName field="BillingCountry"/>" style="width: 300px;">
- <option value="0"></option>
- <inp2:ord_PredefinedOptions field="BillingCountry" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:ord_PredefinedOptions field="BillingCountry" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:ord_Error field="BillingCountry" /></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Phone"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingPhone"/>" value="<inp2:ord_Field name="BillingPhone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingPhone"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Email"/> :</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="BillingEmail"/>" value="<inp2:ord_Field name="BillingEmail"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingEmail"/></td>
</tr>
<inp2:m_else/>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FullName"/>*:</strong></td>
<td>
<inp2:ord_Field name="BillingTo"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingTo"/>" value="<inp2:ord_Field name="BillingTo"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="BillingTo"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Company"/>:</strong></td>
<td>
<inp2:ord_Field name="BillingCompany"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingCompany"/>" value="<inp2:ord_Field name="BillingCompany"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="BillingCompany"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1*:</strong></td>
<td>
<inp2:ord_Field name="BillingAddress1"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingAddress1"/>" value="<inp2:ord_Field name="BillingAddress1"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingAddress1"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong></td>
<td>
<inp2:ord_Field name="BillingAddress2"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingAddress2"/>" value="<inp2:ord_Field name="BillingAddress2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingAddress2"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_City"/> *:</strong></td>
<td>
<inp2:ord_Field name="BillingCity"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingCity"/>" value="<inp2:ord_Field name="BillingCity"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingCity"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_State"/>*:</strong></td>
<td>
<inp2:ord_Field name="BillingState"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingState"/>" value="<inp2:ord_Field name="BillingState"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingState"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/> *:</strong></td>
<td>
<inp2:ord_Field name="BillingZip"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingZip"/>" value="<inp2:ord_Field name="BillingZip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingZip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
<td>
<inp2:ord_Field name="BillingCountry"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingCountry"/>" value="<inp2:ord_Field name="BillingCountry"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingCountry"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Phone"/>*:</strong></td>
<td>
<inp2:ord_Field name="BillingPhone"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingPhone"/>" value="<inp2:ord_Field name="BillingPhone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingPhone"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Email"/>:</strong></td>
<td>
<inp2:ord_Field name="BillingEmail"/>
<input type="hidden" name="<inp2:ord_InputName field="BillingEmail"/>" value="<inp2:ord_Field name="BillingEmail"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="BillingEmail"/></td>
</tr>
</inp2:m_if>
<tr>
<td colspan="2" valign="bottom">
<br/>
<input type="hidden" name="check_billing_address" value="true"/>
<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateAddress" no_editing="1"/>"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl
===================================================================
--- branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl (revision 13468)
+++ branches/1.1.x/in-commerce/blocks/checkout/shipping_address.tpl (revision 13469)
@@ -1,235 +1,234 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:ord_ShowDefaultAddress type="shipping"/>
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_comm_ShippingInfo"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_if check="ord_HasError" field="any">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemInForm"/>
</td>
</tr>
</table>
</inp2:m_if>
<inp2:m_Phrase label="lu_comm_EnterShippingAddress"/>
<br />
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
<inp2:m_if check="m_LoggedIn">
<!-- address selector: begin -->
<inp2:m_Phrase label="lu_comm_SelectAddress"/>:
<inp2:m_DefineElement name="address_elem">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="value"/></option>
</inp2:m_DefineElement>
<select name="shipping_address_id" onchange="document.getElementById('events[ord][OnSelectAddress]').click();">
<inp2:m_if check="ord_AllowAddAddress">
<option value="-1"><inp2:m_phrase name="lu_comm_NewAddress"/></option>
</inp2:m_if>
<inp2:ord_PrintAddresses render_as="address_elem" type="shipping" />
</select>
&nbsp;
<input class="button" type="submit" id="events[ord][OnSelectAddress]" name="events[ord][OnSelectAddress]" value="<inp2:m_Phrase label="lu_comm_Select" no_editing="1"/>"/>
<a href="<inp2:m_Link template="in-commerce/my_account/address"/>"><inp2:m_Phrase name="lu_comm_ManageAddresses"/></a>
<br />
<inp2:m_Phrase label="lu_comm_OrEnterAddress"/>:<br />
<inp2:m_if check="ord_IsProfileAddress" type="billing">
<inp2:m_Phrase label="lu_comm_ProfileAddressWarning"/><br />
</inp2:m_if>
<!-- address selector: end -->
</inp2:m_if>
<table class="form-data">
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block" inverse="1">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FullName"/>*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingTo"/>" value="<inp2:ord_Field name="ShippingTo"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="ShippingTo"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Company"/>:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingCompany"/>" value="<inp2:ord_Field name="ShippingCompany"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="ShippingCompany"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingAddress1"/>" value="<inp2:ord_Field name="ShippingAddress1"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingAddress1"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingAddress2"/>" value="<inp2:ord_Field name="ShippingAddress2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingAddress2"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_City"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingCity"/>" value="<inp2:ord_Field name="ShippingCity"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingCity"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_State"/>*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingState"/>" value="<inp2:ord_Field name="ShippingState"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingState"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/> *:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingZip"/>" value="<inp2:ord_Field name="ShippingZip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingZip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
<td>
<select name="<inp2:ord_InputName field="ShippingCountry"/>" style="width: 300px;">
- <option value=""></option>
- <inp2:ord_PredefinedOptions field="ShippingCountry" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:ord_PredefinedOptions field="ShippingCountry" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:ord_Error field="ShippingCountry"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Phone"/>*:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingPhone"/>" value="<inp2:ord_Field name="ShippingPhone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingPhone"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Email"/>:</strong></td>
<td>
<input type="text" name="<inp2:ord_InputName field="ShippingEmail"/>" value="<inp2:ord_Field name="ShippingEmail"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingEmail"/></td>
</tr>
<inp2:m_else/>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FullName"/>*:</strong></td>
<td>
<inp2:ord_Field name="ShippingTo"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingTo"/>" value="<inp2:ord_Field name="ShippingTo"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="ShippingTo"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Company"/>:</strong></td>
<td>
<inp2:ord_Field name="ShippingCompany"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingCompany"/>" value="<inp2:ord_Field name="ShippingCompany"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:ord_Error field="ShippingCompany"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1*:</strong></td>
<td>
<inp2:ord_Field name="ShippingAddress1"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingAddress1"/>" value="<inp2:ord_Field name="ShippingAddress1"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingAddress1"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong></td>
<td>
<inp2:ord_Field name="ShippingAddress2"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingAddress2"/>" value="<inp2:ord_Field name="ShippingAddress2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingAddress2"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_City"/> *:</strong></td>
<td>
<inp2:ord_Field name="ShippingCity"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingCity"/>" value="<inp2:ord_Field name="ShippingCity"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingCity"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_State"/>*:</strong></td>
<td>
<inp2:ord_Field name="ShippingState"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingState"/>" value="<inp2:ord_Field name="ShippingState"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingState"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/> *:</strong></td>
<td>
<inp2:ord_Field name="ShippingZip"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingZip"/>" value="<inp2:ord_Field name="ShippingZip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingZip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_Country"/> *:</strong></td>
<td>
<inp2:ord_Field name="ShippingCountry"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingCountry"/>" value="<inp2:ord_Field name="ShippingCountry"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingCountry"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Phone"/>*:</strong></td>
<td>
<inp2:ord_Field name="ShippingPhone"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingPhone"/>" value="<inp2:ord_Field name="ShippingPhone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingPhone"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Email"/>:</strong></td>
<td>
<inp2:ord_Field name="ShippingEmail"/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingEmail"/>" value="<inp2:ord_Field name="ShippingEmail"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:ord_Error field="ShippingEmail"/></td>
</tr>
</inp2:m_if>
<tr>
<td colspan="2" valign="bottom" height="35">
<input type="hidden" name="check_shipping_address" value="true"/>
<input class="button" type="submit" id="events[ord][OnUpdate]" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateAddress" no_editing="1"/>"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl
===================================================================
--- branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl (revision 13468)
+++ branches/1.1.x/in-commerce/blocks/checkout/form_register.tpl (revision 13469)
@@ -1,214 +1,213 @@
<inp2:m_DefineElement name="destination">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_if check="u_SuggestRegister">
<form method="post" action="<inp2:m_FormAction />">
-
+
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_comm_Registration"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_if check="u_HasError" field="any">
<table class="warning">
<tr>
<td valign="top" align="left" class="block-data">
<img src="img/message.gif" alt="" width="19" height="19" />
<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
<inp2:m_Phrase label="lu_AProblemInForm"/>
</td>
</tr>
</table>
</inp2:m_if>
<inp2:m_Phrase label="lu_SuggestRegister"/>
<br>
<br>
<strong>* <inp2:m_Phrase label="lu_IndicatesRequired"/>.</strong> <br /><br />
<inp2:ord_PrefillRegistrationFields type="billing"/>
<table class="form-data">
<inp2:m_if check="u_UseUsernames">
<tr>
<td>
<strong><inp2:m_phrase label="lu_select_username"/>*:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Login"/>" value="<inp2:u_Field name="Login"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Login"/></td>
</tr>
</inp2:m_if>
<tr>
<td>
<strong><inp2:m_phrase label="lu_email"/>*:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Email"/>" value="<inp2:u_Field name="Email" />" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Email"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_create_password"/>*:</strong>
</td>
<td>
<input type="password" name="<inp2:u_InputName field="Password"/>" value="" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Password"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_repeat_password"/>*:</strong>
</td>
<td>
<input type="password" name="<inp2:u_InputName field="VerifyPassword"/>" value="" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="VerifyPassword"/></td>
</tr>
-
- <tr>
+
+ <tr>
<td class="block-data">
<strong><inp2:m_phrase label="lu_birth_date"/>*:</strong><br>
- </td>
+ </td>
<td class="block-data">
<script src="inc/calendar.js"></script>
<input type="text" name="<inp2:u_InputName field="dob_date"/>" id="<inp2:u_InputName field="dob_date"/>" value="<inp2:u_Field name="dob_date" format="_regional_InputDateFormat"/>" style="width: 100px;" datepickerIcon="img/calendar.gif"/>
<script type="text/javascript">
initCalendar('<inp2:u_InputName field="dob_date"/>', "<inp2:u_Format input_format="1" field="dob_date"/>");
</script>
(<inp2:u_Format field="dob_date" input_format="1" human="true"/>, ex. <inp2:u_Format field="dob_date" sample="true"/>)
</td>
<td class="error"><inp2:u_Error field="dob_date"/></td>
- </tr>
-
+ </tr>
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_first_name"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="FirstName"/>" value="<inp2:u_Field name="FirstName"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="FirstName"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_last_name"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="LastName"/>" value="<inp2:u_Field name="LastName"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="LastName"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_company"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Company"/>" value="<inp2:u_Field name="Company"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Company"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_address_line"/> 1:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Street"/>" value="<inp2:u_Field name="Street"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Street"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_address_line"/> 2:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Street2"/>" value="<inp2:u_Field name="Street2"/>" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="Street2"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_city"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="City"/>" value="<inp2:u_Field name="City"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:u_Error field="City"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_state"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="State"/>" value="<inp2:u_Field name="State"/>" style="width: 200px;" />
</td>
<td class="error"><inp2:u_Error field="State"/></td>
- </tr>
+ </tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_ZipCode"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Zip"/>" value="<inp2:u_Field name="Zip"/>" style="width: 100px;" />
</td>
<td class="error"><inp2:u_Error field="Zip"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_country"/>:</strong>
</td>
<td>
<select name="<inp2:u_InputName field="Country"/>" style="width: 300px;">
- <option value=""></option>
- <inp2:u_PredefinedOptions field="Country" render_as="destination" selected_param="selected" selected="selected=\"selected\""/>
+ <inp2:u_PredefinedOptions field="Country" render_as="destination" has_empty="1" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:u_Error field="Country"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_phone"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Phone"/>" value="<inp2:u_Field name="Phone"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:u_Error field="Phone"/></td>
</tr>
-
+
<tr>
<td>
<strong><inp2:m_phrase label="lu_fax"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:u_InputName field="Fax"/>" value="<inp2:u_Field name="Fax"/>" style="width: 150px;" />
</td>
<td class="error"><inp2:u_Error field="Fax"/></td>
</tr>
-
+
<tr>
<td colspan="3" valign="bottom" height="35">
<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
-
+
<input type="hidden" name="fields_prefilled" value="1" />
-
+
<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_Register" no_editing="1"/>"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
-
+
</form>
</inp2:m_if>
\ No newline at end of file

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server