Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F726549
onlinestore
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sun, Jan 5, 7:55 PM
Size
22 KB
Mime Type
text/x-diff
Expires
Tue, Jan 7, 7:55 PM (18 h, 27 m ago)
Engine
blob
Format
Raw Data
Handle
536661
Attached To
rTOST Themes.OnlineStore
onlinestore
View Options
Index: branches/1.0.x/platform/blocks/common/redirect.tpl
===================================================================
--- branches/1.0.x/platform/blocks/common/redirect.tpl (revision 12966)
+++ branches/1.0.x/platform/blocks/common/redirect.tpl (revision 12967)
@@ -1,18 +1,18 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
- <td class="block-header"><inp2:m_Phrase label="lu_redirecting_title" /></td>
+ <td class="block-header"><inp2:m_Phrase label="lu_title_Redirecting" /></td>
</tr>
<tr>
<td class="block-data">
<form action="<inp2:m_FormAction />" method="get">
<br />
- <a href="<inp2:m_get name="redirect_to"/>"><inp2:m_Phrase label="lu_redirecting_text" /></a><br />
+ <a href="<inp2:m_get name="redirect_to"/>"><inp2:m_Phrase label="lu_text_Redirecting" /></a><br />
<br />
<script type="text/javascript">
document.write('<input type="submit" class="button" value=" Proceed " accesskey="s" onclick="window.location=\'<inp2:m_get name="redirect_to_js"/>\'; return false" />');
</script>
</form>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/1.0.x/platform/blocks/login/form_register.tpl
===================================================================
--- branches/1.0.x/platform/blocks/login/form_register.tpl (revision 12966)
+++ branches/1.0.x/platform/blocks/login/form_register.tpl (revision 12967)
@@ -1,335 +1,335 @@
<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_zip_code"/>:</strong>
+ <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\""/>
</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"> </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>
</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> </td>
<td><inp2:Field name="Description" /> </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"> </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"> </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>
</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"> </td>
</tr>
<tr>
<td>
</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.0.x/in-commerce/blocks/checkout/form_register.tpl
===================================================================
--- branches/1.0.x/in-commerce/blocks/checkout/form_register.tpl (revision 12966)
+++ branches/1.0.x/in-commerce/blocks/checkout/form_register.tpl (revision 12967)
@@ -1,214 +1,214 @@
<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>
<td class="block-data">
<strong><inp2:m_phrase label="lu_birth_date"/>*:</strong><br>
</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>
<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>
<td>
- <strong><inp2:m_phrase label="lu_zip_code"/>:</strong>
+ <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\""/>
</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
Log In to Comment