Page MenuHomeIn-Portal Phabricator

advanced
No OneTemporary

File Metadata

Created
Wed, Feb 12, 4:40 PM

advanced

Index: branches/1.1.x/platform/login/forgot_password.tpl
===================================================================
--- branches/1.1.x/platform/login/forgot_password.tpl (revision 14487)
+++ branches/1.1.x/platform/login/forgot_password.tpl (revision 14488)
@@ -1,109 +1,92 @@
<!--##
<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="conf_ConfigValue" name="Email_As_Login">
<inp2:m_Phrase label="lu_EnterForgotEmail"/>
<inp2:m_else/>
<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
</inp2:m_if>
<br /><br />
- <inp2:m_if check="u_HasError" field="any">
+ <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="m_ConfigEquals" name="Email_As_Login" value="0">
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Login" title="lu_fld_Login"/>
- <td class="field-value">
- <inp2:m_if check="u_HasError" field="Login">
- <span class="field-error"><inp2:u_Error field="Login"/></span><br />
- </inp2:m_if>
- <input type="text" class="input-text" name="username" value="<inp2:m_Get name="username"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
- </td>
- </tr>
- <inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+ <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>
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_RenderElement name="inp_edit_field_caption" prefix="u" field="Email" title="lu_fld_Email"/>
- <td class="field-value">
- <inp2:m_if check="u_HasError" field="Email">
- <span class="field-error"><inp2:u_Error field="Email"/></span><br />
- </inp2:m_if>
- <input type="text" class="input-text" name="email" value="<inp2:m_Get name="email"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 155px;">
- </td>
- </tr>
+ <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][OnForgotPassword]" value="<inp2:m_Phrase label="lu_btn_SendPassword" no_editing="1"/>" />
+ <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.1.x/platform/elements/side_boxes/login.elm.tpl
===================================================================
--- branches/1.1.x/platform/elements/side_boxes/login.elm.tpl (revision 14487)
+++ branches/1.1.x/platform/elements/side_boxes/login.elm.tpl (revision 14488)
@@ -1,125 +1,125 @@
<!-- 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:m_phrase label="lu_username"/><br />
- <input class="input-text" type="text" name="login" style="width:155px" /><br />
<inp2:m_else/>
<inp2:m_phrase label="lu_email"/><br />
- <input class="input-text" type="text" name="email" style="width:155px" /><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="password" style="width:155px" /><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][OnLogin]" type="submit" value="<inp2:m_Phrase label='lu_Login' no_editing='1'/>" /><br />
+ <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="cb_remember_login" value="1"/> <span class="remember-login"><inp2:m_Phrase label="lu_remember_login"/></span>
+ <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_HasError" field="any">
- <span class="field-error"><inp2:u_Error field="ValidateLogin"/></span><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.1.x/platform/elements/side_boxes/recommend_site.elm.tpl
===================================================================
--- branches/1.1.x/platform/elements/side_boxes/recommend_site.elm.tpl (revision 14487)
+++ branches/1.1.x/platform/elements/side_boxes/recommend_site.elm.tpl (revision 14488)
@@ -1,16 +1,16 @@
<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 />">
- <input type="text" class="input-text" name="friend_email" value="" style="width: 155px;" /><br />
- <inp2:m_if check="u_HasError" field="any">
- <span class="field-error"><inp2:u_Error field="Email"/></span><br />
+ <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][OnRecommend]" type="submit" value="<inp2:m_Phrase label='lu_btn_Recommend' no_editing='1'/>" />
+ <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

Event Timeline