Page MenuHomeIn-Portal Phabricator
Files F775934

in-commerce
No OneTemporary
Actions

File Metadata

Created
Thu, Feb 6, 2:44 PM

in-commerce
View Options

Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset_ok.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset_ok.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset_ok.tpl (revision 12319)
@@ -1,27 +1,27 @@
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_ForgotPassword"/></td>
</tr>
<tr>
<td class="block-data-single">
<form method="POST" action="<inp2:m_FormAction />">
<inp2:m_Phrase label="lu_text_ForgotPassHasBeenReset"/>
<br /><br />
- <input type="button" name="ResetPasswordOk" value="<inp2:m_Phrase label="lu_comm_Ok"/>" class="button" onClick="window.location.href='<inp2:c_CategoryLink template="platform/login/login_register" module="In-Commerce" cat_id="Root"/>&next_template=index'" />
+ <input type="button" name="ResetPasswordOk" value="<inp2:m_Phrase label="lu_comm_Ok" no_editing="1"/>" class="button" onClick="window.location.href='<inp2:c_CategoryLink template="platform/login/login_register" module="In-Commerce" cat_id="Root"/>&next_template=index'" />
</form>
<br /><br />
<br /><br />
<br /><br />
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/login_existing.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/login_existing.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/login_existing.tpl (revision 12319)
@@ -1,71 +1,71 @@
<form method="post" action="<inp2:m_FormAction />">
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_ReturningCustomers"/>
</td>
</tr>
<tr>
<td class="block-data">
<inp2:m_if check="u_HasError" field="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_AProblemWithForm"/>
</td>
</tr>
</table>
</inp2:m_if><inp2:m_Phrase label="lu_PleaseLogin"/>
<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="login" value="" style="width: 300px;" />
</td>
<td width="170" class="error">&nbsp;</td>
</tr>
<inp2:m_else/>
<tr>
<td>
<strong><inp2:m_phrase label="lu_email"/>*:</strong>
</td>
<td>
<input type="text" name="email" value="" style="width: 300px;" />
</td>
<td width="170" class="error">&nbsp;</td>
</tr>
</inp2:m_if>
<tr>
<td>
<strong><inp2:m_phrase label="lu_password"/>*:</strong>
</td>
<td>
<input type="password" name="password" value="" style="width: 300px;" />
</td>
<td class="error"><inp2:u_Error field="ValidateLogin"/></td>
</tr>
<tr>
<td colspan="3" valign="bottom" height="35">
- <input class="button" name="events[u][OnLogin]" type="submit" style="width: 70px;" value="<inp2:m_Phrase label="lu_comm_Login"/>" /><br /><br />
+ <input class="button" name="events[u][OnLogin]" type="submit" style="width: 70px;" value="<inp2:m_Phrase label="lu_comm_Login" no_editing="1"/>" /><br /><br />
<inp2:m_Phrase label="lu_IfForgotPass"/>
<a href="<inp2:m_Link template="platform/login/forgotpass"/>"><inp2:m_Phrase label="lu_Here"/></a> <br />
</td>
</tr>
</table>
</td>
</tr>
</table>
<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="pending_disabled_template" value="platform/login/login_pending_disabled" />
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_confirmation.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_confirmation.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_confirmation.tpl (revision 12319)
@@ -1,26 +1,26 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_subscribe_title" /></td>
</tr>
<tr>
<td class="block-data">
<br />
<br />
<strong><inp2:m_Phrase label="lu_subscribe_confirm" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_subscribe_confirm_prompt" />
<br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
- <input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes" no_editing="1"/>" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
<input type="hidden" name="subscribe_ok_template" value="platform/my_account/subscribe_ok"/>
<input type="hidden" name="subscribe_fail_template" value="platform/my_account/subscribe_error"/>
</form>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_reset.tpl (revision 12319)
@@ -1,44 +1,44 @@
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_ForgotPassword"/></td>
</tr>
<tr>
<td class="block-data-single">
<form method="POST" action="<inp2:m_FormAction />">
<strong><inp2:m_Phrase label="lu_title_PasswordRequestConfirm"/></strong>
<br/><br/>
<inp2:m_Phrase label="lu_text_PasswordRequestConfirm"/>
<br /><br />
<inp2:m_if check="u_TestCodeIsValid" >
- <input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_comm_Yes"/>" class="button" />
+ <input type="submit" name="events[u][OnResetPasswordConfirmed]" value="<inp2:m_Phrase label="lu_comm_Yes" no_editing="1"/>" class="button" />
- <input type="button" name="ResetPasswordCancelled" value="<inp2:m_Phrase label="lu_comm_No"/>" class="button" onClick="window.location.href='<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>'" />
+ <input type="button" name="ResetPasswordCancelled" value="<inp2:m_Phrase label="lu_comm_No" no_editing="1"/>" class="button" onClick="window.location.href='<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>'" />
<input type="hidden" name="user_key" value="<inp2:m_get name='user_key' />" />
<input type="hidden" name="template_success" value="platform/login/forgotpass_reset_ok" />
</form>
<inp2:m_else />
<span class="error"><inp2:u_Error field="PwResetConfirm"/></span>
<br /> <br />
<a href="<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>"><inp2:m_Phrase label="lu_ReturnToHome"/></a>
</inp2:m_if>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_confirmation.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_confirmation.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_confirmation.tpl (revision 12319)
@@ -1,26 +1,26 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_unsubscribe_title" /></td>
</tr>
<tr>
<td class="block-data">
<br />
<br />
<strong><inp2:m_Phrase label="lu_unsubscribe_confirm" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_unsubscribe_confirm_prompt" />
<br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
- <input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" name="events[u][OnSubscribeUser]" type="submit" style="width: 80px;" value="<inp2:m_Phrase label="lu_comm_Yes" no_editing="1"/>" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_Cancel" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
<input type="hidden" name="unsubscribe_ok_template" value="platform/my_account/unsubscribe_ok"/>
<input type="hidden" name="unsubscribe_fail_template" value="platform/my_account/unsubscribe_fail"/>
</form>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/recommend_site.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/recommend_site.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/recommend_site.tpl (revision 12319)
@@ -1,18 +1,18 @@
<table border="0" cellspacing="0" cellpadding="0" class="block">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_RecommendToFriend"/></td>
</tr>
<tr>
<td class="block-data-big"><inp2:m_Phrase label="lu_EnterEmailToRecommend"/><br />
<form method="POST" action="<inp2:m_FormAction />">
<input type="text" name="friend_email" value="" />
<br /><img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
<inp2:m_if check="u_HasError" field="any">
<span class="error"><inp2:u_Error field="Email"/></span><br />
</inp2:m_if>
- <input class="button" name="events[u][OnRecommend]" type="submit" value="<inp2:m_Phrase label="lu_comm_Recommend"/>" />
+ <input class="button" name="events[u][OnRecommend]" type="submit" value="<inp2:m_Phrase label="lu_comm_Recommend" no_editing="1"/>" />
<input type="hidden" name="template_success" value="platform/my_account/recommend.tpl" />
</form>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/toolbar.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/toolbar.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/toolbar.tpl (revision 12319)
@@ -1,24 +1,24 @@
<table class="toolbar-block">
<tr>
<td class="toolbar"> <strong><inp2:m_Phrase label="lu_QuickSearch"/>:</strong>
<form method="get" action="<inp2:m_link template="in-commerce/store/search_results" />">
<inp2:m_GetFormHiddens template="in-commerce/store/search_results"/>
<input type="text" name="keywords" id="keywords" style="width: 150px" value="" />&nbsp;
- <input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go"/>!" />
+ <input class="button" type="submit" style="width: 40px;" value="<inp2:m_Phrase label="lu_comm_Go" no_editing="1"/>!" />
</form>
<strong>&nbsp;&nbsp;<a href="<inp2:m_Link template="in-commerce/store/advanced_search" />" class="toolbar"><inp2:m_Phrase label="lu_AdvancedSearch"/></a></strong>
</td>
<td align="right" class="toolbar">
<strong>
<a href="<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>" class="toolbar"><inp2:m_Phrase label="lu_Home"/></a> |
<a href="<inp2:m_Link template="in-commerce/my_account/account"/>" class="toolbar"><inp2:m_Phrase label="lu_YourAccount"/></a> |
<a href="<inp2:m_Link template="in-commerce/my_account/wishlist"/>" class="toolbar"><inp2:m_Phrase label="lu_YourWishList"/></a> |
<a href="<inp2:m_Link template="in-commerce/checkout/shop_cart"/>" class="toolbar"><inp2:m_Phrase label="lu_ShoppingCart"/></a> |
<a href="<inp2:m_Link template="in-commerce/store/contact_info" />" class="toolbar"><inp2:m_Phrase label="lu_ContactUs"/></a>
<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
<inp2:m_include template="in-edit/blocks/dmenu"/>
</inp2:m_if>
</strong>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_confirm.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_confirm.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_confirm.tpl (revision 12319)
@@ -1,27 +1,27 @@
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_ForgotPassword"/></td>
</tr>
<tr>
<td class="block-data-single">
<form method="POST" action="<inp2:m_FormAction />">
<strong><inp2:m_Phrase label="lu_title_ConfirmPasswordReset"/></strong>
<br/><br/>
<inp2:m_Phrase label="lu_text_ConfirmPasswordReset"/>
<br /><br />
- <input type="submit" name="events[u][OnResetPassword]" value="<inp2:m_Phrase label="lu_comm_Ok"/>" class="button" />
+ <input type="submit" name="events[u][OnResetPassword]" value="<inp2:m_Phrase label="lu_comm_Ok" no_editing="1"/>" class="button" />
<input type="hidden" name="template_success" value="index" />
</form>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/form_phrase.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/form_phrase.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/form_phrase.tpl (revision 12319)
@@ -1,87 +1,87 @@
<inp2:m_DefineElement name="option_element">
<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">
Missing phrase adding
</td>
</tr>
<tr>
<td class="block-data">
<br/>
<inp2:m_if check="phrases_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">Warning</span><br />
There is a problem with the form, please check the error messages below.
</td>
</tr>
</table>
</inp2:m_if>
<strong>* Indicates Required fields.</strong> <br /><br />
<table class="form-data">
<tr>
<td>
<strong><inp2:m_phrase label="lu_fld_primary_translation"/>:</strong>
</td>
<td>
<inp2:phrases_Field name="PrimaryTranslation"/>
</td>
<td width="170" class="error">&nbsp;</td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_fld_phrase"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:phrases_InputName field="Phrase"/>" value="<inp2:phrases_Field name="Phrase"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:phrases_Error field="Phrase"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_fld_translation"/>:</strong>
</td>
<td>
<input type="text" name="<inp2:phrases_InputName field="Translation"/>" value="<inp2:phrases_Field name="Translation"/>" style="width: 300px;" />
</td>
<td width="170" class="error"><inp2:phrases_Error field="Translation"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_phrase label="lu_fld_module"/>:</strong>
</td>
<td>
<select name="<inp2:phrases_InputName field="Module"/>" style="width: 300px;">
<inp2:phrases_PredefinedOptions field="Module" render_as="option_element" selected_param="selected" selected="selected=\"selected\""/>
</select>
</td>
<td class="error"><inp2:phrases_Error field="Module"/></td>
</tr>
<tr>
<td colspan="3" valign="bottom" height="35">
<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get var="phrases_label"/>" />
<input type="hidden" name="<inp2:phrases_InputName field="LanguageId"/>" value="<inp2:phrases_Field name="LanguageId"/>" />
<input type="hidden" name="<inp2:phrases_InputName field="PhraseType"/>" value="0" />
- <input class="button" type="submit" id="events[phrases][OnCreate]" name="events[phrases][OnCreate]" value="<inp2:m_Phrase label="lu_comm_Create"/>"/>
+ <input class="button" type="submit" id="events[phrases][OnCreate]" name="events[phrases][OnCreate]" value="<inp2:m_Phrase label="lu_comm_Create" no_editing="1"/>"/>
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/login.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/login.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/login.tpl (revision 12319)
@@ -1,43 +1,43 @@
<table border="0" cellspacing="0" cellpadding="0" class="block">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_Login"/></td>
</tr>
<tr>
<td class="block-data-big">
<inp2:m_if check="m_LoggedIn">
<inp2:m_Phrase label="lu_comm_Welcome"/>, <inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/><br/>
<img src="img/s.gif" alt="" width="5" height="5" border="0" /><br />
<a href="<inp2:u_LogoutLink/>"><inp2:m_Phrase label="lu_comm_Logout"/></a>
<inp2:m_else/>
<form method="POST" action="<inp2:m_FormAction />">
<inp2:m_if check="u_UseUsernames">
<inp2:m_phrase label="lu_username"/><br />
<input type="text" name="login" />
<inp2:m_else/>
<inp2:m_phrase label="lu_email"/><br />
<input type="text" name="email" />
</inp2:m_if>
<br />
<inp2:m_Phrase label="lu_Password"/><br />
<input type="password" name="password" />
<br /><img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
- <input class="button" name="events[u][OnLogin]" type="submit" style="width: 70px;" value="<inp2:m_Phrase label="lu_comm_Login"/>" /><br />
+ <input class="button" name="events[u][OnLogin]" type="submit" style="width: 70px;" value="<inp2:m_Phrase label="lu_comm_Login" no_editing="1"/>" /><br />
<img src="img/s.gif" alt="" width="5" height="5" border="0" /><br />
<inp2:m_if check="u_HasError" field="any">
<span class="error"><inp2:u_Error field="ValidateLogin"/></span><br />
</inp2:m_if>
<inp2:m_if check="u_RegistrationEnabled">
<a href="<inp2:m_Link template="platform/login/register"/>"><inp2:m_Phrase label="lu_Register"/></a><br />
</inp2:m_if>
<a href="<inp2:m_Link template="platform/login/forgotpass" />"><inp2:m_Phrase label="lu_ForgotPassword"/>?</a>
<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="pending_disabled_template" value="platform/login/login_pending_disabled" />
</form>
</inp2:m_if>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_form.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_form.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/forgotpass_form.tpl (revision 12319)
@@ -1,66 +1,66 @@
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_ForgotPassword"/></td>
</tr>
<tr>
<td class="block-data-single">
<form method="POST" action="<inp2:m_FormAction />">
<table class="form-data">
<inp2:m_if check="conf_ConfigValue" name="Email_As_Login">
<tr>
<td colspan="3"><inp2:m_Phrase label="lu_EnterForgotEmail"/><br/><br/></td>
</tr>
<inp2:m_else/>
<tr>
<td colspan="3"><inp2:m_Phrase label="lu_EnterForgotUserEmail"/></td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_Username"/>:</strong></td>
<td><input type="text" name="username"/></td>
<td>
<inp2:m_if check="u_HasError" field="any">
<br />
<span class="error"><inp2:u_Error field="Login"/></span>
</inp2:m_if>
</td>
</tr>
<td><strong><inp2:m_Phrase label="lu_Or"/></strong></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</inp2:m_if>
<tr>
<td><strong><inp2:m_Phrase label="lu_Email"/>:</strong></td>
<td><input type="text" name="email"/></td>
<td>
<inp2:m_if check="u_HasError" field="any">
<br />
<span class="error"><inp2:u_Error field="Email"/></span>
</inp2:m_if>
</td>
</tr>
<tr>
<td>&nbsp;</td>
- <td><input type="submit" value="<inp2:m_Phrase label="lu_comm_SendPassword"/>" name="events[u][OnForgotPassword]" class="button" /> <input type="button" class="button" onclick="window.location.href = '<inp2:m_Link template="index"/>';" value="<inp2:m_phrase label="lu_Cancel"/>"></td>
+ <td><input type="submit" value="<inp2:m_Phrase label="lu_comm_SendPassword" no_editing="1"/>" name="events[u][OnForgotPassword]" class="button" /> <input type="button" class="button" onclick="window.location.href = '<inp2:m_Link template="index"/>';" value="<inp2:m_phrase label="lu_Cancel"/>"></td>
<td>&nbsp;</td>
</tr>
</table>
<input type="hidden" name="template_success" value="index" />
<input type="hidden" name="reset_confirm_template" value="platform/login/forgotpass_reset" />
</form>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_ok.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_ok.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/subscribe_ok.tpl (revision 12319)
@@ -1,22 +1,22 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_subscribe_title" /></td>
</tr>
<tr>
<td class="block-data">
<br />
<br />
<strong><inp2:m_Phrase label="lu_subscribe_confirm" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_ThankForSubscribing"/>!
<br />
<br />
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/mailing_list.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/mailing_list.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/mailing_list.tpl (revision 12319)
@@ -1,24 +1,24 @@
<table class="block">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_MailingList"/></td>
</tr>
<tr>
<td class="block-data-big">
<form method="POST" action="<inp2:m_FormAction />" name="mailing_list_form">
<inp2:m_Phrase label="lu_EnterEmailToSubscribe"/><br />
<input type="text" name="subscriber_email" />
<br /><img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
<inp2:m_if check="u_HasError" field="any">
<span class="error"><inp2:u_Error field="SubscribeEmail"/></span><br />
</inp2:m_if>
- <input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_comm_Subscribe"/>" />
+ <input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_comm_Subscribe" no_editing="1"/>" />
<input class="button" name="events[u][OnSubscribeQuery]" type="submit" value="<inp2:m_Phrase label="lu_comm_Unsubscribe" />" />
&nbsp;
<input type="text" style="display: none" />
<input type="hidden" name="subscribe_template" value="platform/my_account/subscribe"/>
<input type="hidden" name="unsubscribe_template" value="platform/my_account/unsubscribe"/>
</form>
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_ok.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_ok.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/common/unsubscribe_ok.tpl (revision 12319)
@@ -1,22 +1,22 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_unsubscribe_title" /></td>
</tr>
<tr>
<td class="block-data">
<br />
<br />
<strong><inp2:m_Phrase label="lu_unsubscribe_confirm" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_TextUnsubscribe"/>
<br />
<br />
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_comm_Ok" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="index"/>'" />&nbsp;
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/platform/blocks/login/form_register.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/platform/blocks/login/form_register.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/platform/blocks/login/form_register.tpl (revision 12319)
@@ -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>
</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">&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"/>" />
+ <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/5.0.x/themes/onlinestore/in-commerce/my_account/cancel_recurring.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/my_account/cancel_recurring.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/my_account/cancel_recurring.tpl (revision 12319)
@@ -1,53 +1,53 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><inp2:conf_ConfigValue name="Site_Name"/> :: <inp2:m_Phrase label="lu_comm_MyAccount"/></title>
<inp2:m_include template="platform/blocks/common/html_head" />
</head>
<body>
<inp2:m_include template="platform/blocks/common/header" />
<inp2:m_include template="platform/blocks/common/toolbar" />
<table class="main-table">
<tr>
<td class="main-column-center" valign="top">
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_CancelRecurring_title" /></td>
</tr>
<tr>
<td class="block-data">
<br />
<strong><inp2:m_Phrase label="lu_CancelRecurring_confirm" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_CancelRecurring_confirm_prompt" />
<br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
- <input class="button" name="events[ord][OnCancelRecurring]" type="submit" value="<inp2:m_Phrase label="lu_comm_Yes"/>" />&nbsp;
- <input class="button" type="button" value="<inp2:m_Phrase label="lu_No"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account"/>'" />&nbsp;
+ <input class="button" name="events[ord][OnCancelRecurring]" type="submit" value="<inp2:m_Phrase label="lu_comm_Yes" no_editing="1"/>" />&nbsp;
+ <input class="button" type="button" value="<inp2:m_Phrase label="lu_No" no_editing="1"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account"/>'" />&nbsp;
<input type="hidden" name="cancelrecurring_ok_template" value="in-commerce/my_account/cancel_recurring_ok"/>
</form>
</td>
</tr>
</table>
</td>
<td class="main-column-right" valign="top">
</td>
</tr>
</table>
<inp2:m_include template="platform/blocks/common/footer" />
<inp2:m_include template="platform/blocks/common/copyright" />
</body>
</html>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate_payment_type.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate_payment_type.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate_payment_type.tpl (revision 12319)
@@ -1,71 +1,71 @@
<form method="POST" enctype="multipart/form-data" action="<inp2:m_FormAction />">
<table class="block-no-border">
<tr>
<td class="block-header" colspan="3"><inp2:m_Phrase label="lu_comm_AffiliatePaymentType"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_CurrentAffiliatePaymentType" />:</strong>
</td>
<td class="block-data" colspan="2">
<inp2:u_AffiliateField name="PaymentTypeId" />
</td>
</tr>
<tr>
<td class="block-data" colspan="3">
<inp2:m_Phrase label="lu_comm_ChangeAffiliatePaymentTypeDescription"/>
</td>
</tr>
<inp2:m_DefineElement name="affiliate_payment_type_elem">
<tr>
<td style="padding: 3px">
<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 style="padding: 3px">
<label for="PaymentTypeId_<inp2:Field name="PaymentTypeId" />"><inp2:Field name="Name" /></label>
</td>
</tr>
<inp2:m_if check="Field" name="Description">
<tr>
<td style="padding: 3px">&nbsp;</td>
<td style="padding: 3px"><inp2:Field name="Description" />&nbsp;</td>
</tr>
</inp2:m_if>
</inp2:m_DefineElement>
<tr>
<td style="vertical-align: top;" class="block-data">
<strong><inp2:m_phrase label="lu_comm_ChooseAffiliatePaymentType"/>:</strong>
</td>
<td class="block-data" style="padding-bottom: 0px">
<table class="block-no-border">
<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_elem" />
<tr><td colspan="2" style="padding: 0px">&nbsp;</td></tr>
</table>
</td>
<td class="error">&nbsp;</td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_phrase label="lu_comm_Comments"/>:</strong>
</td>
<td class="block-data">
<textarea name="Comments" id="Comments" cols="35" rows="5"><inp2:u_AffiliateField name="Comments" /></textarea>
</td>
<td class="error">&nbsp;</td>
</tr>
<tr>
<td class="block-data" colspan="2" style="padding-top: 0px">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate_payment_type_changed" />
- <input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_comm_ChangePaymentType"/>" />
+ <input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_comm_ChangePaymentType" no_editing="1"/>" />
</td>
<td class="error">&nbsp;</td>
</tr>
</table>
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/affiliate.tpl (revision 12319)
@@ -1,158 +1,158 @@
<script language="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>
<inp2:m_if check="u_IsAffiliate">
<table class="block-no-border">
<tr>
<td class="block-header" colspan="2"><inp2:m_Phrase label="lu_comm_AffiliateStatistics"/></td>
</tr>
<inp2:m_if check="u_AffiliateIsNotActive">
<tr>
<td class="block-data" colspan="2">
<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_comm_AffiliateIsPendingOrDisabled"/>
</td>
</tr>
</table>
</td>
</tr>
</inp2:m_if>
<tr>
<td class="block-data">
<a href="<inp2:m_Link template="in-commerce/my_account/affiliate_stat"/>"><strong><inp2:m_Phrase label="lu_comm_AffiliateStat"/></strong></a><br />
<inp2:m_Phrase label="lu_comm_AffiliateStatText"/>
</td>
</tr>
<tr>
<td class="block-data">
<a href="<inp2:m_Link template="in-commerce/my_account/affiliate_payments"/>"><strong><inp2:m_Phrase label="lu_comm_AffiliatePayments"/></strong></a><br />
<inp2:m_Phrase label="lu_comm_AffiliatePaymentsText"/>
</td>
</tr>
<tr>
<td class="block-data">
<a href="<inp2:m_Link template="in-commerce/my_account/affiliate_materials"/>"><strong><inp2:m_Phrase label="lu_comm_AffiliateMaterials"/></strong></a><br />
<inp2:m_Phrase label="lu_comm_AffiliateMaterialsText"/>
</td>
</tr>
<tr>
<td class="block-data">
<a href="<inp2:m_Link template="in-commerce/my_account/affiliate_payment_type"/>"><strong><inp2:m_Phrase label="lu_comm_ChangeAffiliatePaymentType"/></strong></a><br />
<inp2:m_Phrase label="lu_comm_ChangeAffiliatePaymentTypeText"/>
</td>
</tr>
<tr>
<td class="block-data">
<a href="javascript:showAffiliateAgreement()"><strong><inp2:m_Phrase label="lu_comm_TermsAndConditionsLink"/></strong></a><br />
<inp2:m_Phrase label="lu_comm_TermsAndConditionsText"/>
</td>
</tr>
</table>
<inp2:m_else />
<form method="POST" enctype="multipart/form-data" action="<inp2:m_FormAction />">
<table class="block-no-border">
<tr>
<td class="block-header" colspan="3"><inp2:m_Phrase label="lu_comm_AffiliateRegistration"/></td>
</tr>
<tr>
<td class="block-data" colspan="3"><inp2:m_Phrase label="lu_comm_BecomeAnAffiliateDescription"/></td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_phrase label="lu_comm_SSNField"/>*:</strong>
</td>
<td class="block-data">
<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 style="padding: 3px">
<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 style="padding: 3px">
<label for="PaymentTypeId_<inp2:Field name="PaymentTypeId" />"><inp2:Field name="Name" /></label>
</td>
</tr>
<inp2:m_if check="Field" name="Description">
<tr>
<td style="padding: 3px">&nbsp;</td>
<td style="padding: 3px"><inp2:Field name="Description" />&nbsp;</td>
</tr>
</inp2:m_if>
</inp2:m_DefineElement>
<tr>
<td style="vertical-align: top;" class="block-data">
<strong><inp2:m_phrase label="lu_comm_ChooseAffiliatePaymentType"/>:</strong>
</td>
<td class="block-data">
<table class="block-no-border">
<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_elem" />
<tr><td colspan="2" style="padding: 0px">&nbsp;</td></tr>
</table>
</td>
<td class="error">&nbsp;</td>
</tr>
<tr>
<td class="block-data">
<strong><inp2:m_phrase label="lu_comm_Comments"/>:</strong>
</td>
<td class="block-data">
<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" class="block-data">
<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>
<tr>
<td class="block-data" colspan="2" style="padding-top: 0px">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate_thankyou" />
- <input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate"/>" />
+ <input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate" no_editing="1"/>" />
</td>
<td class="error">&nbsp;</td>
</tr>
</table>
</form>
</inp2:m_if>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/my_profile.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/my_profile.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/my_account/my_profile.tpl (revision 12319)
@@ -1,194 +1,194 @@
<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_PersonalInfo"/>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Password"/>:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_VerifyPassword"/>:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Phone"/>:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Fax"/>:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_BirthDate"/> *:</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 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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_Email"/> *:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 1:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_comm_AddressLine"/> 2:</strong>
</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>
<td class="block-data">
<strong><inp2:m_Phrase label="lu_City"/>:</strong>
</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>
<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 class="block-data">
<strong><inp2:m_Phrase label="lu_comm_ZipCode"/>:</strong>
</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>
<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 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"/>"/>
+ <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>
</table>
</td>
</tr>
</table>
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_review_product.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_review_product.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_review_product.tpl (revision 12319)
@@ -1,90 +1,90 @@
<inp2:m_DefineElement name="product_star_on">
<img src="img/star_rate.gif" alt="">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_image">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
</inp2:m_DefineElement>
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_ReviewProduct"/></td>
</tr>
<tr>
<td class="block-data-single">
<table>
<tr>
<td width="16%" align="center" valign="top" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="in-commerce/img/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" /></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>" class="link-product2"><strong><inp2:m_Phrase label="lu_comm_BuyNow"/></strong></a>
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" vspace="4" style="vertical-align:middle" /></a>
<inp2:m_else />
<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
</inp2:m_if>
</td>
<td width="84%" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>" class="link-product2"><strong><inp2:p_Field field="Name" /></strong></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
</inp2:m_if>
<br />
<inp2:m_if check="p_Field" name="MSRP"><strong><inp2:m_Phrase label="lu_comm_MSRP"/>:</strong> <span class="price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br /> </inp2:m_if>
<strong><inp2:m_Phrase label="lu_comm_OurPrice"/>:</strong> <span class="price1"><inp2:p_Field name="Price" currency="selected"/></span> <br />
<strong><inp2:m_Phrase label="lu_comm_Description"/>:</strong> <inp2:p_Field name="DescriptionExcerpt"/><br />
<br />
<inp2:m_if check="p_AlreadyReviewed">
<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_comm_ErrorAlreadyReviewed"/>.
</td>
</tr>
</table>
<table>
<inp2:m_DefineElement name="review_row">
<td>
<strong><inp2:m_Phrase label="lu_comm_ReviewBy"/> <inp2:Field name="ReviewedBy"/></strong>, <inp2:Field name="CreatedOn" format="_regional_DateFormat"/><br />
<br />
<inp2:field field="ReviewText"/><br />
<hr />
</td>
</inp2:m_DefineElement>
<inp2:p_ListReviews type="current_user" render_as="review_row" per_page="-1" main_special=""/>
</table>
<inp2:m_else />
<inp2:m_if check="rev.product_HasError" field="ReviewText">
<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:rev.product_Error field="ReviewText" />
</td>
</tr>
</table>
</inp2:m_if>
<form method="POST" action="<inp2:m_FormAction />">
<strong><inp2:m_Phrase label="lu_comm_YourReviewText"/>:</strong><br />
<textarea name="<inp2:rev.product_InputName field="ReviewText"/>" cols="60" rows="15"><inp2:rev.product_field field="ReviewText"/></textarea><br />
<br />
<input type="hidden" name="success_template" value="__default__" />
<input type="hidden" name="cancel_template" value="__default__" />
- <input type="submit" name="events[rev.product][OnAddReview]" class="button" value="<inp2:m_phrase label="lu_add_review"/>">
- <input type="submit" name="events[p][OnCancelAction]" class="button" value="<inp2:m_phrase label="lu_Cancel"/>">
+ <input type="submit" name="events[rev.product][OnAddReview]" class="button" value="<inp2:m_Phrase label="lu_add_review" no_editing="1"/>">
+ <input type="submit" name="events[p][OnCancelAction]" class="button" value="<inp2:m_Phrase label="lu_Cancel" no_editing="1"/>">
</form>
</inp2:m_if>
</td>
</tr>
</table>
<br />
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_recommend_product.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_recommend_product.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_recommend_product.tpl (revision 12319)
@@ -1,93 +1,93 @@
<inp2:m_DefineElement name="product_image">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
</inp2:m_DefineElement>
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_RecommendThisProduct"/></td>
</tr>
<tr>
<td class="block-data-single">
<table>
<tr>
<td width="16%" align="center" valign="top" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="in-commerce/img/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" /></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>" class="link-product2"><strong><inp2:m_Phrase label="lu_comm_BuyNow"/></strong></a>
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" vspace="4" style="vertical-align:middle" /></a>
<inp2:m_else />
<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
</inp2:m_if>
</td>
<td width="84%" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>" class="link-product2"><strong><inp2:p_Field field="Name" /></strong></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
</inp2:m_if>
<br />
<inp2:m_if check="p_Field" name="MSRP"><strong><inp2:m_Phrase label="lu_comm_MSRP"/>:</strong> <span class="price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br /> </inp2:m_if>
<strong><inp2:m_Phrase label="lu_comm_OurPrice"/>:</strong> <span class="price1"><inp2:p_Field name="Price" currency="selected"/></span> <br />
<strong><inp2:m_Phrase label="lu_comm_Description"/>:</strong> <inp2:p_Field name="DescriptionExcerpt"/><br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
<table class="form-data">
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FriendName"/>:</strong></td>
<td><input type="text" name="friend_name"/></td>
<td>&nbsp;</td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_FriendEmail"/> *:</strong></td>
<td><input type="text" name="friend_email"/></td>
<td>
<inp2:m_if check="u_HasError" field="any">
<br />
<span class="error"><inp2:u_Error field="Email" /></span>
</inp2:m_if>
</td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_YourName"/>: </strong></td>
<td><input type="text" name="your_name" value="<inp2:u_Field name="FirstName" /> <inp2:u_Field name="LastName" />"/></td>
<td>&nbsp;</td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_YourEmail"/>:</strong></td>
<td><input type="text" name="your_email" value="<inp2:u_Field name="Email" />"/></td>
<td>&nbsp;</td>
</tr>
<tr>
<td><strong><inp2:m_Phrase label="lu_comm_Message"/>:</strong></td>
<td><textarea name="your_message" style="width: 300px; height: 150px"><inp2:m_Phrase label="lu_recommend_default_text" /></textarea></td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
- <td><input type="submit" value="<inp2:m_Phrase label="lu_RecommendToFriend" />" name="events[p][OnRecommendProduct]" class="button" /> <input type="button" class="button" onclick="history.go(-1)" value="<inp2:m_phrase label="lu_Cancel"/>"></td>
+ <td><input type="submit" value="<inp2:m_Phrase label="lu_RecommendToFriend" />" name="events[p][OnRecommendProduct]" class="button" /> <input type="button" class="button" onclick="history.go(-1)" value="<inp2:m_phrase label="lu_Cancel" no_editing="1"/>"></td>
<td>&nbsp;</td>
</tr>
</table>
<input type="hidden" name="template_success" value="in-commerce/product/confirm_recommend.tpl" />
</form>
</td>
</tr>
</table>
<br />
</td>
</tr>
</table>
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_recent.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_recent.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_recent.tpl (revision 12319)
@@ -1,32 +1,32 @@
<inp2:p_InitList list_name="list_recent" types="recent" parent_cat_id="any" recursive="true" per_page="short_list" except="in_cart" />
<table class="block">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_RecentlyViewed"/></td>
</tr>
<tr>
<td class="block-data-big">
<table>
<inp2:m_DefineElement name="recent_product">
<td>
<a href="<inp2:ProductLink template="__default__"/>"><strong><inp2:Field field="Name" /></strong></a><br />
<inp2:Field field="DescriptionExcerpt" first_chars="70" /><br />
<span class="price"><strong><inp2:Field name="Price" currency="selected" /></strong></span><br />
<br />
</td>
</inp2:m_DefineElement>
<inp2:p_ListProducts list_name="list_recent" render_as="recent_product" columns="1" />
</table>
<inp2:m_DefineElement name="more_link">
<a href="<inp2:m_Link template="in-commerce/store/recent" />"><inp2:m_Phrase label="lu_comm_MoreLink"/>...</a><br />
</inp2:m_DefineElement>
<inp2:p_MoreLink list_name="list_recent" render_as="more_link" />
<img src="img/s.gif" alt="" width="5" height="10" border="0" /><br />
<form method="post" action="<inp2:m_FormAction />">
- <input class="button" type="submit" name="events[p][OnClearRecent]" value="<inp2:m_Phrase label="lu_comm_Clear"/>"/>
+ <input class="button" type="submit" name="events[p][OnClearRecent]" value="<inp2:m_Phrase label="lu_comm_Clear" no_editing="1"/>"/>
</form>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_sorting.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_sorting.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_sorting.tpl (revision 12319)
@@ -1,16 +1,16 @@
<form method="post" action="<inp2:m_FormAction />">
<strong><inp2:m_Phrase label="lu_comm_SortBy"/></strong>
<select name="<inp2:p_CombinedSortingDropDownName/>">
<option value="Name|asc" <inp2:p_SortingSelected sorting="l1_Name|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameAZ"/></option>
<option value="Name|desc" <inp2:p_SortingSelected sorting="l1_Name|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_NameZA"/></option>
<option value="Manufacturer|asc" <inp2:p_SortingSelected sorting="Manufacturer|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufAZ"/></option>
<option value="Manufacturer|desc" <inp2:p_SortingSelected sorting="Manufacturer|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_ManufZA"/></option>
<option value="Price|asc" <inp2:p_SortingSelected sorting="Price|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceLH"/></option>
<option value="Price|desc" <inp2:p_SortingSelected sorting="Price|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_PriceHL"/></option>
<option value="CreatedOn|asc" <inp2:p_SortingSelected sorting="CreatedOn|asc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_RecentToOld"/></option>
<option value="CreatedOn|desc" <inp2:p_SortingSelected sorting="CreatedOn|desc" selected='selected="selected"'/>> <inp2:m_Phrase label="lu_comm_OldToRecent"/></option>
</select>
- <input type="submit" class="button" name="<inp2:p_SubmitName event="OnSetSortingDirect"/>" value="<inp2:m_Phrase label="lu_comm_Sort"/>" />
+ <input type="submit" class="button" name="<inp2:p_SubmitName event="OnSetSortingDirect"/>" value="<inp2:m_Phrase label="lu_comm_Sort" no_editing="1"/>" />
</form>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_search_results.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_search_results.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/products_search_results.tpl (revision 12319)
@@ -1,143 +1,143 @@
<inp2:m_DefineElement name="product_image">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" style="margin: 2px;"/><br/>
</inp2:m_DefineElement>
<inp2:p_InitList list_name="search_results" types="search" parent_cat_id="any" recursive="true" per_page="default" />
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_SearchResults"/> (<inp2:p_TotalRecords list_name="search_results" />)</td>
</tr>
<tr>
<td class="block-data">
<span style="text-align: center">
<form name="subsearch_form" id="subsearch_form" method="POST" action="<inp2:m_link template="in-commerce/store/search_results" />">
<input type="text" name="keywords" id="keywords" style="width: 300px" value="<inp2:p_SearchKeywords />" />&nbsp;
<input type="hidden" name="search_type" value="subsearch" />
- <input class="button" type="submit" value="<inp2:m_Phrase label="lu_comm_SearchInResults"/>" />
+ <input class="button" type="submit" value="<inp2:m_Phrase label="lu_comm_SearchInResults" no_editing="1"/>" />
</form>
</span>
<br/>
<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
<inp2:m_include template="in-edit/blocks/search_short_results"/>
</inp2:m_if>
<inp2:m_if check="p_TotalRecords" list_name="search_results">
<br />
<table>
<tr>
<td style="width: 300px">
<inp2:m_include template="in-commerce/blocks/products/products_sorting" list_name="search_results" />
</td>
<td style="text-align: center;">
<inp2:m_include template="in-commerce/blocks/products/products_pagination" list_name="search_results" />
</td>
</tr>
</table>
<br />
<table>
<inp2:m_DefineElement name="product_row_start">
<tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_search_relevance_normal">
<small><inp2:m_Phrase label="lu_comm_Relevance"/>:</small><br/>
<table class="relevance-bar" width="70" height="5" align="right">
<tr>
<td width="<inp2:m_param name="percent_on" />%" bgcolor="<inp2:m_param name="on_color" />"><img src="img/s.gif"></td>
<td width="<inp2:m_param name="percent_off" />%" bgcolor="<inp2:m_param name="off_color" />"><img src="img/s.gif"></td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_search_relevance_full">
<small>Relevance:</small><br/>
<table class="relevance-bar" width="70" height="5" align="right">
<tr>
<td width="100%" bgcolor="<inp2:m_param name="on_color" />"><img src="img/s.gif"></td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_search_highlight_opening"><span style="background: yellow"></inp2:m_DefineElement>
<inp2:m_DefineElement name="product_search_highlight_closing"></span></inp2:m_DefineElement>
<inp2:m_DefineElement name="product_elem">
<td width="16%" align="center" valign="top" class="block-data">
<inp2:RelevanceIndicator on_color="Red" off_color="White" relevance_normal_render_as="product_search_relevance_normal" relevance_full_render_as="product_search_relevance_full" /><br/>
<a href="<inp2:ProductLink template="__default__"/>"><inp2:Image render_as="product_image" thumbnail="1" DefaultImage="in-commerce/img/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" /></a>
</td>
<td width="84%" class="block-data">
<a href="<inp2:ProductLink template="__default__"/>" class="link-product2"><strong><inp2:SearchResultField field="Name" highlight_opening_render_as="product_search_highlight_opening" highlight_closing_render_as="product_search_highlight_closing" /></strong></a>
<inp2:m_if check="Available">
<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
</inp2:m_if>
<br />
<inp2:m_if check="Field" name="MSRP"><strong><inp2:m_Phrase label="lu_comm_MSRP"/>:</strong> <span class="price-msrp"><inp2:Field name="MSRP" currency="selected"/></span> <br /> </inp2:m_if>
<strong><inp2:m_Phrase label="lu_comm_OurPrice"/>:</strong> <span class="price1"><inp2:Field name="Price" currency="selected"/></span> <br />
<strong><inp2:m_Phrase label="lu_comm_Description"/>:</strong> <inp2:SearchResultField field="DescriptionExcerpt" highlight_opening_render_as="product_search_highlight_opening" highlight_closing_render_as="product_search_highlight_closing" />
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_row_end">
</tr>
<inp2:m_if check="NotLastItem">
<tr>
<td colspan="2" style="background: #CCCCCC; height: 1px; padding: 0px"><img src="img/s.gif" alt="" width="1" height="1" /></td>
</tr>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:p_ListProducts list_name="search_results" columns="1" direction="V" render_as="product_elem" row_start_render_as="product_row_start" row_end_render_as="product_row_end" empty_cell_render_as="product_empty_cell" />
</table>
<inp2:m_else />
<inp2:m_DefineElement name="product_keywords_too_short">
<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_comm_KeywordsTooShort"/>!!!
</td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_no_found">
<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_comm_NoProductsFound"/>!
</td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="adv_search_error">
<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_comm_NoCriteriaEntered"/>
</td>
</tr>
</table>
</inp2:m_DefineElement>
<tr>
<td>
<inp2:p_ErrorMessage keywords_too_short_render_as="product_keywords_too_short" adv_search_error_render_as="adv_search_error" no_found_render_as="product_no_found" /><br />
<inp2:m_Phrase label="lu_comm_TryRecomendedProductd"/>.
<br /><br />
<inp2:m_include template="in-commerce/blocks/products/products_picks" />
</td>
</tr>
</inp2:m_if>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_advanced_search.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_advanced_search.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_advanced_search.tpl (revision 12319)
@@ -1,107 +1,107 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_AdvancedSearch"/></td>
</tr>
<tr>
<td class="block-data">
<form method="POST" enctype="multipart/form-data" action="<inp2:m_link template="in-commerce/store/search_results" search_type="advanced" />">
<table class="adv-search-form">
<inp2:m_DefineElement name="adv_search_text">
<tr>
<td>
<strong><inp2:m_param name="caption" /></strong>
</td>
<td style="text-align: center">
<nobr>
<select name="verb[<inp2:m_param name="field" />]">
<option value="contains"><inp2:m_Phrase label="lu_comm_Contains"/></option>
<option value="notcontains"><inp2:m_Phrase label="lu_comm_DoesntContain"/></option>
<option value="is"><inp2:m_Phrase label="lu_comm_ExactlyIs"/></option>
<option value="isnot"><inp2:m_Phrase label="lu_comm_IsNot"/></option>
</select>
&nbsp;&nbsp;
<input type="text" name="value[<inp2:m_param name="field" />]">
</nobr>
</td>
<td style="text-align: right">
&nbsp;<inp2:m_param name="andor" />&nbsp;
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="adv_search_boolean">
<tr>
<td>
<strong><inp2:m_param name="caption" /></strong>
</td>
<td style="text-align: center">
<input type="radio" name="value[<inp2:m_param name="field" />]" id="value[<inp2:m_param name="field" />]_true" value="1">
<label for="value[<inp2:m_param name="field" />]_true"><inp2:m_Phrase label="lu_comm_Yes"/></label>
&nbsp;
<input type="radio" name="value[<inp2:m_param name="field" />]" id="value[<inp2:m_param name="field" />]_false" value="0">
<label for="value[<inp2:m_param name="field" />]_false"><inp2:m_Phrase label="lu_comm_No"/></label>
&nbsp;
<input type="radio" name="value[<inp2:m_param name="field" />]" id="value[<inp2:m_param name="field" />]_any" value="-1" checked>
<label for="value[<inp2:m_param name="field" />]_any"><inp2:m_Phrase label="lu_comm_Both"/></label>
</td>
<td style="text-align: right">
&nbsp;<inp2:m_param name="andor" />&nbsp;
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="adv_search_range">
<tr>
<td>
<strong><inp2:m_param name="caption" /></strong>
</td>
<td style="text-align: center">
<nobr><inp2:m_Phrase label="lu_comm_From"/>: <input type="text" name="value[<inp2:m_param name="field" />_from]" style="width:60px">&nbsp;&nbsp;
<inp2:m_Phrase label="lu_comm_To"/>: <input type="text" name="value[<inp2:m_param name="field" />_to]" style="width:60px"></nobr>
</td>
<td style="text-align: right">
&nbsp;<inp2:m_param name="andor" />&nbsp;
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="adv_search_date">
<tr>
<td>
<strong><inp2:m_param name="caption" /></strong>
</td>
<td style="text-align: center">
<select name="value[<inp2:m_param name="field" />]">
<option value="0" selected><inp2:m_Phrase label="lu_comm_Any"/></option>
<option value="today"><inp2:m_Phrase label="lu_comm_Today"/></option>
<option value="yesterday"><inp2:m_Phrase label="lu_comm_Yesterday"/></option>
<option value="last_week"><inp2:m_Phrase label="lu_comm_LastWeek"/></option>
<option value="last_month"><inp2:m_Phrase label="lu_comm_LastMonth"/></option>
<option value="last_3_months"><inp2:m_Phrase label="lu_comm_Last3Months"/></option>
<option value="last_6_months"><inp2:m_Phrase label="lu_comm_Last6Months"/></option>
<option value="last_year"><inp2:m_Phrase label="lu_comm_LastYear"/></option>
</select>
</td>
<td style="text-align: right">
&nbsp;<inp2:m_param name="andor" />&nbsp;
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="adv_search_andor">
<span style="color: #555">
<nobr><input type="radio" id="andor[<inp2:m_param name="field" />]_1" name="andor[<inp2:m_param name="field" />]" value="1" checked>
<label for="andor[<inp2:m_param name="field" />]_1"><inp2:m_Phrase label="lu_comm_And"/></label>
&nbsp;
<input type="radio" id="andor[<inp2:m_param name="field" />]_0" name="andor[<inp2:m_param name="field" />]" value="0">
<label for="andor[<inp2:m_param name="field" />]_0"><inp2:m_Phrase label="lu_comm_Or"/></label></nobr>
</span>
</inp2:m_DefineElement>
<inp2:p_AdvancedSearchForm text_render_as="adv_search_text" boolean_render_as="adv_search_boolean" range_render_as="adv_search_range" date_render_as="adv_search_date" and_or_render_as="adv_search_andor" />
<tr>
<td colspan="3" style="text-align: center">
- <input type="submit" value="<inp2:m_Phrase label="lu_comm_Go"/>!" class="button"><br />
+ <input type="submit" value="<inp2:m_Phrase label="lu_comm_Go" no_editing="1"/>!" class="button"><br />
<br />
</td>
</tr>
</table>
</form>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_rate_product.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_rate_product.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/products/form_rate_product.tpl (revision 12319)
@@ -1,77 +1,77 @@
<inp2:m_DefineElement name="product_image">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
</inp2:m_DefineElement>
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_RateProduct"/></td>
</tr>
<tr>
<td class="block-data-single">
<table>
<tr>
<td width="16%" align="center" valign="top" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="in-commerce/img/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" /></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>" class="link-product2"><strong><inp2:m_Phrase label="lu_comm_BuyNow"/></strong></a>
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" vspace="4" style="vertical-align:middle" /></a>
<inp2:m_else />
<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
</inp2:m_if>
</td>
<td width="84%" class="block-data">
<a href="<inp2:p_ProductLink template="__default__"/>" class="link-product2"><strong><inp2:p_Field field="Name" /></strong></a>
<inp2:m_if check="p_Available">
<a href="<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="in-commerce/img/buy2.gif" alt="" width="15" height="17" border="0" style="vertical-align:middle" /></a>
</inp2:m_if>
<br />
<inp2:m_if check="p_Field" name="MSRP"><strong><inp2:m_Phrase label="lu_comm_MSRP"/>:</strong> <span class="price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br /> </inp2:m_if>
<strong><inp2:m_Phrase label="lu_comm_OurPrice"/>:</strong> <span class="price1"><inp2:p_Field name="Price" currency="selected"/></span> <br />
<strong><inp2:m_Phrase label="lu_comm_Description"/>:</strong> <inp2:p_Field name="DescriptionExcerpt"/><br />
<br />
<inp2:m_if check="p_HasError" field="CachedRating">
<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:p_Error field="CachedRating" />
</td>
</tr>
</table>
</inp2:m_if>
<strong><inp2:m_Phrase label="lu_comm_RateThisProduct"/></strong>
<form method="POST" action="<inp2:m_FormAction />">
<table style="width: 60%;">
<inp2:m_DefineElement name="product_star_on">
<img src="img/star_rate.gif" alt="" width="11" height="11">
</inp2:m_DefineElement>
<inp2:m_DefineElement name="product_rate_row">
<tr>
<td>&nbsp;</td>
<td>
<input type="radio" name="rating" value="<inp2:m_param name="rating"/>">
<inp2:m_param name="stars"/>
</td>
<td><inp2:m_param name="label"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:p_RateForm render_as="product_rate_row" labels="lu_comm_RateExcellent,lu_comm_RateVeryGood,lu_comm_RateGood,lu_comm_RateAverage,lu_comm_RateFair,lu_comm_RatePoor" star_render_as="product_star_on"/>
</table>
<br />
<input type="hidden" name="success_template" value="__default__" />
<input type="hidden" name="cancel_template" value="__default__" />
- <input type="submit" name="events[p][OnRateProduct]" class="button" value="<inp2:m_phrase label="lu_btn_RateProduct"/>">
- <input type="submit" name="events[p][OnCancelAction]" class="button" value="<inp2:m_phrase label="lu_Cancel"/>">
+ <input type="submit" name="events[p][OnRateProduct]" class="button" value="<inp2:m_Phrase label="lu_btn_RateProduct" no_editing="1"/>">
+ <input type="submit" name="events[p][OnCancelAction]" class="button" value="<inp2:m_Phrase label="lu_Cancel" no_editing="1"/>">
</form>
</td>
</tr>
</table>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shop_cart.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shop_cart.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shop_cart.tpl (revision 12319)
@@ -1,199 +1,199 @@
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_YourCart"/></td>
</tr>
<tr>
<td class="block-data">
<form method="post" action="<inp2:m_FormAction />">
<inp2:m_if check="ord_CartHasError">
<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:ord_CheckoutError state_changed="lu_comm_msg_state_changed" qty_unavailable="lu_comm_msg_qty_unavailable" outofstock="lu_comm_msg_outofstock"
coupon_applied="lu_comm_CouponApplied"
invalid_code="lu_comm_invalid_code" code_expired="lu_comm_code_expired"
min_qty="lu_min_qty_error" code_removed="lu_comm_CouponRemoved"
code_removed_automatically="lu_comm_CouponIsNotEffective"
changed_after_login="lu_comm_CartChangedAfterLogin" />
</td>
</tr>
</table>
</inp2:m_if>
<table>
<inp2:m_DefineElement name="shop_cart_header">
<tr class="cart-header">
<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
<td colspan="2"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
<inp2:m_else/>
<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
</inp2:m_if>
<td><inp2:m_Phrase label="lu_comm_YourPrice"/></td>
<td><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
<td><inp2:m_Phrase label="lu_comm_Total"/></td>
<td>&nbsp;</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_include template="in-commerce/blocks/checkout/options"/>
<inp2:m_DefineElement name="product_image">
<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shop_cart_item">
<tr class="cart-item">
<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
<td width="120">
<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="in-commerce/img/no_picture_list.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
</td>
</inp2:m_if>
<td>
<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a> <inp2:m_if check="ord_BackorderFlag"> <span class="error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
<inp2:m_if check="HasOptions">
<br/>
<span style="font-size: 8pt">
<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
<inp2:PrintOptions render_as="option_element" currency="selected"/>
<inp2:m_else/> <!-- listed combinations -->
<inp2:PrintOptions render_as="option_element_no_price" currency="selected"/>
</inp2:m_if>
<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a>
</inp2:m_if>
</span>
</inp2:m_if>
<inp2:m_if check="p_CustomField" name="Availability">
<br />
<inp2:p_CustomField name="Availability"/>
</inp2:m_if>
<inp2:m_if check="HasDiscount">
<br />
<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
<inp2:m_Phrase label="lu_comm_Discount" />: <span class="price1"><inp2:Field name="ItemDiscount" currency="selected" negative="1" /></span>
<a href="javascript:showDiscountInfo('<inp2:ord_DiscountHelpLink template="in-commerce/checkout/discount_info" />')">[?]</a>
</inp2:m_if>
</td>
<td><strong><inp2:Field name="Price" currency="selected"/></strong></td>
<td>
<inp2:m_if check="IsTangible" >
<input value="<inp2:Field field="Quantity"/>" size="5" name="<inp2:InputName field="Quantity"/>" />
<!--<inp2:m_if check="ProductsInStock">
<inp2:m_Phrase name="lu_of"/> <inp2:ProductsInStock/>
</inp2:m_if>-->
<inp2:m_else />
1
</inp2:m_if>
</td>
<td><strong><inp2:Field name="ExtendedPrice" currency="selected"/></strong></td>
<td><a href="<inp2:LinkRemoveFromCart/>"><img src="in-commerce/img/delete.gif" title="Delete" alt="Delete" width="15" height="14" border="0" /></a></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shop_cart_footer">
<tr class="cart-subtotal">
<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>">
<inp2:m_if check="ord_HasDiscount">
<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span class="price1"><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
</inp2:m_if>
<inp2:m_if check="ord_Field" name="CouponId">
<inp2:m_Phrase label="lu_comm_CouponHasBeenApplied" />:
<inp2:ord_Field field="CouponName" />
- <input class="button" type="submit" name="events[ord][OnRemoveCoupon]" value="<inp2:m_Phrase label="lu_comm_RemoveCoupon"/>">
+ <input class="button" type="submit" name="events[ord][OnRemoveCoupon]" value="<inp2:m_Phrase label="lu_comm_RemoveCoupon" no_editing="1"/>">
<inp2:m_else />
<inp2:m_Phrase label="lu_comm_EnterCouponCode" />:
<input size="10" name="coupon_code" />
</inp2:m_if>
</td>
<td colspan="2">
<strong><inp2:m_Phrase label="lu_comm_Subtotal"/>: <span class="price1"><inp2:ord_Field field="SubtotalWithDiscount" currency="selected"/></span></strong>
</td>
</tr>
<!-- <inp2:m_if check="ord_HasPayPalSubscription"/>
<input type="hidden" name="next_step_template" value="in-commerce/checkout/paypal">
<inp2:m_else/> -->
<input type="hidden" name="next_step_template" value="<inp2:m_if check="ord_OrderHasTangibleItems">in-commerce/checkout/shipping<inp2:m_else/>in-commerce/checkout/billing</inp2:m_if>" />
<!-- </inp2:m_if> -->
<input type="hidden" name="login_template" value="in-commerce/checkout/login_register" />
<tr class="cart-subtotal">
<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">4<inp2:m_else/>3</inp2:m_if>">
- <input class="button" type="submit" name="events[ord][OnUpdateCart]" value="<inp2:m_Phrase label="lu_comm_UpdateCart"/>" />
+ <input class="button" type="submit" name="events[ord][OnUpdateCart]" value="<inp2:m_Phrase label="lu_comm_UpdateCart" no_editing="1"/>" />
&nbsp;
- <input class="button" type="submit" name="events[ord][OnCleanupCart]" onclick="return confirm('<inp2:m_Phrase label="lu_comm_ClearCartConfirmation" />')" value="<inp2:m_Phrase label="lu_comm_CleanupCart"/>" />
+ <input class="button" type="submit" name="events[ord][OnCleanupCart]" onclick="return confirm('<inp2:m_Phrase label="lu_comm_ClearCartConfirmation" />')" value="<inp2:m_Phrase label="lu_comm_CleanupCart" no_editing="1"/>" />
</td>
<td align="right" colspan="2">
- <input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_comm_ProceedCheckout"/>" />
+ <input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_comm_ProceedCheckout" no_editing="1"/>" />
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shop_cart_empty">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_YourCartIsEmpty"/></strong>
</td>
</tr>
</inp2:m_DefineElement>
<script language="JavaScript">
function showDiscountInfo(url)
{
window.open(url, null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
}
</script>
<inp2:ord_PrintCart item_render_as="shop_cart_item" header_render_as="shop_cart_header" footer_render_as="shop_cart_footer" empty_cart_render_as="shop_cart_empty" per_page="-1"/>
</table>
<hr/>
<input type="hidden" name="continue_shopping_template" value="__default__"/>
- <input class="button" type="submit" name="events[ord][OnContinueShopping]" value="<inp2:m_Phrase label="lu_comm_Continue_Shopping"/>">
+ <input class="button" type="submit" name="events[ord][OnContinueShopping]" value="<inp2:m_Phrase label="lu_comm_Continue_Shopping" no_editing="1"/>">
</form>
<inp2:m_if check="ord_CartNotEmpty">
<inp2:m_if check="ord_HasPaymentGateway" name="Google Checkout">
<inp2:m_DefineElement name="google_checkout_button">
<form method="POST" target="_blank" action="<inp2:ord_GetFormAction payment_type_id="$payment_type_id"/>">
<inp2:ord_GetFormHiddenFields return_template="in-commerce/checkout/checkout_success"
cancel_template="in-commerce/checkout/billing"
payment_type_id="$payment_type_id"/>
<inp2:m_if check="m_Param" name="submit_url" equals_to="https://checkout.google.com/api/checkout/v2">
<input type="image" name="Google Checkout" alt="Fast checkout through Google"
src="https://checkout.google.com/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
&w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
<inp2:m_else/>
<input type="image" name="Google Checkout" alt="Fast checkout through Google"
src="http://sandbox.google.com/checkout/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
&w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
</inp2:m_if>
</form>
</inp2:m_DefineElement>
<inp2:ord_DisplayPaymentGateway name="Google Checkout" render_as="google_checkout_button"/>
</inp2:m_if>
</inp2:m_if>
</td>
</tr>
</table>
<inp2:m_if check="ord_CartIsEmpty">
<inp2:m_include template="in-commerce/blocks/products/products_picks" data_exists="1"/>
</inp2:m_if>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/register.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/register.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/register.tpl (revision 12319)
@@ -1,75 +1,75 @@
<form method="post" action="<inp2:m_FormAction />">
<table class="block-no-border">
<tr>
<td class="block-header">
<inp2:m_Phrase label="lu_comm_NewCustomers"/>
</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>
<inp2:m_Phrase label="lu_comm_PleaseRegister"/>... <br />
<inp2:m_Phrase label="lu_comm_PleaseEnterFollowing"/>:<br />
<br />
<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_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 width="170" class="error"><inp2:u_Error field="Login"/></td>
</tr>
</inp2:m_if>
<tr>
<td>
<strong><inp2:m_phrase label="lu_your_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>
<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 colspan="3" valign="bottom" height="35">
- <input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_phrase label="lu_Register"/>"/>
+ <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>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_address.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_address.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_address.tpl (revision 12319)
@@ -1,251 +1,251 @@
<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"/>"/>
+ <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\""/>
</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"/>"/>
+ <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/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_address.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_address.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_address.tpl (revision 12319)
@@ -1,235 +1,235 @@
<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"/>"/>
+ <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\""/>
</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"/>"/>
+ <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/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/form_register.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/form_register.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/form_register.tpl (revision 12319)
@@ -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>
</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"/>"/>
+ <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
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_options.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_options.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/billing_options.tpl (revision 12319)
@@ -1,220 +1,220 @@
<inp2:m_DefineElement name="order_payment_type">
<option <inp2:m_param name="selected"/> value="<inp2:m_param name="key"/>"><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="order_option_item">
<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="order_payment_credit_card">
<table class="block-no-border">
<tr class="cart-header">
<td>
<inp2:ord_PaymentTypeDescription/>
</td>
</tr>
<tr class="block-data">
<td>
<br/>
<inp2:m_if check="ord_HasGatewayError">
<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:ord_ShowGatewayError/>
</td>
</tr>
</table>
</inp2:m_if>
<inp2:ord_PaymentTypeInstructions/>
<br/>
</td>
</tr>
<tr class="form-data">
<td>
<table class="form-data">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_billing_CardType" />:</strong>
</td>
<td>
<select name="<inp2:ord_InputName field="PaymentCardType"/>" style="width:150px;">
<inp2:ord_PredefinedOptions field="PaymentCardType" render_as="order_option_item" selected="selected"/>
</select>
</td>
<td class="error"><inp2:ord_Error field="PaymentCardType"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_billing_CreditCardNumber" />:</strong>
</td>
<td>
<input type="text" name="<inp2:ord_InputName field="PaymentAccount"/>" value="<inp2:ord_Field field="PaymentAccount"/>" style="width: 200px;">
</td>
<td class="error"><inp2:ord_Error field="PaymentAccount"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_billing_NameOnCard" />:</strong>
</td>
<td>
<input type="text" name="<inp2:ord_InputName field="PaymentNameOnCard"/>" value="<inp2:ord_Field field="PaymentNameOnCard"/>" style="width: 260px;">
</td>
<td class="error"><inp2:ord_Error field="PaymentNameOnCard"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_billing_CardExpiration" />:</strong>
</td>
<td>
<select name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="order_option_item" selected="selected"/>
</select>
/
<select name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
<option value=''></option>
<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="order_option_item" selected="selected"/>
</select>
</td>
<td class="error"><inp2:ord_Error field="PaymentCCExpDate"/></td>
</tr>
<tr>
<td>
<strong><inp2:m_Phrase label="lu_billing_CVV2" />:</strong>
</td>
<td>
<input type="text" name="<inp2:ord_InputName field="PaymentCVV2"/>" style="width: 50px;">
&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
</td>
<td class="error"><inp2:ord_Error field="PaymentCVV2"/></td>
</tr>
</table>
</td>
</tr>
</table>
<script language="JavaScript">
function showCVV2Help(){
window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
}
</script>
<br />
<input type="hidden" name="check_credit_card" value="true"/>
<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
<div style="text-align: right; width: 100%">
- <input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
+ <input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
</div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="order_payment_type_default">
<table>
<tr class="cart-header">
<td>
<inp2:ord_PaymentTypeDescription/>
</td>
</tr>
<tr class="form-data">
<td>
<inp2:m_if check="ord_HasGatewayError">
<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:ord_ShowGatewayError/>
</td>
</tr>
</table>
</inp2:m_if>
<br/>
<inp2:ord_PaymentTypeInstructions/>
<br/>
</td>
</tr>
</table>
<br/>
<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
<div style="text-align: right; width: 100%">
- <input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_phrase label="lu_btn_ProceedToPreview"/>">
+ <input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
</div>
</inp2:m_DefineElement>
<table border="0" cellspacing="0" cellpadding="0" class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_BillingOptions"/></td>
</tr>
<tr>
<td class="block-data">
<table class="">
<tr class="cart-header">
<td>
Cost Summary
</td>
</tr>
</table>
<table class="form-data">
<inp2:m_DefineElement name="products_total">
<tr>
<td><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</td>
<td><inp2:ord_Field name="SubTotal" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shipping_total">
<tr>
<td><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</td>
<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="processing_total">
<tr>
<td><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </td>
<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="sub_total">
<tr>
<td><inp2:m_Phrase label="lu_comm_SubTotal"/>: </td>
<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="vat_total">
<tr>
<td><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </td>
<td><inp2:ord_Field name="VAT" currency="selected"/></td>
</tr>
</inp2:m_DefineElement>
<inp2:ord_PrintTotals
products_render_as="products_total"
shipping_render_as="shipping_total"
processing_render_as="processing_total"
sub_total_render_as="sub_total"
vat_render_as="vat_total"/>
<tr>
<td class="price3" ><strong><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</strong></td>
<td class="price3" ><span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span></td>
</tr>
</table>
<hr/>
<br />
<strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong>
<select name="<inp2:ord_InputName field="PaymentType"/>" onchange="document.getElementById('events[ord][OnUpdate]').click();">
<inp2:ord_PredefinedOptions render_as="order_payment_type" field="PaymentType" selected="selected"/>
</select>
- &nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_comm_Select"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
+ &nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_comm_Select" no_editing="1"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
<br/><br/>
<inp2:ord_PaymentTypeForm cc_render_as="order_payment_credit_card" default_render_as="order_payment_type_default"/>
</td>
</tr>
</table>
\ No newline at end of file
Index: branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_options.tpl
===================================================================
--- branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_options.tpl (revision 12318)
+++ branches/5.0.x/themes/onlinestore/in-commerce/blocks/checkout/shipping_options.tpl (revision 12319)
@@ -1,204 +1,204 @@
<inp2:m_DefineElement name="order_shipping_type">
<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_param name="TotalCost"/>)
</inp2:m_DefineElement>
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_comm_ShippingOptions"/></td>
</tr>
<tr>
<td class="block-data">
<inp2:m_DefineElement name="shippings_table_header">
<table>
<tr class="cart-header">
<td><inp2:m_Phrase label="lu_ship_Shipment" /></td>
<td><inp2:m_Phrase label="lu_ship_ItemsNumber" /></td>
<td><inp2:m_Phrase label="lu_ship_ShippingWeight" /></td>
<td><inp2:m_Phrase label="lu_ship_ShippingType" /></td>
</tr>
<inp2:m_if check="ord_CartHasBackorders">
<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
<inp2:m_Phrase label="lu_comm_YouHaveBackorderedItems"/>
<br />
<inp2:m_DefineElement name="order_option">
<input onclick="document.getElementById('events[ord][OnUpdate]').click();" type="radio"
<inp2:m_param name="checked"/>
name="<inp2:m_param name="field_name"/>"
id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>">
<label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>">
<inp2:m_phrase label="$option"/>
</label>&nbsp;<br />
</inp2:m_DefineElement>
<inp2:ord_PredefinedOptions field="ShippingOption" render_as="order_option" selected_param="checked" selected="checked=\"checked\""/>
<br />
</inp2:m_if>
<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="0"><inp2:m_else/>
<strong><inp2:m_Phrase label="lu_comm_Note"/>:</strong>
<inp2:m_if check="m_GetEquals" var="shipping_limitations_apply" value="1">
<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply"/><br/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" id="<inp2:ord_InputName field="ShippingGroupOption"/>" value="<inp2:ord_Field name="ShippingGroupOption" db="1"/>" />
<input onclick="document.getElementById('<inp2:ord_InputName field="ShippingGroupOption"/>').value = this.checked ? 1:0; document.getElementById('events[ord][OnUpdate]').click();" type="checkbox"
<inp2:m_param name="checked"/>
name="cb_<inp2:ord_InputName field="ShippingGroupOption"/>"
id="cb_<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" <inp2:ord_Field name="ShippingGroupOption" db="1" checked="checked"/> />
<label for="cb_<inp2:ord_InputName field="ShippingGroupOption"/>">
<inp2:m_phrase label="lu_AdjustShippingManually"/>
</label>&nbsp;<br />
<inp2:m_else/> <!-- Order canNOT be shipped with single shipping type -->
<inp2:m_Phrase label="lu_comm_ShippingTypesLimitationApply_CantSingleShip"/><br/>
<input type="hidden" name="<inp2:ord_InputName field="ShippingGroupOption"/>" value="1" />
</inp2:m_if>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shippings_table_footer">
<tr class="cart-item">
<td>
- <input class="button" type="submit" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateShipping"/>"/><br/>
+ <input class="button" type="submit" name="events[ord][OnUpdate]" value="<inp2:m_Phrase label="lu_comm_UpdateShipping" no_editing="1"/>"/><br/>
</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_ShippingTotal" />:</strong>
</td>
<td>
<inp2:ord_Field name="ShippingCost" currency="selected"/>
</td>
</tr>
<inp2:m_DefineElement name="products_total">
<tr class="cart-subtotal">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong>
</td>
<td>
<inp2:ord_Field name="SubTotal" currency="selected"/>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="processing_total">
<tr class="cart-subtotal">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>:</strong>
</td>
<td>
<inp2:ord_Field name="ProcessingFee" currency="selected"/>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="sub_total">
<tr class="cart-subtotal">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_SubTotal"/>:</strong>
</td>
<td>
<span class="price1"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></span>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="vat_total">
<tr class="cart-subtotal">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%:</strong>
</td>
<td>
<span class="price1"><inp2:ord_Field name="VAT" currency="selected"/></span>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:ord_PrintTotals
products_render_as="products_total"
processing_render_as="processing_total"
sub_total_render_as="sub_total"
vat_render_as="vat_total"/>
<tr class="cart-subtotal">
<td>&nbsp;</td>
<td>&nbsp;</td>
<td style="text-align: right">
<strong><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</strong>
</td>
<td>
<span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span>
</td>
</tr>
</table>
<table>
<tr>
<td style="text-align: right">
<input type="hidden" name="next_step_template" value="in-commerce/checkout/billing">
- <input type="submit" name="events[ord][OnProceedToBilling]" value="<inp2:m_Phrase label="lu_comm_ProceedToBilling"/>" class="button">
+ <input type="submit" name="events[ord][OnProceedToBilling]" value="<inp2:m_Phrase label="lu_comm_ProceedToBilling" no_editing="1"/>" class="button">
</td>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_include template="in-commerce/blocks/checkout/options"/>
<inp2:m_DefineElement name="shipping_group_item">
<li><inp2:Field name="Name"/><inp2:m_if check="ord_BackorderFlag"> <span class="error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
<inp2:m_if check="HasOptions">
<br/>
<span style="font-size: 8pt">
<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
<inp2:PrintOptions render_as="option_element" currency="selected"/>
<inp2:m_else/> <!-- listed combinations -->
<inp2:PrintOptions render_as="option_element_no_price"/>
</inp2:m_if>
<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a><br />
</inp2:m_if>
</span>
</inp2:m_if>
</li>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="order_shipment">
<tr class="cart-item">
<td><inp2:m_param name="shipment"/><br/>
<b><inp2:m_Phrase label="lu_Items"/>:</b><br/>
<ul>
<inp2:ord_PrintCart item_render_as="shipping_group_item" requery="1" package_num="$package_num" product_type="1" header_render_as="html:" footer_render_as="html:"/>
</ul>
</td>
<td><inp2:m_param name="items"/></td>
<td><inp2:m_param name="weight"/></td>
<td>
<select name="<inp2:m_param name="field_name"/>">
<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected" />
</select>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="no_shipments">
<div class="error"><inp2:m_Recall name="usps_errors" /></div>
<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/> (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).
</inp2:m_DefineElement>
<inp2:m_DefineElement name="invalid_address">
<inp2:m_Phrase label="lu_comm_ErrorInvalidShippingAddress"/>.
</inp2:m_DefineElement>
<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments" invalid_address_render_as="invalid_address" table_header_render_as="shippings_table_header" table_footer_render_as="shippings_table_footer" />
<br />
</td>
</tr>
</table>
\ 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