Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F785601
advanced
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, Feb 12, 4:21 PM
Size
9 KB
Mime Type
text/x-diff
Expires
Fri, Feb 14, 4:21 PM (1 d, 3 h)
Engine
blob
Format
Raw Data
Handle
564567
Attached To
rTADV Themes.Advanced
advanced
View Options
Index: branches/1.2.x/platform/my_account/my_profile.tpl
===================================================================
--- branches/1.2.x/platform/my_account/my_profile.tpl (revision 14469)
+++ branches/1.2.x/platform/my_account/my_profile.tpl (revision 14470)
@@ -1,82 +1,86 @@
<!--##
<NAME>My Profile</NAME>
<DESC></DESC>
<SECTION>My Account</SECTION>
##-->
<inp2:m_RequireLogin login_template="platform/login/register"/>
<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_MyProfile" 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>
</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_MyProfile" templates="platform/my_account/my_account,platform/my_account/my_profile"/>
</div>
<div class="movable-element">
<!-- my profile -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MyProfile"/>
</inp2:m_Capture>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="u_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" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
- <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+ <inp2:m_if check="u_Field" name="OldStyleLogin" db="db">
+ <inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px"/>
+ <inp2:m_else/>
+ <inp2:m_RenderElement name="inp_label" prefix="u" field="Login" title="lu_fld_Login"/>
+ </inp2:m_if>
<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_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" style="width:155px" />
<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_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1"/>
<inp2:m_RenderElement name="inp_edit_image_upload" prefix="u" field="PrimaryImage" title="lu_prompt_Avatar" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input class="button" type="submit" name="events[u][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update" no_editing="1"/>"/>
<input type="hidden" name="next_template" value="platform/my_account/my_account"/>
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
<!-- // my profile -->
</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/login/forgot_password.tpl
===================================================================
--- branches/1.2.x/platform/login/forgot_password.tpl (revision 14469)
+++ branches/1.2.x/platform/login/forgot_password.tpl (revision 14470)
@@ -1,109 +1,109 @@
<!--##
<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_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:m_if check="u_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">
+ <inp2:m_if check="u_UseUsernames">
<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"/>
<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 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="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
Event Timeline
Log In to Comment