diff --git a/module/user/js/resetpassword.js b/module/user/js/resetpassword.js index b6cad7026b..cf0e722dc7 100644 --- a/module/user/js/resetpassword.js +++ b/module/user/js/resetpassword.js @@ -9,4 +9,6 @@ $(function() $('#time').text(time-1 <=0 ? 0 : time -1); }, 1000); } + + $('#password1').attr('id', 'password'); }) diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 80dacf410e..51f45c00ab 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -77,6 +77,7 @@ $lang->user->identity = 'Identity'; $lang->user->switchVision = 'Switch to %s'; $lang->user->submit = 'Submit'; $lang->user->resetPWD = 'Reset Password'; +$lang->user->resetTitle = 'Admin reset the password'; $lang->user->legendBasic = 'Basic Information'; $lang->user->legendContribution = 'Contribution'; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index 0b3c94188f..5d7438a819 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -77,6 +77,7 @@ $lang->user->identity = '身份'; $lang->user->switchVision = '切换到 %s'; $lang->user->submit = '提交'; $lang->user->resetPWD = '重置密码'; +$lang->user->resetTitle = '系统管理员重置密码'; $lang->user->legendBasic = '基本资料'; $lang->user->legendContribution = '个人贡献'; diff --git a/module/user/view/forgetpassword.html.php b/module/user/view/forgetpassword.html.php index 21df43dc61..2f3de19ea3 100644 --- a/module/user/view/forgetpassword.html.php +++ b/module/user/view/forgetpassword.html.php @@ -26,12 +26,12 @@ include '../../common/view/header.lite.html.php'; user->placeholder->email}'");?> - + user->resetTitle, '', "class='resetBox'");?> user->submit); - echo html::backButton(); + echo html::a(inlink('login'), $lang->goback, '', 'class="btn btn-wide"'); ?> diff --git a/module/user/view/resetpassword.html.php b/module/user/view/resetpassword.html.php index 424932c2bd..e387106bff 100644 --- a/module/user/view/resetpassword.html.php +++ b/module/user/view/resetpassword.html.php @@ -27,7 +27,7 @@ include '../../common/view/header.lite.html.php';
- user->placeholder->loginPassword}' id='password'");?> + user->placeholder->loginPassword}'");?>