Page MenuHomeIn-Portal Phabricator
Files F1025973

D288.diff
No OneTemporary
Actions

File Metadata

Created
Fri, Jun 13, 5:39 PM

D288.diff
View Options

Index: core/admin_templates/designs/without_login_design.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/designs/without_login_design.tpl
@@ -0,0 +1,144 @@
+<inp2:m_Set skip_last_template="1"/>
+<inp2:adm_HTTPAuth result_to_var="http_auth"/>
+<inp2:m_include t="incs/header" nobody="yes"/>
+
+<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF">
+<style type="text/css">
+ <!--
+ html, body {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ }
+
+ #header-div {
+ position: absolute;
+ top: 0px;
+ height: 160px;
+ left: 0px;
+ right: 0px;
+ background: url('img/login/login-top.png') no-repeat right top #007bf4;
+ z-index: 2;
+ }
+
+ #body-div {
+ position: absolute;
+ top: 160px;
+ bottom: 160px;
+ width: 100%;
+ text-align: center;
+ z-index: 5;
+ }
+
+ #footer-div {
+ position: absolute;
+ bottom: 0px;
+ height: 160px;
+ left: 0px;
+ right: 0px;
+ background: url('img/login/login-bottom.png') no-repeat left bottom #007bf4;
+ z-index: 2;
+ }
+
+ #outer {
+ position: absolute;
+ top: 50%;
+ left: 0px;
+ width: 100%;
+ height: 1px;
+ overflow: visible;
+ z-index: 10;
+ }
+
+ #inner {
+ text-align: left;
+ width: 100%;
+ height: 300px;
+ margin-left: -50%; /*** width / 2 ***/
+ position: absolute;
+ top: -150px; /*** height / 2 ***/
+ left: 50%;
+ z-index: 5;
+ /* border: 1px solid #000000; */
+ }
+
+ #form table {
+ border-radius: 20px;
+ -moz-border-radius: 20px;
+ -webkit-border-radius: 20px;
+ border: 1px solid #CCCCCC;
+ font-weight: normal;
+ background-color: #ECECEC;
+ z-index: 5;
+ }
+
+ #form table td {
+ padding: 2px 15px 2px 15px;
+ }
+
+ .login-table {
+ background: #ECECEC;
+ }
+
+ .roundbutton {
+ border-radius: 11px;
+ -moz-border-radius: 11px;
+ -webkit-border-radius: 11px;
+ cursor: pointer;
+ padding: 2px 5px;
+ text-decoration: none;
+ }
+ -->
+</style>
+
+<div id="header-div"></div>
+
+<div id="body-div">
+
+ <div id="outer">
+
+ <div id="inner" align="center">
+
+ <div id="logo" align="center" style="margin-bottom: 20px;">
+ <table class="head-table" style="background: none;">
+ <tr>
+ <inp2:m_if check="adm_AdminSkin" type="LogoLogin">
+ <td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"></td>
+ <inp2:m_else/>
+ <inp2:m_if check="adm_AdminSkin" type="Logo">
+ <td>
+ <img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"><br/>
+ <inp2:m_if check="adm_AdminSkin" type="LogoBottom">
+ <img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>">
+ </inp2:m_if>
+ </td>
+ </inp2:m_if>
+
+ <td align="left" valign="middle">
+ <span style="font-size: 48px; color: black;"><inp2:m_GetConfig var="Site_Name"/></span>
+ </td>
+ </inp2:m_if>
+ </tr>
+ </table>
+ </div>
+
+ <div id="form" align="center">
+ <inp2:m_if check="m_Param" name="http_auth">
+ <input type="hidden" name="skip_last_template" value="1"/>
+ <inp2:m_RenderElement name="content"/>
+ <inp2:m_else/>
+ <h1 style="color: red;">401 Authentication Required</h1>
+ </inp2:m_if>
+ </div>
+
+ </div>
+
+ </div>
+
+</div>
+
+<div id="footer-div"></div>
+
+<inp2:m_include t="incs/footer"/>
Index: core/admin_templates/incs/style_template.css
===================================================================
--- core/admin_templates/incs/style_template.css
+++ core/admin_templates/incs/style_template.css
@@ -74,6 +74,11 @@
padding: 1px;
}
+.login-message {
+ max-width: 400px;
+ margin-bottom: 10px;
+}
+
.disabled {
background-color: #ebebeb;
}
Index: core/admin_templates/login.tpl
===================================================================
--- core/admin_templates/login.tpl
+++ core/admin_templates/login.tpl
@@ -1,265 +1,126 @@
-<inp2:m_Set skip_last_template="1"/>
-<inp2:adm_HTTPAuth result_to_var="http_auth"/>
-<inp2:m_include t="incs/header" nobody="yes"/>
-
-<body topmargin="0" leftmargin="0" marginheight="0" marginwidth="0" bgcolor="#FFFFFF">
- <style type="text/css">
- <!--
- html, body {
- margin: 0;
- padding: 0;
- width: 100%;
- height: 100%;
- overflow: hidden;
- }
-
- #header-div {
- position: absolute;
- top: 0px;
- height: 160px;
- left: 0px;
- right: 0px;
- background: url('img/login/login-top.png') no-repeat right top #007bf4;
- z-index: 2;
- }
-
- #body-div {
- position: absolute;
- top: 160px;
- bottom: 160px;
- width: 100%;
- text-align: center;
- z-index: 5;
- }
-
- #footer-div {
- position: absolute;
- bottom: 0px;
- height: 160px;
- left: 0px;
- right: 0px;
- background: url('img/login/login-bottom.png') no-repeat left bottom #007bf4;
- z-index: 2;
- }
-
- #outer {
- position: absolute;
- top: 50%;
- left: 0px;
- width: 100%;
- height: 1px;
- overflow: visible;
- z-index: 10;
- }
-
- #inner {
- text-align: left;
- width: 100%;
- height: 300px;
- margin-left: -50%; /*** width / 2 ***/
- position: absolute;
- top: -150px; /*** height / 2 ***/
- left: 50%;
- z-index: 5;
- /* border: 1px solid #000000; */
- }
-
- #form table {
- border-radius: 20px;
- -moz-border-radius: 20px;
- -webkit-border-radius: 20px;
- border: 1px solid #CCCCCC;
- font-weight: normal;
- background-color: #ECECEC;
- z-index: 5;
- }
-
- #form table td {
- padding: 2px 15px 2px 15px;
- }
-
- .login-table {
- background: #ECECEC;
- }
-
- .roundbutton {
- border-radius: 11px;
- -moz-border-radius: 11px;
- -webkit-border-radius: 11px;
- cursor: pointer;
- padding: 2px 5px;
- text-decoration: none;
- }
- -->
- </style>
-
- <div id="header-div"></div>
-
- <div id="body-div">
-
- <div id="outer">
-
- <div id="inner" align="center">
-
- <div id="logo" align="center" style="margin-bottom: 20px;">
- <table class="head-table" style="background: none;">
- <tr>
- <inp2:m_if check="adm_AdminSkin" type="LogoLogin">
- <td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"></td>
- <inp2:m_else/>
- <inp2:m_if check="adm_AdminSkin" type="Logo">
- <td>
- <img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"><br/>
- <inp2:m_if check="adm_AdminSkin" type="LogoBottom">
- <img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>">
- </inp2:m_if>
- </td>
- </inp2:m_if>
-
- <td align="left" valign="middle">
- <span style="font-size: 48px; color: black;"><inp2:m_GetConfig var="Site_Name"/></span>
- </td>
- </inp2:m_if>
- </tr>
- </table>
- </div>
-
- <div id="form" align="center">
- <inp2:m_if check="m_Param" name="http_auth">
- <inp2:u.login-admin_FormName name="login"/>
-
- <inp2:m_if check="m_MaintenanceMode">
- <inp2:m_GetConfig name="MaintenanceMessageAdmin"/>
- <inp2:m_else/>
- <table class="login-table">
- <tr>
- <td colspan="2" style="text-align: center">
- <inp2:m_if check="u.login-admin_HasError" field="any">
- <span class="error-cell"><inp2:u.login-admin_Error field="UserLogin"/></span>
- </inp2:m_if><br/>
- </td>
- </tr>
- <tr>
- <td class="text"><inp2:m_phrase name="la_fld_EmailOrUsername"/>:</td>
- <td><input type="text" id="user_login" name="<inp2:u.login-admin_InputName name='UserLogin'/>" class="text" value="<inp2:u.login-admin_CookieUsername field='UserLogin'/>" style="width: 150px;"></td>
- </tr>
- <tr>
- <td class="text"><inp2:m_phrase name="la_fld_Password"/>:</td>
- <td><input type="password" name="<inp2:u.login-admin_InputName name='UserPassword'/>" class="text" style="width: 150px;"></td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="checkbox" id="save_username" name="cb_save_username"<inp2:m_if check="m_GetEquals" name="save_username" value="" inverse="inverse"> checked="checked"</inp2:m_if>/>&nbsp;
- <label for="save_username"><inp2:m_Phrase label="la_SaveLogin"/></label>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
- <input type="submit" name="login_button" value="<inp2:m_phrase name='la_Login' no_editing='1'/>" class="kx-login-button roundbutton"></td>
- </tr>
- </table>
- </inp2:m_if>
-
- <inp2:m_if check="m_GetConst" name="DBG_RESET_ROOT">
- <inp2:m_if check="m_Get" var="reset">
- <script type="text/javascript">
- $(document).ready(
- function () {
- alert('<inp2:m_Phrase label="la_msg_RootPasswordWasReset" js_escape="1"/>');
- }
- );
- </script>
- <inp2:m_else/>
- <br/>
- <a href="<inp2:m_Link template='login' u_event='OnResetRootPassword' pass='m,u'/>"><inp2:m_Phrase label="la_btn_ResetRootPassword"/></a>
- </inp2:m_if>
- </inp2:m_if>
- <inp2:m_else/>
- <h1 style="color: red;">401 Authentication Required</h1>
- </inp2:m_if>
- </div>
-
- </div>
-
- </div>
-
- </div>
-
- <div id="footer-div"></div>
-
- <inp2:m_if check="m_Param" name="http_auth">
- <input type="hidden" name="next_template" value="<inp2:m_if check='m_GetEquals' name='next_template' value="">index<inp2:m_else/><inp2:m_get var='next_template'/></inp2:m_if>"/>
- <input type="hidden" name="skip_last_template" value="1"/>
-
- <script type="text/javascript">
-
- $(document).ready(
- function() {
- $('#user_login').focus();
- Application.SetVar('events[u.login-admin]', 'OnLogin');
- }
- );
-
- var a_parent = window.parent;
- var to_close = new Array();
-
- function redirect() {
- // alert('running redirect in "' + window.name + '"');
- // window.name = 'redirect';
- var $main_frame = getFrame('main');
- a_parent = window;
-
- try {
- var i = 0;
- while (i < 10) {
- i++;
- var $opener = $main_frame.getWindowOpener(a_parent);
- // console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
-
- if ($opener) {
- to_close.push(a_parent);
- a_parent = $opener;
- continue;
- }
-
- if (a_parent.name == 'main_frame') {
- break;
- }
-
- if (a_parent.parent && a_parent.parent.name != a_parent.name) {
- a_parent = a_parent.parent;
- continue;
- }
- }
- }
- catch (err) {
- // another website is opened in parent window
- alert('Error while trying to access window opener: [' + err.message + ']');
- i = 10;
- }
-
- if (i < 10) {
- // console.log('to close: ', to_close);
- setTimeout(close_windows, 100);
- }
- }
-
- function close_windows() {
- page = '<inp2:m_t t="index" expired="1" m_wid="" no_amp="1" js_escape="1"/>'; // a_parent.location.href + '?expired=1';
- // alert('redirecting ' + a_parent.name + ' to ' + page);
- a_parent.location.href = page;
-
- // alert('closing ' + to_close.length + ' windows');
- for (var c = (to_close.length - 1); c >= 0; c--) {
- // alert('closing ' + to_close[c].name);
- window_close(to_close[c]);
- }
- }
-
- if (window.top.frames.length > 0) {
- redirect();
- }
- </script>
- </inp2:m_if>
+<inp2:m_DefineElement name="content" prefix="u.login-admin">
+ <inp2:$prefix_FormName name="login"/>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+ <inp2:m_if check="m_MaintenanceMode">
+ <inp2:m_GetConfig name="MaintenanceMessageAdmin"/>
+ <inp2:m_else/>
+ <table class="login-table">
+ <tr>
+ <td colspan="2" style="text-align: center">
+ <inp2:m_if check="{$prefix}_HasError" field="any">
+ <span class="error-cell"><inp2:$prefix_Error field="UserLogin"/></span>
+ </inp2:m_if><br/>
+ </td>
+ </tr>
+ <tr>
+ <td class="text"><inp2:m_phrase name="la_fld_EmailOrUsername"/>:</td>
+ <td><input type="text" id="user_login" name="<inp2:$prefix_InputName name='UserLogin'/>" class="text" value="<inp2:$prefix_CookieUsername field='UserLogin'/>" style="width: 150px;"></td>
+ </tr>
+ <tr>
+ <td class="text"><inp2:m_phrase name="la_fld_Password"/>:</td>
+ <td><input type="password" name="<inp2:$prefix_InputName name='UserPassword'/>" class="text" style="width: 150px;"></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="checkbox" id="save_username" name="cb_save_username"<inp2:m_if check="m_GetEquals" name="save_username" value="" inverse="inverse"> checked="checked"</inp2:m_if>/>&nbsp;
+ <label for="save_username"><inp2:m_Phrase label="la_SaveLogin"/></label>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
+ <input type="submit" name="login_button" value="<inp2:m_phrase name='la_Login' no_editing='1'/>" class="kx-login-button roundbutton">
+ <a href="<inp2:m_Link template='login/forgot_password'/>"><inp2:m_Phrase name="la_text_ForgotPassword"/></a>
+ </td>
+ </tr>
+ </table>
+ </inp2:m_if>
+
+ <inp2:m_if check="m_GetConst" name="DBG_RESET_ROOT">
+ <inp2:m_if check="m_Get" var="reset">
+ <script type="text/javascript">
+ $(document).ready(
+ function () {
+ alert('<inp2:m_Phrase label="la_msg_RootPasswordWasReset" js_escape="1"/>');
+ }
+ );
+ </script>
+ <inp2:m_else/>
+ <br/>
+ <a href="<inp2:m_Link template='login' u_event='OnResetRootPassword' pass='m,u'/>"><inp2:m_Phrase label="la_btn_ResetRootPassword"/></a>
+ </inp2:m_if>
+ </inp2:m_if>
+
+ <input type="hidden" name="next_template" value="<inp2:m_if check='m_GetEquals' name='next_template' value="">index<inp2:m_else/><inp2:m_get var='next_template'/></inp2:m_if>"/>
+
+ <script type="text/javascript">
+
+ $(document).ready(
+ function() {
+ $('#user_login').focus();
+ Application.SetVar('events[<inp2:m_Param name="prefix"/>]', 'OnLogin');
+ }
+ );
+
+ var a_parent = window.parent;
+ var to_close = new Array();
+
+ function redirect() {
+ // alert('running redirect in "' + window.name + '"');
+ // window.name = 'redirect';
+ var $main_frame = getFrame('main');
+ a_parent = window;
+
+ try {
+ var i = 0;
+ while (i < 10) {
+ i++;
+ var $opener = $main_frame.getWindowOpener(a_parent);
+ // console.log('window: ', a_parent.name, '; opener: ', $opener ? $opener.name : null);
+
+ if ($opener) {
+ to_close.push(a_parent);
+ a_parent = $opener;
+ continue;
+ }
+
+ if (a_parent.name == 'main_frame') {
+ break;
+ }
+
+ if (a_parent.parent && a_parent.parent.name != a_parent.name) {
+ a_parent = a_parent.parent;
+ continue;
+ }
+ }
+ }
+ catch (err) {
+ // another website is opened in parent window
+ alert('Error while trying to access window opener: [' + err.message + ']');
+ i = 10;
+ }
+
+ if (i < 10) {
+ // console.log('to close: ', to_close);
+ setTimeout(close_windows, 100);
+ }
+ }
+
+ function close_windows() {
+ page = '<inp2:m_t t="index" expired="1" m_wid="" no_amp="1" js_escape="1"/>'; // a_parent.location.href + '?expired=1';
+ // alert('redirecting ' + a_parent.name + ' to ' + page);
+ a_parent.location.href = page;
+
+ // alert('closing ' + to_close.length + ' windows');
+ for (var c = (to_close.length - 1); c >= 0; c--) {
+ // alert('closing ' + to_close[c].name);
+ window_close(to_close[c]);
+ }
+ }
+
+ if (window.top.frames.length > 0) {
+ redirect();
+ }
+ </script>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="designs/without_login_design"/>
Index: core/admin_templates/login/forgot_password.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/login/forgot_password.tpl
@@ -0,0 +1,39 @@
+<inp2:m_DefineElement name="content" prefix="u.forgot">
+ <inp2:$prefix_FormName name="forgot_password"/>
+
+ <h2><inp2:m_Phrase label="la_title_ForgotPasswordStep1"/></h2>
+ <table class="login-table">
+ <tr>
+ <td colspan="2" style="text-align: center">
+ </td>
+ </tr>
+ <tr>
+ <td class="text"><inp2:m_Phrase name="la_fld_EmailOrUsername"/>:</td>
+ <td>
+ <inp2:m_if check="{$prefix}_HasError" field="ForgotLogin">
+ <span class="error-cell"><inp2:$prefix_Error field="ForgotLogin"/><br></span>
+ </inp2:m_if>
+
+ <input type="text" class="input-text" name="<inp2:$prefix_InputName field='ForgotLogin'/>" id="<inp2:$prefix_InputName field='ForgotLogin'/>" value="<inp2:$prefix_Field name='ForgotLogin'/>" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
+ <input type="submit" name="login_button" value="<inp2:m_Phrase label='la_btn_Continue' no_editing='1'/>" class="kx-login-button roundbutton">
+ <input type="hidden" name="template_success" value="login/forgot_password_reset_notice"/>
+ <input type="hidden" name="reset_confirm_template" value="login/forgot_password_reset"/>
+ </td>
+ </tr>
+ </table>
+
+ <script type="text/javascript">
+ $(document).ready(
+ function() {
+ $('#' + jq('<inp2:$prefix_InputName field="ForgotLogin"/>')).focus();
+ Application.SetVar('events[<inp2:m_Param name="prefix"/>]', 'OnForgotPassword');
+ }
+ );
+ </script>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="designs/without_login_design"/>
Index: core/admin_templates/login/forgot_password_reset.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/login/forgot_password_reset.tpl
@@ -0,0 +1,56 @@
+<inp2:m_DefineElement name="content" prefix="u.forgot">
+ <h2><inp2:m_Phrase label="la_title_ForgotPasswordStep3"/></h2>
+
+ <inp2:m_if check="u_TestCodeIsValid">
+ <table class="login-table">
+ <tr>
+ <td colspan="2" style="text-align: center">
+ </td>
+ </tr>
+
+ <tr>
+ <td class="text"><inp2:m_Phrase name="la_fld_NewPassword"/>:</td>
+ <td>
+ <inp2:m_if check="{$prefix}_HasError" field="Password">
+ <span class="error-cell"><inp2:$prefix_Error field="Password"/><br></span>
+ </inp2:m_if>
+
+ <input type="password" class="input-text" name="<inp2:$prefix_InputName field='Password'/>" id="<inp2:$prefix_InputName field='Password'/>" value="<inp2:$prefix_Field name='Password_plain'/>" />
+ </td>
+ </tr>
+ <tr>
+ <td class="text"><inp2:m_Phrase name="la_fld_VerifyNewPassword"/>:</td>
+ <td>
+ <inp2:m_if check="{$prefix}_HasError" field="VerifyPassword">
+ <span class="error-cell"><inp2:$prefix_Error field="VerifyPassword"/><br></span>
+ </inp2:m_if>
+
+ <input type="password" class="input-text" name="<inp2:$prefix_InputName field='VerifyPassword'/>" id="<inp2:$prefix_InputName field='VerifyPassword'/>" value="<inp2:$prefix_Field name='VerifyPassword_plain'/>" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center" style="padding: 5px 15px 10px 15px;">
+ <input type="submit" name="login_button" value="<inp2:m_phrase name='la_btn_SetNewPassword' no_editing='1'/>" class="kx-login-button roundbutton">
+ <input type="hidden" name="next_template" value="login/forgot_password_reset_confirm"/>
+ </td>
+ </tr>
+ </table>
+ <inp2:m_else/>
+ <div class="login-message">
+ <span class="error-cell"><inp2:u_Error field="PwResetConfirm"/></span>
+ <br /> <br />
+ <a href="<inp2:m_Link template='index'/>"><inp2:m_Phrase label="la_btn_ReturnToHome"/></a>
+ </div>
+ </inp2:m_if>
+
+ <script type="text/javascript">
+ $(document).ready(
+ function() {
+ $('#' + jq('<inp2:$prefix_InputName field="Password"/>')).focus();
+ Application.SetVar('events[<inp2:m_Param name="prefix"/>]', 'OnResetLostPassword');
+ }
+ );
+ </script>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="designs/without_login_design"/>
Index: core/admin_templates/login/forgot_password_reset_confirm.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/login/forgot_password_reset_confirm.tpl
@@ -0,0 +1,16 @@
+<inp2:m_DefineElement name="content">
+ <h2><inp2:m_Phrase label="la_title_ForgotPasswordStep4"/></h2>
+ <div class="login-message">
+ <inp2:m_Phrase label="la_text_ForgotPassHasBeenReset"/>
+ </div>
+
+ <script type="text/javascript">
+ $(document).ready(function () {
+ setTimeout(function () {
+ document.location.assign('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');
+ }, 5000);
+ });
+ </script>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="designs/without_login_design"/>
Index: core/admin_templates/login/forgot_password_reset_notice.tpl
===================================================================
--- /dev/null
+++ core/admin_templates/login/forgot_password_reset_notice.tpl
@@ -0,0 +1,8 @@
+<inp2:m_DefineElement name="content">
+ <h2><inp2:m_Phrase name="la_title_ForgotPasswordStep2"/></h2>
+ <div class="login-message">
+ <inp2:m_Phrase name='la_text_ForgotPassResetEmailSent'/>
+ </div>
+</inp2:m_DefineElement>
+
+<inp2:m_include template="designs/without_login_design"/>
Index: core/install/english.lang
===================================================================
--- core/install/english.lang
+++ core/install/english.lang
@@ -28,6 +28,7 @@
<PHRASE Label="la_btn_Change" Module="Core" Type="1">Q2hhbmdl</PHRASE>
<PHRASE Label="la_btn_Clear" Module="Core" Type="1">Q2xlYXI=</PHRASE>
<PHRASE Label="la_btn_ContentMode" Module="Core" Type="1">Q29udGVudCBNb2Rl</PHRASE>
+ <PHRASE Label="la_btn_Continue" Module="Core" Type="1">Q29udGludWU=</PHRASE>
<PHRASE Label="la_btn_Delete" Module="Core" Type="1">RGVsZXRl</PHRASE>
<PHRASE Label="la_btn_DeleteDraft" Module="Core" Type="1">RGVsZXRl</PHRASE>
<PHRASE Label="la_btn_DeleteReview" Module="Core" Type="1">ZGVsZXRlIHJldmlldw==</PHRASE>
@@ -51,16 +52,20 @@
<PHRASE Label="la_btn_Reset" Module="Core" Type="1">UmVzZXQ=</PHRASE>
<PHRASE Label="la_btn_ResetAndValidateConfigFiles" Module="Core" Type="1">UmVzZXQgJmFtcDsgVmFsaWRhdGUgQ29uZmlnIEZpbGVz</PHRASE>
<PHRASE Label="la_btn_ResetRootPassword" Module="Core" Type="1">UmVzZXQgInJvb3QiIHBhc3N3b3Jk</PHRASE>
+ <PHRASE Label="la_btn_ReturnToHome" Module="Core" Type="1">UmV0dXJuIHRvIEhvbWU=</PHRASE>
<PHRASE Label="la_btn_Save" Module="Core" Type="1">U2F2ZQ==</PHRASE>
<PHRASE Label="la_btn_SaveChanges" Module="Core" Type="1">U2F2ZSBDaGFuZ2Vz</PHRASE>
<PHRASE Label="la_btn_SectionProperties" Module="Core" Type="1">U2VjdGlvbiBQcm9wZXJ0aWVz</PHRASE>
<PHRASE Label="la_btn_SectionTemplate" Module="Core" Type="1">U2VjdGlvbiBUZW1wbGF0ZQ==</PHRASE>
<PHRASE Label="la_btn_SelectAll" Module="Core" Type="1">U2VsZWN0IEFsbA==</PHRASE>
+ <PHRASE Label="la_btn_SendPassword" Module="Core" Type="1">U2VuZCBQYXNzd29yZA==</PHRASE>
+ <PHRASE Label="la_btn_SetNewPassword" Module="Core" Type="1">U2V0IE5ldyBQYXNzd29yZA==</PHRASE>
<PHRASE Label="la_btn_SetValue" Module="Core" Type="1">U2V0IFZhbHVl</PHRASE>
<PHRASE Label="la_btn_ShowStructure" Module="Core" Type="1">U2hvdyBTdHJ1Y3R1cmU=</PHRASE>
<PHRASE Label="la_btn_Synchronize" Module="Core" Type="1">U3luY2hyb25pemU=</PHRASE>
<PHRASE Label="la_btn_Unselect" Module="Core" Type="1">VW5zZWxlY3Q=</PHRASE>
<PHRASE Label="la_btn_Up" Module="Core" Type="1">VXA=</PHRASE>
+ <PHRASE Label="la_btn_Update" Module="Core" Type="1">VXBkYXRl</PHRASE>
<PHRASE Label="la_btn_UseDraft" Module="Core" Type="1">VXNl</PHRASE>
<PHRASE Label="la_By" Module="Core" Type="1">Ynk=</PHRASE>
<PHRASE Label="la_Cancel" Module="Core" Type="1">Q2FuY2Vs</PHRASE>
@@ -576,6 +581,7 @@
<PHRASE Label="la_fld_MultiLingual" Module="Core" Type="1">TXVsdGlsaW5ndWFs</PHRASE>
<PHRASE Label="la_fld_Name" Module="Core" Type="1" Column="TmFtZQ==">TmFtZQ==</PHRASE>
<PHRASE Label="la_fld_New" Module="Core" Type="1">TmV3</PHRASE>
+ <PHRASE Label="la_fld_NewPassword" Module="Core" Type="1">TmV3IFBhc3N3b3Jk</PHRASE>
<PHRASE Label="la_fld_NextRunOn" Module="Core" Type="1" Column="TmV4dCBSdW4gT24=">TmV4dCBSdW4gT24=</PHRASE>
<PHRASE Label="la_fld_Notes" Module="Core" Type="1">Tm90ZXM=</PHRASE>
<PHRASE Label="la_fld_NotHelpfulCount" Module="Core" Type="1" Column="Tm90IEhlbHBmdWw=">UmV2aWV3IFdhc24ndCBIZWxwZnVs</PHRASE>
@@ -748,6 +754,7 @@
<PHRASE Label="la_fld_UserGroups" Module="Core" Type="1">VXNlciBHcm91cHM=</PHRASE>
<PHRASE Label="la_fld_Username" Module="Core" Type="1" Column="VXNlcm5hbWU=">VXNlcm5hbWU=</PHRASE>
<PHRASE Label="la_fld_UseSecurityImage" Module="Core" Type="1" Column="VXNlIFNlY3VyaXR5IEltYWdl">VXNlIFNlY3VyaXR5IEltYWdl</PHRASE>
+ <PHRASE Label="la_fld_VerifyNewPassword" Module="Core" Type="1">UmVwZWF0IE5ldyBQYXNzd29yZA==</PHRASE>
<PHRASE Label="la_fld_VerifyPassword" Module="Core" Type="1">UmUtZW50ZXIgUGFzc3dvcmQ=</PHRASE>
<PHRASE Label="la_fld_Version" Module="Core" Type="1" Column="VmVyc2lvbg==">VmVyc2lvbg==</PHRASE>
<PHRASE Label="la_fld_Visibility" Module="Core" Type="1" Column="VmlzaWJpbGl0eQ==">VmlzaWJpbGl0eQ==</PHRASE>
@@ -1369,7 +1376,12 @@
<PHRASE Label="la_text_disclaimer_part2" Module="Core" Type="1">UGxlYXNlIG1ha2Ugc3VyZSB0byBCQUNLVVAgeW91ciBkYXRhYmFzZShzKSBiZWZvcmUgcnVubmluZyB0aGlzIHV0aWxpdHkh</PHRASE>
<PHRASE Label="la_Text_Edit" Module="Core" Type="1">RWRpdA==</PHRASE>
<PHRASE Label="la_Text_Email" Module="Core" Type="1">RW1haWw=</PHRASE>
+ <PHRASE Label="la_text_EnterForgotUserEmail" Module="Core" Type="1">RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
<PHRASE Label="la_text_FollowingLinesWereNotImported" Module="Core" Type="1">Rm9sbG93aW5nIGxpbmVzIHdlcmUgTk9UIGltcG9ydGVk</PHRASE>
+ <PHRASE Label="la_text_ForgotPassHasBeenReset" Module="Core" Type="1">WW91ciBwYXNzd29yZCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hhbmdlZC4=</PHRASE>
+ <PHRASE Label="la_text_ForgotPassResetChangeForm" Module="Core" Type="1">UGxlYXNlIGVudGVyIHlvdXIgbmV3IHBhc3N3b3Jk</PHRASE>
+ <PHRASE Label="la_text_ForgotPassResetEmailSent" Module="Core" Type="1">QW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhhdCBlbWFpbCB0byBzZXQgeW91ciBuZXcgcGFzc3dvcmQu</PHRASE>
+ <PHRASE Label="la_text_ForgotPassword" Module="Core" Type="1">Rm9yZ290IHBhc3N3b3JkPw==</PHRASE>
<PHRASE Label="la_Text_FrontOnly" Module="Core" Type="1">RnJvbnQtRW5kIE9ubHk=</PHRASE>
<PHRASE Label="la_Text_General" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
<PHRASE Label="la_Text_Hot" Module="Core" Type="1">SG90</PHRASE>
@@ -1387,6 +1399,7 @@
<PHRASE Label="la_Text_None" Module="Core" Type="1">Tm9uZQ==</PHRASE>
<PHRASE Label="la_text_NoPermission" Module="Core" Type="1">Tm8gUGVybWlzc2lvbg==</PHRASE>
<PHRASE Label="la_text_Or" Module="Core" Type="1">b3I=</PHRASE>
+ <PHRASE Label="la_text_PasswordRequestConfirm" Module="Core" Type="1">UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLiA=</PHRASE>
<PHRASE Label="la_Text_Phone" Module="Core" Type="1">UGhvbmU=</PHRASE>
<PHRASE Label="la_Text_Pop" Module="Core" Type="1">UG9wdWxhcg==</PHRASE>
<PHRASE Label="la_text_popularity" Module="Core" Type="1">UG9wdWxhcml0eQ==</PHRASE>
@@ -1510,6 +1523,10 @@
<PHRASE Label="la_title_ExportLanguagePackStep1" Module="Core" Type="1">RXhwb3J0IExhbmd1YWdlIFBhY2sgLSBTdGVwMQ==</PHRASE>
<PHRASE Label="la_title_Fields" Module="Core" Type="1">RmllbGRz</PHRASE>
<PHRASE Label="la_title_Files" Module="Core" Type="1">RmlsZXM=</PHRASE>
+ <PHRASE Label="la_title_ForgotPasswordStep1" Module="Core" Type="1">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDEgb2YgNCk=</PHRASE>
+ <PHRASE Label="la_title_ForgotPasswordStep2" Module="Core" Type="1">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDIgb2YgNCk=</PHRASE>
+ <PHRASE Label="la_title_ForgotPasswordStep3" Module="Core" Type="1">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDMgb2YgNCk=</PHRASE>
+ <PHRASE Label="la_title_ForgotPasswordStep4" Module="Core" Type="1">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDQgb2YgNCk=</PHRASE>
<PHRASE Label="la_title_Forms" Module="Core" Type="1">Rm9ybXM=</PHRASE>
<PHRASE Label="la_title_FormSubmissions" Module="Core" Type="1">Rm9ybSBTdWJtaXNzaW9ucw==</PHRASE>
<PHRASE Label="la_title_General" Module="Core" Type="1">R2VuZXJhbA==</PHRASE>
@@ -1905,7 +1922,7 @@
</EVENT>
<EVENT Event="USER.PSWDC" Type="0">
<SUBJECT>UmVzZXQgUGFzc3dvcmQgQ29uZmlybWF0aW9u</SUBJECT>
- <HTMLBODY>SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIEluLXBvcnRhbCBhY2NvdW50LiBJZiB5b3Ugd291bGQgbGlrZSB0byBwcm9jZWVkIGFuZCBjaGFuZ2UgdGhlIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KWW91IHdpbGwgcmVjZWl2ZSBhIHNlY29uZCBlbWFpbCB3aXRoIHlvdXIgbmV3IHBhc3N3b3JkIHNob3J0bHkuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IGhhdmUgY2xpY2tlZCBvbiB0aGUgYWJvdmUgbGluay4NCg==</HTMLBODY>
+ <HTMLBODY>SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIGFjY291bnQuIElmIHlvdSB3b3VsZCBsaWtlIHRvIHByb2NlZWQgd2l0aCB0aGUgY2hhbmdlIG9mIHlvdXIgb2xkIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KT25jZSBjbGlja2VkLCB5b3UnbGwgYmUgdGFrZW4gdG8gdGFrZW4gdG8gdGhlIHBhZ2Ugd2hlcmUgeW91IGNhbiBzZXQgeW91ciBuZXcgcGFzc3dvcmQuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IHN1Y2Nlc3NmdWxseSBjaGFuZ2UgaXQgYnkgZm9sbG93aW5nIHRoZSBhYm92ZSBsaW5rLg0K</HTMLBODY>
</EVENT>
<EVENT Event="USER.SUBSCRIBE" Type="0">
<SUBJECT>U3Vic2NyaWJlZCB0byBhIE1haWxpbmcgTGlzdCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+</SUBJECT>
Index: core/install/upgrades.css
===================================================================
--- core/install/upgrades.css
+++ core/install/upgrades.css
@@ -681,7 +681,7 @@
+++ style_template.css (working copy)
@@ -60,7 +60,7 @@
}
-
+
.bordered, table.bordered, .bordered-no-bottom {
- border: 1px solid #000000;
+ border: 1px solid #000000 !important;
@@ -690,7 +690,7 @@
}
@@ -269,7 +269,7 @@
}
-
+
/* Main row definition */
-.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 {
+.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td {
@@ -709,7 +709,7 @@
@@ -346,6 +346,29 @@
background-color: #FFFF00;
}
-
+
+div.filter, div.filter-active {
+ background-color: white;
+ border: 1px solid #AAAAAA;
@@ -748,7 +748,7 @@
@@ -493,11 +516,18 @@
border-top-width: 0px;
}
-
+
+.form-notice, .form-warning {
+ font-size: 11px;
+}
@@ -757,7 +757,7 @@
color: red;
- font-size: 11px;
}
-
+
+.form-notice {
+ color: green;
+}
@@ -766,7 +766,7 @@
color: red;
padding-left: 1px;
@@ -751,4 +781,17 @@
-
+
.summary-box li {
padding-bottom: 4px;
+}
@@ -791,7 +791,7 @@
--- style_template.css (revision 15359)
+++ style_template.css (working copy)
@@ -424,7 +424,7 @@
-
+
.grid-status-bar td {
background-color: @@TitleBarBgColor@@;
- color: @@TitleBarColor@@;
@@ -802,7 +802,7 @@
@@ -610,11 +610,13 @@
text-decoration: none;
}
-
+
-/* Left side of bluebar */
-.header_left_bg {
+/* Page header (bluebar) */
@@ -815,7 +815,7 @@
+ font-weight: normal;
+ padding: 2px 8px 2px 8px;
}
-
+
/* Right side of bluebar */
# ===== v 5.2.2-B1 =====
@@ -826,7 +826,7 @@
@@ -549,6 +549,10 @@
border-collapse: separate
}
-
+
+label.checkbox {
+ white-space: nowrap;
+}
@@ -840,10 +840,22 @@
===================================================================
--- style_template.css (revision 16502)
+++ style_template.css (working copy)
+@@ -74,6 +74,11 @@
+ padding: 1px;
+ }
+
++.login-message {
+ + max-width: 400px;
+ + margin-bottom: 10px;
+ +}
++
+.disabled {
+ background-color: #ebebeb;
+}
@@ -487,6 +487,14 @@
vertical-align: middle;
}
-
+
+.CodeMirror {
+ font-size: 13px;
+ border: 1px solid black;
@@ -858,7 +870,7 @@
@@ -498,6 +506,18 @@
background: #fff none;
}
-
+
+.highlight-area, .code-highlight-area {
+ border: 1px solid black;
+ padding: 8px;
Index: core/install/upgrades.sql
===================================================================
--- core/install/upgrades.sql
+++ core/install/upgrades.sql
@@ -2936,6 +2936,34 @@
UPDATE SystemSettings SET VariableValue = 1 WHERE VariableName = 'CSVExportEncoding';
ALTER TABLE Semaphores ADD MainIDs INT NULL DEFAULT NULL AFTER MainPrefix;
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'your In-portal account', 'your account')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'If you would like to proceed and change the password', 'If you would like to proceed with the change of your old password')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'You will receive a second email with your new password shortly.', 'Once clicked, you''ll be taken to taken to the page where you can set your new password.')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE EmailTemplates
+SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'Your password will not be changed unless you have clicked on the above link.', 'Your password will not be changed unless you successfully change it by following the above link.')
+WHERE TemplateName = 'USER.PSWDC';
+
+UPDATE LanguageLabels
+SET l1_Translation = 'Enter your Username or Email below to continue with resetting your password.'
+WHERE PhraseKey = 'LU_ENTERFORGOTUSEREMAIL';
+
+UPDATE LanguageLabels
+SET l1_Translation = REPLACE(l1_Translation, 'Please follow the link in the email in order to receive a new password.', 'Please follow the link in that email to set your new password.')
+WHERE PhraseKey = 'LU_TEXT_FORGOTPASSRESETEMAILSENT';
+
+UPDATE LanguageLabels
+SET l1_Translation = 'Your password has been successfully changed.'
+WHERE PhraseKey = 'LU_TEXT_FORGOTPASSHASBEENRESET';
+
# ===== v 5.3.0-B1 =====
ALTER TABLE ScheduledTasks ADD Settings TEXT NULL;
ALTER TABLE Themes ADD ImageResizeRules TEXT NULL;
Index: core/units/users/users_event_handler.php
===================================================================
--- core/units/users/users_event_handler.php
+++ core/units/users/users_event_handler.php
@@ -858,7 +858,10 @@
$is_email = strpos($email_or_username, '@') !== false;
if ( strlen($email_or_username) ) {
- $user->Load($email_or_username, $is_email ? 'Email' : 'Username');
+ $user->Load(array(
+ ($is_email ? 'Email' : 'Username') => $email_or_username,
+ 'UserType' => $this->Application->isAdmin ? UserType::ADMIN : UserType::USER,
+ ));
}
if ( $user->isLoaded() ) {
@@ -1936,6 +1939,8 @@
$user_helper->loginUserById( $user->GetID() );
}
}
+
+ $this->setNextTemplate($event);
}
/**
Index: themes/advanced/_install/english.lang
===================================================================
--- themes/advanced/_install/english.lang
+++ themes/advanced/_install/english.lang
@@ -22,6 +22,7 @@
<PHRASE Label="lu_btn_Clear" Module="Core" Type="0">Q2xlYXI=</PHRASE>
<PHRASE Label="lu_btn_CloseWindow" Module="Core" Type="0">Q2xvc2UgV2luZG93</PHRASE>
<PHRASE Label="lu_btn_Contact" Module="Core" Type="0">Q29udGFjdA==</PHRASE>
+ <PHRASE Label="lu_btn_Continue" Module="Core" Type="0">Q29udGludWU=</PHRASE>
<PHRASE Label="lu_btn_Create" Module="Core" Type="0">Q3JlYXRl</PHRASE>
<PHRASE Label="lu_btn_Delete" Module="Core" Type="0">RGVsZXRl</PHRASE>
<PHRASE Label="lu_btn_DeleteFile" Module="Core" Type="0">RGVsZXRlIEZpbGU=</PHRASE>
@@ -41,6 +42,7 @@
<PHRASE Label="lu_btn_Select" Module="Core" Type="0">U2VsZWN0</PHRASE>
<PHRASE Label="lu_btn_SendPassword" Module="Core" Type="0">UmVjb3ZlciBQYXNzd29yZA==</PHRASE>
<PHRASE Label="lu_btn_Set" Module="Core" Type="0">U2V0</PHRASE>
+ <PHRASE Label="lu_btn_SetNewPassword" Module="Core" Type="0">U2V0IE5ldyBQYXNzd29yZA==</PHRASE>
<PHRASE Label="lu_btn_Sort" Module="Core" Type="0">U29ydA==</PHRASE>
<PHRASE Label="lu_btn_Subscribe" Module="Core" Type="0">U3Vic2NyaWJl</PHRASE>
<PHRASE Label="lu_btn_Unsubscribe" Module="Core" Type="0">VW5zdWJzY3JpYmU=</PHRASE>
@@ -172,6 +174,7 @@
<PHRASE Label="lu_fld_module" Module="Core" Type="0">TW9kdWxl</PHRASE>
<PHRASE Label="lu_fld_MoreCategories" Module="Core" Type="0">QWRkaXRpb25hbCBDYXRlZ29yaWVz</PHRASE>
<PHRASE Label="lu_fld_Name" Module="Core" Type="0">TmFtZQ==</PHRASE>
+ <PHRASE Label="lu_fld_NewPassword" Module="Core" Type="0">TmV3IFBhc3N3b3Jk</PHRASE>
<PHRASE Label="lu_fld_Password" Module="Core" Type="0">UGFzc3dvcmQ=</PHRASE>
<PHRASE Label="lu_fld_Phone" Module="Core" Type="0">UGhvbmU=</PHRASE>
<PHRASE Label="lu_fld_phrase" Module="Core" Type="0">UGhyYXNl</PHRASE>
@@ -192,6 +195,7 @@
<PHRASE Label="lu_fld_translation" Module="Core" Type="0">VHJhbnNsYXRpb24=</PHRASE>
<PHRASE Label="lu_fld_UserGroup" Module="Core" Type="0">TWVtYmVyc2hpcCBHcm91cA==</PHRASE>
<PHRASE Label="lu_fld_Username" Module="Core" Type="0">VXNlcm5hbWU=</PHRASE>
+ <PHRASE Label="lu_fld_VerifyNewPassword" Module="Core" Type="0">UmVwZWF0IE5ldyBQYXNzd29yZA==</PHRASE>
<PHRASE Label="lu_fld_VerifyPassword" Module="Core" Type="0">VmVyaWZ5IFBhc3N3b3Jk</PHRASE>
<PHRASE Label="lu_fld_version" Module="Core" Type="0">VmVyc2lvbg==</PHRASE>
<PHRASE Label="lu_fld_Zip" Module="Core" Type="0">WmlwIGNvZGU=</PHRASE>
@@ -295,8 +299,9 @@
<PHRASE Label="lu_TermAndCondition" Module="Core" Type="0">VGVybXMgYW5kIENvbmRpdGlvbnMgb2YgVXNl</PHRASE>
<PHRASE Label="lu_TextUnsubscribe" Module="Core" Type="0">IFdlIGFyZSBzb3JyeSB5b3UgaGF2ZSB1bnN1YnNjcmliZWQgZnJvbSBvdXIgbWFpbGluZyBsaXN0</PHRASE>
<PHRASE Label="lu_text_DisabledAccountWarning" Module="Core" Type="0">WW91ciB1c2VyIGFjY291bnQgaXMgY3VycmVudGx5IHBlbmRpbmcgb3IgZGlzYWJsZWQuIElmIHlvdSBoYXZlIHJlZ2lzdHJlZCByZWNlbnRseSwgcGxlYXNlIHdhaXQgdW50aWwgeW91ciBhY2NvdW50IHdpbGwgYmUgYXBwcm92ZWQsIG90aGVyd2lzZSBwbGVhc2Ugd3JpdGU=</PHRASE>
- <PHRASE Label="lu_text_ForgotPassHasBeenReset" Module="Core" Type="0">WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gVGhlIG5ldyBwYXNzd29yZCBoYXMgYmVlbiBzZW50IHRvIHlvdXIgZS1tYWlsIGFkZHJlc3MuIFlvdSBtYXkgbm93IGxvZ2luIHdpdGggdGhlIG5ldyBwYXNzd29yZC4=</PHRASE>
- <PHRASE Label="lu_text_ForgotPassResetEmailSent" Module="Core" Type="0">WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhlIGVtYWlsIGluIG9yZGVyIHRvIHJlY2VpdmUgYSBuZXcgcGFzc3dvcmQu</PHRASE>
+ <PHRASE Label="lu_text_ForgotPassHasBeenReset" Module="Core" Type="0">WW91ciBwYXNzd29yZCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hhbmdlZC4=</PHRASE>
+ <PHRASE Label="lu_text_ForgotPassResetChangeForm" Module="Core" Type="0">UGxlYXNlIGVudGVyIHlvdXIgbmV3IHBhc3N3b3Jk</PHRASE>
+ <PHRASE Label="lu_text_ForgotPassResetEmailSent" Module="Core" Type="0">WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhhdCBlbWFpbCB0byBzZXQgeW91ciBuZXcgcGFzc3dvcmQu</PHRASE>
<PHRASE Label="lu_text_KeywordsTooShort" Module="Core" Type="0">VGhlIGtleXdvcmQgaXMgdG9vIHNob3J0</PHRASE>
<PHRASE Label="lu_text_NoComments" Module="Core" Type="0">Tm8gY29tbWVudHMsIGFkZCBmaXJzdA==</PHRASE>
<PHRASE Label="lu_text_NoPermission" Module="Core" Type="0">Tm8gcGVybWlzc2lvbnMgdG8gcGVyZm9ybSB0aGlzIG9wZXJhdGlvbg==</PHRASE>
@@ -328,6 +333,10 @@
<PHRASE Label="lu_title_ForgotPassword" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3Jk</PHRASE>
<PHRASE Label="lu_title_forgotpasswordconfirm" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIENvbmZpcm1hdGlvbg==</PHRASE>
<PHRASE Label="lu_title_ForgotPasswordNotification" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIE5vdGlmaWNhdGlvbg==</PHRASE>
+ <PHRASE Label="lu_title_ForgotPasswordStep1" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDEgb2YgNCk=</PHRASE>
+ <PHRASE Label="lu_title_ForgotPasswordStep2" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDIgb2YgNCk=</PHRASE>
+ <PHRASE Label="lu_title_ForgotPasswordStep3" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDMgb2YgNCk=</PHRASE>
+ <PHRASE Label="lu_title_ForgotPasswordStep4" Module="Core" Type="0">Rm9yZ290IFBhc3N3b3JkIChTdGVwIDQgb2YgNCk=</PHRASE>
<PHRASE Label="lu_title_LoginBox" Module="Core" Type="0">TG9naW4gQm94</PHRASE>
<PHRASE Label="lu_title_mailinglist" Module="Core" Type="0">TWFpbGluZyBMaXN0</PHRASE>
<PHRASE Label="lu_title_MaintenanceMode" Module="Core" Type="0">TWFpbnRlbmFuY2UgTW9kZQ==</PHRASE>
@@ -390,4 +399,4 @@
<PHRASE Label="lu_ZipCode" Module="Core" Type="0">WklQIENvZGU=</PHRASE>
</PHRASES>
</LANGUAGE>
-</LANGUAGES>
\ No newline at end of file
+</LANGUAGES>
Index: themes/advanced/platform/login/forgot_password.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password.tpl
+++ themes/advanced/platform/login/forgot_password.tpl
@@ -6,7 +6,7 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
- <inp2:m_phrase name="lu_title_ForgotPassword" no_editing="1"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep1" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
@@ -33,13 +33,13 @@
<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"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep1" 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_phrase name="lu_title_ForgotPasswordStep1"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_EnterForgotUserEmail"/>
@@ -61,7 +61,7 @@
<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="submit" class="button" name="events[u.forgot][OnForgotPassword]" value="<inp2:m_Phrase label='lu_btn_Continue' no_editing='1'/>" />
<input type="button" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');" value="<inp2:m_Phrase label="lu_btn_Cancel" no_editing="1"/>">
</inp2:m_RenderElement>
</table>
@@ -75,4 +75,4 @@
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset.tpl
+++ themes/advanced/platform/login/forgot_password_reset.tpl
@@ -6,7 +6,7 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
- <inp2:m_phrase name="lu_title_PasswordRequestConfirm" no_editing="1"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep3" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
@@ -33,27 +33,27 @@
<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_PasswordRequestConfirm" templates="platform/login/forgot_password_reset"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep3" templates="platform/login/forgot_password_reset"/>
</div>
<div class="movable-element">
<!-- forgot password reset -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
- <inp2:m_phrase name="lu_title_PasswordRequestConfirm"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep3"/>
</inp2:m_Capture>
- <inp2:m_Phrase label="lu_text_PasswordRequestConfirm"/>
+ <inp2:m_Phrase label="lu_text_ForgotPassResetChangeForm"/>
<br /><br />
<inp2:m_if check="u_TestCodeIsValid">
<form method="POST" action="<inp2:m_FormAction />">
<table class="form-data fullwidth">
- <inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="Password" title="lu_fld_Password" style="width:155px" />
- <inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" is_last="1"/>
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="Password" title="lu_fld_NewPassword" style="width:155px" />
+ <inp2:m_RenderElement name="inp_edit_password" prefix="u.forgot" field="VerifyPassword" title="lu_fld_VerifyNewPassword" style="width:155px" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
- <input class="button" type="submit" name="events[u.forgot][OnResetLostPassword]" value="<inp2:m_Phrase label='lu_btn_Update' no_editing='1'/>"/>
+ <input class="button" type="submit" name="events[u.forgot][OnResetLostPassword]" value="<inp2:m_Phrase label='lu_btn_SetNewPassword' no_editing='1'/>"/>
<input type="hidden" name="next_template" value="platform/login/forgot_password_reset_confirm"/>
</inp2:m_RenderElement>
</table>
@@ -74,4 +74,4 @@
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset_confirm.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset_confirm.tpl
+++ themes/advanced/platform/login/forgot_password_reset_confirm.tpl
@@ -6,7 +6,7 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
- <inp2:m_phrase name="lu_title_ForgotPasswordConfirm" no_editing="1"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep4" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
@@ -33,13 +33,13 @@
<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_ForgotPasswordConfirm" templates="platform/login/forgot_password_reset_confirm"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep4" templates="platform/login/forgot_password_reset_confirm"/>
</div>
<div class="movable-element">
<!-- forgot password reset confirm -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
- <inp2:m_phrase name="lu_title_ForgotPasswordConfirm"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep4"/>
</inp2:m_Capture>
<form method="POST" action="<inp2:m_FormAction />">
@@ -58,4 +58,4 @@
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->
Index: themes/advanced/platform/login/forgot_password_reset_notice.tpl
===================================================================
--- themes/advanced/platform/login/forgot_password_reset_notice.tpl
+++ themes/advanced/platform/login/forgot_password_reset_notice.tpl
@@ -6,7 +6,7 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
- <inp2:m_phrase name="lu_title_ForgotPasswordNotification" no_editing="1"/>
+ <inp2:m_phrase name="lu_title_ForgotPasswordStep2" no_editing="1"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
@@ -33,21 +33,16 @@
<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_ForgotPasswordNotification" templates="platform/login/forgot_password_reset_notice"/>
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ForgotPasswordStep2" templates="platform/login/forgot_password_reset_notice"/>
</div>
<div class="movable-element">
<!-- forgot password reset confirm -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
- <inp2:m_phrase name="lu_title_ForgotPasswordNotification"/>
+ <inp2:m_Phrase name="lu_title_ForgotPasswordStep2"/>
</inp2:m_Capture>
- <form method="POST" action="<inp2:m_FormAction />">
- <inp2:m_Phrase label="lu_text_ForgotPassResetEmailSent"/>
- <br /><br />
-
- <input type="button" value="<inp2:m_Phrase label="lu_btn_Ok" no_editing="1"/>" class="button" onclick="redirect('<inp2:m_Link template="index" no_amp="1" js_escape="1"/>');"/>
- </form>
+ <inp2:m_Phrase name="lu_text_ForgotPassResetEmailSent"/>
</inp2:m_RenderElement>
<!-- // forgot password reset confirm -->
</div>
@@ -57,4 +52,4 @@
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
-<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
+<!--## /DESIGN TEMPLATE ##-->

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server