From b014bf792bd920b1555fa1b5dfe147b904a3599f Mon Sep 17 00:00:00 2001
From: sxw <sxwxs@msn.com>
Date: Sun, 29 Nov 2015 15:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E9=A1=B5=E9=9D=A2=E5=92=8Cjs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/oj/account/resetPassword.js |  7 +++---
 template/src/oj/account/reset_password.html   | 25 ++++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/static/src/js/app/oj/account/resetPassword.js b/static/src/js/app/oj/account/resetPassword.js
index 17b890b..9683019 100644
--- a/static/src/js/app/oj/account/resetPassword.js
+++ b/static/src/js/app/oj/account/resetPassword.js
@@ -2,13 +2,14 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
     var applied_captcha = false;
     $('form').validator().on('submit', function (e) {
         if (!e.isDefaultPrevented()) {
-            var email = $("#email").val();
+            var index = location.href.indexOf("/t/");
+            var token = location.href.substr(36+3, 32);
             var captcha = $("#captcha").val();
-
+            var password = $("#new_password").val();
             $.ajax({
                 beforeSend: csrfTokenHeader,
                 url: "/api/reset_password/",
-                data: {email: email, captcha: captcha},
+                data: {password: password, captcha: captcha, token:token},
                 dataType: "json",
                 method: "post",
                 success: function (data) {
diff --git a/template/src/oj/account/reset_password.html b/template/src/oj/account/reset_password.html
index 5b5dc70..ff72e45 100644
--- a/template/src/oj/account/reset_password.html
+++ b/template/src/oj/account/reset_password.html
@@ -6,16 +6,29 @@
     <div class="container main">
         <div class="col-md-6 col-md-offset-3">
             <h2 class="text-center">找回登录信息</h2><br>
-            <div>
-                <p>请输入你注册时使用的邮箱地址，系统将自动向你的邮箱发送一封含有您登录信息的电子邮件，
-                    你可以看到你的用户名，并可以选择重新设置登录密码，注意为了你的账户安全，重置密码链接仅在30分钟内有效</p>
-            </div>
             <br>
+
             <form id="login-form">
                 <div class="form-group">
                     <label for="email">注册电子邮件地址</label>
-                    <input type="email" class="form-control input-lg" id="email" name="email" placeholder="邮箱地址"
-                           data-remote="/api/email_check/?reset=true" data-remote-error="该邮箱未被注册！" data-error="请填写正确的邮箱地址"
+                    <input type="text" class="form-control input-lg" name="email" value="{{ user.email }}" readonly>
+                </div>
+                <div class="form-group">
+                    <label for="username">用户名</label>
+                    <input type="text" class="form-control input-lg" name="username" value="{{ user.username }}" readonly>
+                </div>
+                <div class="form-group">
+                    <label for="new_password">新密码</label>
+                    <input type="password" class="form-control input-lg" id="new_password" name="new_password"
+                           placeholder="新密码" maxlength="30" data-minlength="6" data-error="密码不得少于6位" required>
+
+                    <div class="help-block with-errors"></div>
+                </div>
+                <div class="form-group">
+                    <label for="confirm_password">确认密码</label>
+                    <input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password"
+                           placeholder="确认密码" maxlength="30" data-match="#new_password" data-error="请输入确认密码"
+                           data-match-error="两个密码不一致"
                            required>
 
                     <div class="help-block with-errors"></div>