Page MenuHomeIn-Portal Phabricator
Files F775590

advanced
No OneTemporary
Actions

File Metadata

Created
Wed, Feb 5, 12:03 PM

advanced
View Options

Index: branches/1.2.x/platform/login/forgot_password.tpl
===================================================================
--- branches/1.2.x/platform/login/forgot_password.tpl (revision 14592)
+++ branches/1.2.x/platform/login/forgot_password.tpl (revision 14593)
@@ -1,92 +1,94 @@
<!--##
<NAME>Forgot Password</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_ForgotPassword" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPassword" templates="platform/login/forgot_password"/>
</div>
<div class="movable-element">
<!-- forgot password -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ForgotPassword"/>
</inp2:m_Capture>
<inp2:m_if check="u_UseUsernames">
<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
<inp2:m_else/>
<inp2:m_Phrase label="lu_EnterForgotEmail"/>
</inp2:m_if>
<br /><br />
+ <inp2:u.forgot_FormName name="forgot_password"/>
+
<inp2:m_if check="u.forgot_HasError" field="any">
<inp2:m_RenderElement name="error_message"/>
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_if check="u_UseUsernames">
<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Login" style="width: 155px;"/>
<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
<td class="field-name"></td>
<td class="field-value">
<inp2:m_Phrase label="lu_Or"/>
</td>
</tr>
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
</inp2:m_if>
<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
<input type="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_SendPassword' no_editing='1'/>" />
<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
<!-- // forgot password -->
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.2.x/platform/login/register.tpl
===================================================================
--- branches/1.2.x/platform/login/register.tpl (revision 14592)
+++ branches/1.2.x/platform/login/register.tpl (revision 14593)
@@ -1,112 +1,115 @@
<!--##
<NAME>User Registration</NAME>
<DESC></DESC>
<SECTION>My Account||Login</SECTION>
##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_UserRegistration" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/mailing_list.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UserRegistration" templates="platform/login/register"/>
</div>
<div class="movable-element">
<!-- user registration -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_UserRegistration"/>
</inp2:m_Capture>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
- <inp2:u_PresetFormFields/>
- <inp2:m_if check="u_HasError" field="any">
+ <inp2:u.register_FormName name="registration"/>
+
+ <inp2:m_if check="u.register_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
- <inp2:m_if check="u_UseUsernames">
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
+ <inp2:m_if check="u.register_UseUsernames">
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Login" title="lu_fld_Login" style="width:155px" />
</inp2:m_if>
<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
</inp2:m_if>
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName" title="lu_fld_LastName" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company" title="lu_fld_Company" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone" title="lu_fld_Phone" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Fax" title="lu_fld_Fax" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_date" prefix="u.register" field="dob" title="lu_fld_BirthDate" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City" title="lu_fld_City" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
<inp2:m_if check="m_GetConfig" name="AllowSelectGroupOnFront">
- <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="PrimaryGroupId" title="lu_fld_UserGroup" />
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="PrimaryGroupId" title="lu_fld_UserGroup" />
</inp2:m_if>
- <inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
+ <inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
<inp2:m_if check="m_ConfigEquals" option="RegistrationCaptcha" value="1">
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
- <inp2:m_RenderElement name="inp_edit_captcha" prefix="u" style="width: 170px;" />
+ <inp2:m_RenderElement name="inp_edit_captcha" prefix="u.register" style="width: 170px;" />
</inp2:m_if>
<inp2:m_ModuleInclude template="elements/registration_fields.elm"/>
<inp2:m_RenderElement design="inp_edit_buttons" no_editing="1">
- <input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>" />
+ <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" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
- <input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>"/>
+ <input class="button" type="submit" name="events[u.register][OnCreate]" value="<inp2:m_Phrase label='lu_btn_Register' no_editing='1'/>"/>
+ <input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase label='lu_btn_Cancel' no_editing="1"/>"/>
+
+ <input type="hidden" name="forms[u.register]" value="<inp2:u.register_FormName/>"/>
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
<!-- // user registration -->
</div>
</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.2.x/platform/mailing_list/subscribe.tpl
===================================================================
--- branches/1.2.x/platform/mailing_list/subscribe.tpl (revision 14592)
+++ branches/1.2.x/platform/mailing_list/subscribe.tpl (revision 14593)
@@ -1,54 +1,54 @@
<!--##
<NAME>Subscribe</NAME>
<DESC></DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_SubscribeConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_SubscribeConfirm" templates="platform/mailing_list/subscribe"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_SubscribeConfirm"/>
</inp2:m_Capture>
<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" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+ <input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
<input type="hidden" name="subscribe_ok_template" value="platform/mailing_list/subscribe_ok"/>
<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/platform/mailing_list/unsubscribe.tpl
===================================================================
--- branches/1.2.x/platform/mailing_list/unsubscribe.tpl (revision 14592)
+++ branches/1.2.x/platform/mailing_list/unsubscribe.tpl (revision 14593)
@@ -1,54 +1,54 @@
<!--##
<NAME>Unsubscribe</NAME>
<DESC>Unsubscribe from mailing list</DESC>
<SECTION>Platform||Mailing</SECTION>
##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_UnsubscribeConfirm" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/recommend_site.elm" design="blue_box"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_UnsubscribeConfirm" templates="platform/mailing_list/unsubscribe"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_UnsubscribeConfirm"/>
</inp2:m_Capture>
<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" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
+ <input class="button" name="events[u.subscriber][OnSubscribeUser]" type="submit" value="<inp2:m_Phrase label="lu_btn_Yes" no_editing="1"/>" />&nbsp;
<input class="button" type="button" value="<inp2:m_Phrase label="lu_btn_No" no_editing="1"/>" onclick="redirect('<inp2:m_Link template="index"/>');" />&nbsp;
<input type="hidden" name="unsubscribe_ok_template" value="platform/mailing_list/unsubscribe_ok"/>
<input type="hidden" name="subscriber_email" value="<inp2:m_Get name='subscriber_email' html_escape='1'/>"/>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/platform/elements/side_boxes/login.elm.tpl
===================================================================
--- branches/1.2.x/platform/elements/side_boxes/login.elm.tpl (revision 14592)
+++ branches/1.2.x/platform/elements/side_boxes/login.elm.tpl (revision 14593)
@@ -1,125 +1,127 @@
<!-- LOGIN BOX TITLE -->
<inp2:m_Capture to_var="header">
<table class="fullwidth">
<tr>
<td class="side-box-title" align="left">
<inp2:m_phrase name="lu_title_LoginBox"/>
</td>
<td align="right" class="login-status">
<!-- IF LOGGED IN SHOW NAME -->
<inp2:m_if check="m_LoggedIn">
<a href="<inp2:m_Link template="platform/my_account/my_profile" m_cat_id="0" m_cat_page="1"/>"><inp2:u_Field name="FirstName"/> <inp2:u_Field name="LastName"/></a><br />
<!-- /IF LOGGED IN SHOW NAME -->
<inp2:m_else/>
<table>
<tr>
<td width="11">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/not_logged.gif" alt="" width="11" height="11" border="0" /><br />
</td>
<td class="login-status">
&nbsp;<inp2:m_Phrase label="lu_NotLoggedIn"/>
</td>
</tr>
</table>
</inp2:m_if>
</td>
</tr>
</table>
</inp2:m_Capture>
<!-- /LOGIN BOX TITLE -->
<!-- IF LOGGED! -->
<inp2:m_if check="m_LoggedIn">
<table width="100%" style="border-width: 0px;">
<tr>
<td colspan="2"><strong><inp2:m_phrase name="lu_section_MyAccount"/></strong></td>
</tr>
<!-- SHOW MY PROFILE -->
<inp2:m_RenderElement name="box_element" template="platform/my_account/my_profile" title="lu_MyProfile"/>
<!-- /SHOW MY PROFILE -->
<!-- SHOW MY FAVORITES -->
<inp2:m_RenderElement name="box_element" template="platform/my_account/my_favorites" title="lu_MyFavorites"/>
<!-- /SHOW MY FAVORITES -->
<!-- SHOW MY PREFERENCES -->
<inp2:m_RenderElement name="box_element" template="platform/my_account/my_preferences" title="lu_MyPreferences"/>
<!-- /SHOW MY PREFERENCES -->
<!-- INCLUDE "themes/default2007/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="1"/>
<!-- /INCLUDE "themes/[MODULE_NAME]/my_account/my_items.elm.tpl" FOR EACH INSTALLED MODULE -->
<tr>
<td>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/menu-li-2-level.gif" alt="" width="4" height="4" border="0" /><br />
</td>
<td>
<a href="<inp2:u_LogoutLink template="index" />"><inp2:m_Phrase label="lu_logout"/></a>
</td>
</tr>
<tr>
<td colspan="2">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="7" border="0" /><br />
</td>
</tr>
<tr>
<td colspan="2">
<strong><inp2:m_phrase name="lu_section_MyItems"/></strong>
</td>
</tr>
<inp2:m_ModuleInclude template="my_account/my_items.elm" place="sidebox" section="2"/>
</table>
<!-- /IF LOGGED -->
<inp2:m_else/>
<!-- IF NOT LOGGED IN! -->
<form method="post" action="<inp2:m_FormAction />">
- <inp2:m_if check="u_UseUsernames">
+ <inp2:u.login-sidebox_FormName name="login"/>
+
+ <inp2:m_if check="u.login-sidebox_UseUsernames">
<inp2:m_phrase label="lu_username"/><br />
<inp2:m_else/>
<inp2:m_phrase label="lu_email"/><br />
</inp2:m_if>
<input class="input-text" type="text" name="<inp2:u.login-sidebox_InputName name='UserLogin'/>" value="<inp2:u.login-sidebox_Field name='UserLogin'/>" style="width:155px" /><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
<inp2:m_Phrase label="lu_Password"/><br />
<input type="password" class="input-text" name="<inp2:u.login-sidebox_InputName name='UserPassword'/>" value="<inp2:u.login-sidebox_Field name='UserPassword'/>" style="width:155px" /><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="10" border="0" /><br />
<table>
<tr>
<td width="10">
<input class="button" name="events[u.login-sidebox][OnLogin]" type="submit" value="<inp2:m_Phrase label='lu_Login' no_editing='1'/>" /><br />
</td>
<td align="left">
<input type="checkbox" name="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" id="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" value="1"/> <label for="<inp2:u.login-sidebox_InputName name='UserRememberLogin'/>" class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></label>
</td>
</tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="5" height="5" border="0" /><br />
<inp2:m_if check="u.login-sidebox_HasError" field="any">
<span class="field-error"><inp2:u.login-sidebox_Error field="UserLogin"/></span><br />
</inp2:m_if>
<inp2:m_if check="u_RegistrationEnabled">
<a href="<inp2:m_Link template="platform/login/register" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_Register"/></a> <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" /><br />
</inp2:m_if>
<a href="<inp2:m_Link template="platform/login/forgot_password" m_cat_id="0" m_cat_page="1"/>" class="more-link" ><inp2:m_Phrase label="lu_ForgotPassword"/>?</a> <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/side_link_str.gif" width="6" height="5" alt="" />
<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>
<!-- /IF NOT LOGGED IN -->
Index: branches/1.2.x/platform/elements/side_boxes/mailing_list.elm.tpl
===================================================================
--- branches/1.2.x/platform/elements/side_boxes/mailing_list.elm.tpl (revision 14592)
+++ branches/1.2.x/platform/elements/side_boxes/mailing_list.elm.tpl (revision 14593)
@@ -1,21 +1,24 @@
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MailingList"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_EnterEmailToSubscribe"/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
<form method="POST" action="<inp2:m_FormAction />" name="mailing_list_form">
- <input type="text" name="subscriber_email" class="input-text" style="width: 155px;"/><br />
- <inp2:m_if check="u_HasError" field="any">
- <span class="field-error"><inp2:u_Error field="SubscribeEmail"/></span><br />
+ <inp2:u.subscribe-sidebox_FormName name="subscription"/>
+
+ <input type="text" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" class="input-text" style="width: 155px;"/><br />
+
+ <inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
+ <span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
</inp2:m_if>
<br />
- <input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" />
- <input class="button" name="events[u][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Unsubscribe' no_editing='1'/>" />
+ <input class="button" name="events[u.subscribe-sidebox][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/>" />
+ <input class="button" name="events[u.subscribe-sidebox][OnSubscribeQuery]" type="submit" style="width: 90px;" value="<inp2:m_Phrase label='lu_btn_Unsubscribe' no_editing='1'/>" />
&nbsp;
<input type="text" style="display: none" />
<input type="hidden" name="subscribe_template" value="platform/mailing_list/subscribe"/>
<input type="hidden" name="unsubscribe_template" value="platform/mailing_list/unsubscribe"/>
</form>
Index: branches/1.2.x/platform/elements/side_boxes/recommend_site.elm.tpl
===================================================================
--- branches/1.2.x/platform/elements/side_boxes/recommend_site.elm.tpl (revision 14592)
+++ branches/1.2.x/platform/elements/side_boxes/recommend_site.elm.tpl (revision 14593)
@@ -1,16 +1,18 @@
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_RecommendSite"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_EnterEmailToRecommend"/><br />
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" alt="" width="1" height="5" border="0" /><br />
<form method="POST" action="<inp2:m_FormAction />">
+ <inp2:u.recommend-sidebox_FormName name="recommend"/>
+
<input type="text" class="input-text" name="<inp2:u.recommend-sidebox_InputName name='RecommendEmail'/>" value="<inp2:u.recommend-sidebox_Field name='RecommendEmail'/>" style="width: 155px;" /><br />
<inp2:m_if check="u.recommend-sidebox_HasError" field="any">
<span class="field-error"><inp2:u.recommend-sidebox_Error field="RecommendEmail"/></span><br />
</inp2:m_if>
<br />
<input class="button" name="events[u.recommend-sidebox][OnRecommend]" type="submit" value="<inp2:m_Phrase label='lu_btn_Recommend' no_editing='1'/>" />
<input type="hidden" name="template_success" value="platform/recommend/recommend" />
</form>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
===================================================================
--- branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payment_type.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payment_type.tpl (revision 14593)
@@ -1,85 +1,85 @@
<!--##
<NAME>Affiliate - Payment Type</NAME>
<DESC>Affiliate Payment Type page</DESC>
<SECTION>My Account||Store||Affiliates</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliatePaymentType" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_if check="u_IsAffiliate">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
</inp2:m_if>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
- <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payment_type"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliatePaymentType" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payment_type"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliatePaymentType"/>
</inp2:m_Capture>
<table class="form-data fullwidth">
<tr>
<td class="field-name" style="width:155px">
<strong><inp2:m_Phrase label="lu_CurrentAffiliatePaymentType" />:</strong>
</td>
<td class="field-name"><inp2:u_AffiliateField name="PaymentTypeId" /></td>
</tr>
<tr><td colspan="2" style="padding-left:15px"><inp2:m_Phrase label="lu_ChangeAffiliatePaymentTypeDescription"/><br /><br /></td></tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<br />
<inp2:m_include template="in-commerce/elements/forms.elm"/>
<form method="post" action="<inp2:m_FormAction/>">
<table border="0" class="form-data fullwidth">
- <inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
- <inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
+ <inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.user" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.user" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_payment_type_changed" />
- <input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_ChangePaymentType" no_editing="1"/>" />
+ <input type="submit" class="button" name="events[affil.user][OnChangePaymentType]" value="<inp2:m_Phrase label='lu_ChangePaymentType' no_editing='1'/>" />
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
--- branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/my_account/affiliate/affiliate.tpl (revision 14593)
@@ -1,121 +1,126 @@
<!--##
<NAME>Affiliate</NAME>
<DESC>Affiliate page</DESC>
<SECTION>My Account||Store||Affiliates</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_Affiliate" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_if check="u_IsAffiliate">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
</inp2:m_if>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_DefineElement name="affiliate_element">
<a href="<inp2:m_Link template="$template"/>">
<strong><inp2:m_Phrase label="$label"/></strong></a><br />
<inp2:m_Phrase label="$text"/><br /><br />
</inp2:m_DefineElement>
<inp2:m_if check="u_IsAffiliate">
- <!-- Affiliate Section List -->
+ <!-- Affiliate Section List -->
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_Affiliate"/>
</inp2:m_Capture>
- <inp2:m_if check="u_AffiliateIsNotActive">
+ <inp2:m_ifnot check="u_AffiliateIsActive">
<table class="warning-message fullwidth">
<tr>
<td width="30">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
</td>
<td><inp2:m_phrase name="lu_Warning"/></td>
</tr>
</table>
<br />
<inp2:m_Phrase label="lu_AffiliateIsPendingOrDisabled"/><br /><br />
- </inp2:m_if>
+ </inp2:m_ifnot>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_statistics" label="lu_comm_AffiliateStatistics" text="lu_AffiliateStatisticsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payments" label="lu_AffiliatePayments" text="lu_AffiliatePaymentsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_materials" label="lu_AffiliateMaterials" text="lu_AffiliateMaterialsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" label="lu_ChangePaymentType" text="lu_ChangePaymentTypeText"/>
<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement();return false;">
<strong><inp2:m_Phrase label="lu_TermsAndConditionsLink"/></strong></a><br />
<inp2:m_Phrase label="lu_TermsAndConditionsText"/><br /><br />
<!-- End Of Affiliate Section List -->
<inp2:m_else />
<!-- Affiliate Registration -->
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliateRegistration"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_BecomeAnAffiliateDescription"/><br /><br />
- <inp2:m_if check="u_HasError" field="any">
+
+ <inp2:affil.register_FormName name="registration"/>
+ <inp2:affil.register_PresetFormFields/>
+
+ <inp2:m_if check="affil.register_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<br />
<inp2:m_include template="in-commerce/elements/forms.elm"/>
+
<form method="post" action="<inp2:m_FormAction/>">
<table border="0" class="form-data fullwidth">
- <inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" style="width:155px" required="1"/>
- <inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
- <inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
- <inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
+ <inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_thankyou" />
- <input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate" no_editing="1"/>" />
+ <input type="submit" class="button" name="events[affil.register][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate" no_editing="1"/>" />
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_if>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<!--## //MAIN CONTENT ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payments.tpl
===================================================================
--- branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payments.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/my_account/affiliate/affiliate_payments.tpl (revision 14593)
@@ -1,84 +1,84 @@
<!--##
<NAME>Affiliate - Payments</NAME>
<DESC>Affiliate Payments List page</DESC>
<SECTION>My Account||Store||Affiliates</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_ComissionPayments" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_if check="u_IsAffiliate">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
</inp2:m_if>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
- <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_ComissionPayments" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payments"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_ComissionPayments" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payments"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_payments">
<inp2:apayments_InitList list_name="my_payments_list" types="my_payments"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ComissionPayments"/> (<inp2:apayments_TotalRecords list_name="my_payments_list" />)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/affiliates.elm"/>
<table class="fullwidth">
<inp2:m_RenderElement name="separator" colspan="4"/>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_Date"/></td>
<td><inp2:m_Phrase label="lu_PaymentReference"/></td>
<td><inp2:m_Phrase label="lu_PaymentAmount"/></td>
</tr>
<inp2:m_RenderElement name="separator" colspan="4"/>
<inp2:m_include template="in-commerce/elements/affiliates.elm"/>
<inp2:apayments_PrintList list_name="my_payments_list" render_as="payment_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="apayments" list_name="my_payments_list"/>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Index: branches/1.2.x/in-commerce/my_account/affiliate/affiliate_materials.tpl
===================================================================
--- branches/1.2.x/in-commerce/my_account/affiliate/affiliate_materials.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/my_account/affiliate/affiliate_materials.tpl (revision 14593)
@@ -1,86 +1,86 @@
<!--##
<NAME>Affiliate - Materials</NAME>
<DESC>Affiliate Materials page</DESC>
<SECTION>My Account||Store||Affiliates</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_AffiliateMaterials" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
<div class="movable-area">
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_if check="u_IsAffiliate">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
</inp2:m_if>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
<div class="movable-area">
<div class="movable-element">
- <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_AffiliateMaterials" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_materials"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_AffiliateMaterials" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_materials"/>
</div>
<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_AffiliateMaterials"/>
</inp2:m_Capture>
<inp2:m_if check="u_IsAffiliate">
<table>
<tr>
<td colspan="2"><inp2:m_Phrase label="lu_AffiliateMaterials"/></td>
</tr>
<tr>
<td>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsToRefer"/>:
<br /><br />
<a href="<inp2:affil_GetUserAffiliateLink template="index"/>"><inp2:affil_GetUserAffiliateLink template="index"/></a>
</td>
</tr>
<tr>
<td>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCode"/>:
<blockquote style="border: 1px dashed #cccccc; background-color: #f3f3f3; padding: 8px">
<small>
&lt;a href="<inp2:affil_GetUserAffiliateLink template="index"/>"&gt;
<inp2:conf_ConfigValue name="Site_Name"/>
&lt;/a&gt;
</small>
</blockquote>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCopy"/>
</td>
</tr>
</table>
</inp2:m_if>
</inp2:m_RenderElement>
</div>
</div>
</inp2:m_DefineElement>
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/elements/forms.elm.tpl
===================================================================
--- branches/1.2.x/in-commerce/elements/forms.elm.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/elements/forms.elm.tpl (revision 14593)
@@ -1,82 +1,56 @@
-<inp2:m_DefineElement name="inp_affiliate_caption" style="" valign="top" title="" required="0">
- <td class="field-name" valign="<inp2:m_Param name="valign"/>" style="<inp2:m_Param name="style"/>">
- <inp2:m_phrase label="$title"/><inp2:m_if check="m_ParamEquals" name="required" value="1"><span class="field-required"> *</span></inp2:m_if>:
- </td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_box" is_last="0" style="" required="0">
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
- <td class="field-value" nowrap>
- <inp2:m_if check="m_GetEquals" var="{$field}RequiredError" value="1">
- <span class="field-error"><inp2:m_Phrase label="la_err_required" /></span><br />
- </inp2:m_if>
- <input type="text" class="input-text" name="<inp2:m_Param name="field"/>" value="<inp2:m_Get var="$field" />" tabindex="<inp2:m_get param="tab_index"/>"/>
- </td>
- </tr>
- <inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_textarea" is_last="0" required="0">
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
- <td class="field-value">
- <textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:m_param name="field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>"><inp2:m_Get var="$field" /></textarea>
- </td>
- </tr>
- <inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
<inp2:m_DefineElement name="affiliate_payment_type_element">
<tr>
<td valign="top" nowrap>
- <input type="radio" name="<inp2:m_Param name="field"/>" id="<inp2:m_Param name="field"/>_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="$field" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if>/>
+ <input type="radio" name="<inp2:$prefix_InputName name='$field'/>" id="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>" value="<inp2:Field name='PaymentTypeId'/>"<inp2:m_if check="Checked" prefix="$prefix" field="$field"> checked</inp2:m_if>/>
</td>
<td>
- <label for="<inp2:m_Param name="field"/>_<inp2:Field name="$field" />">
- <inp2:Field name="Name" /><br />
+ <label for="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>">
+ <inp2:Field name="Name" />
+
<inp2:m_if check="Field" name="Description">
- <inp2:Field name="Description" />
+ <br /><inp2:Field name="Description" />
</inp2:m_if>
</label>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+ <inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
<td class="field-value">
+ <inp2:m_if check="{$prefix}_HasError" field="$field">
+ <span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+ </inp2:m_if>
+
<table>
- <inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_element" field="$field"/>
+ <inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
</table>
</td>
</tr>
+
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" is_last="0">
+<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" title="" is_last="0">
<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <td class="field-name" nowrap>
- &nbsp;
- </td>
- <td class="field-value">
- <inp2:m_if check="m_GetEquals" var="MustAgreeToTerms" value="1">
- <span class="field-error"><inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError" /></span><br />
+ <td class="field-name" nowrap>&nbsp;</td>
+ <td>
+ <inp2:m_if check="{$prefix}_HasError" field="$field">
+ <span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
</inp2:m_if>
- <input type="checkbox" name="AgreeToAffiliateTerms"/>
- <inp2:m_Phrase label="lu_comm_IAgreeTo" />
+
+ <input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> value="1"/>
+
+ <label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_IAgreeTo" /></label>
<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
- <inp2:m_Phrase label="lu_comm_TermsAndConditions" />
+ <label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_TermsAndConditions" /></label>
</td>
</tr>
<script type="text/javascript">
function showAffiliateAgreement() {
window.open('<inp2:m_Link template="in-commerce/my_account/affiliate/affiliate_agreement" />', null, 'menubar=no,toolbars=no,width=500,height=300');
}
</script>
</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl
===================================================================
--- branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl (revision 14592)
+++ branches/1.2.x/in-commerce/elements/registration_fields.elm.tpl (revision 14593)
@@ -1,40 +1,41 @@
<!--## AFFILIATE REGISTRATION CHECKBOX ##-->
- <inp2:m_if check="m_ConfigEquals" option="Comm_RegisterAsAffiliate" value="1">
-
+ <inp2:m_if check="m_AllowAffiliateRegistration">
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+ <tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/>">
<inp2:m_inc param="tab_index" by="1"/>
<td class="field-name">
<label for="RegisterAsAffiliate">
<inp2:m_phrase label="lu_fld_RegisterAsAffiliate"/>:
</label>
</td>
<td class="field-value">
- <input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
- <input class="hidden-element" type="submit" id="events[u][OnRefreshForm]" name="events[u][OnRefreshForm]" />
+ <input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="RegisterAsAffiliate" name="RegisterAsAffiliate" onchange="toggle_affiliate()" <inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">checked</inp2:m_if>/>
+ <input class="hidden-element" type="submit" id="events[u.register][OnRefreshForm]" name="events[u.register][OnRefreshForm]" />
</td>
</tr>
<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
</inp2:m_if>
</inp2:m_if>
<!--## /AFFILIATE REGISTRATION CHECKBOX ##-->
<inp2:m_if check="m_GetEquals" name="RegisterAsAffiliate" value="on">
<inp2:m_include template="in-commerce/elements/forms.elm"/>
- <inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" required="1"/>
- <inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
- <inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
+ <inp2:affil.register_FormName name="registration"/>
+ <inp2:affil.register_PresetFormFields/>
- <inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
+ <inp2:m_RenderElement name="inp_edit_box" prefix="affil.register" field="SSN" title="lu_fld_SSNField"/>
+ <inp2:m_RenderElement name="inp_affiliate_payment_types" prefix="affil.register" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType"/>
+ <inp2:m_RenderElement name="inp_edit_textarea" prefix="affil.register" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5"/>
+ <inp2:m_RenderElement name="inp_affiliate_terms_checkbox" prefix="affil.register" field="TermsAccepted"/>
</inp2:m_if>
<script type="text/javascript">
function toggle_affiliate() {
- document.getElementById('events[u][OnRefreshForm]').click();
+ document.getElementById('events[u.register][OnRefreshForm]').click();
}
</script>
\ 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