From 0438bbb4140b1e89d6890464cc72a7e2cec7f536 Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Sat, 10 Oct 2015 14:53:50 +0800
Subject: [PATCH] =?UTF-8?q?email=20=E4=B8=8D=E8=AE=A9=E4=BF=AE=E6=94=B9!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/UserController.go | 4 ++--
app/views/member/user/email.html | 29 +++++++++++++++++++++++++----
app/views/member/user/password.html | 2 +-
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/app/controllers/UserController.go b/app/controllers/UserController.go
index c2b74b8..0ac9beb 100644
--- a/app/controllers/UserController.go
+++ b/app/controllers/UserController.go
@@ -94,7 +94,7 @@ func (c User) ReSendActiveEmail() revel.Result {
}
// 修改Email发送激活邮箱
-func (c User) UpdateEmailSendActiveEmail(email string) revel.Result {
+func (c User) updateEmailSendActiveEmail(email, pwd string) revel.Result {
re := info.NewRe()
if(c.GetUsername() == "demo") {
re.Msg = "cannotUpdateDemo"
@@ -193,4 +193,4 @@ func (c User) UpdateLeftIsMin(leftIsMin bool) revel.Result {
}
}
return c.RenderJson(re)
-}
\ No newline at end of file
+}
diff --git a/app/views/member/user/email.html b/app/views/member/user/email.html
index f99878b..541fa49 100644
--- a/app/views/member/user/email.html
+++ b/app/views/member/user/email.html
@@ -13,11 +13,15 @@
<span class="label label-green">{{msg . "verified"}}</span>
{{else}}
<span class="label label-red">{{msg . "unVerified"}}</span>
- <a class="raw nowToActive">{{msg . "verifiedNow"}}</a>
+ <a class="a raw nowToActive">{{msg . "verifiedNow"}}</a>
{{msg . "or"}}
- <a class="raw reSendActiveEmail">{{msg . "resendVerifiedEmail"}}</a>
+ <a class="a raw reSendActiveEmail">{{msg . "resendVerifiedEmail"}}</a>
{{end}}
+ <!--
+
+ <hr />
+
<div class="alert alert-danger" id="emailMsg" style="display: none"></div>
<div class="form-group">
<label>{{msg . "email"}}</label>
@@ -29,12 +33,28 @@
]'
data-msg_target="#emailMsg"
/>
- {{msg . "updateEmailTips"}}
+ <div class="form-tips">{{msg . "updateEmailTips"}}</div>
</div>
+
+ <div class="form-group">
+ <label class="control-label" for="pwd">{{msg . "password"}}</label>
+ <input type="password" class="form-control" id="pwd" name="pwd"
+ data-rules='[
+ {rule: "required", msg: "inputPassword"},
+ {rule: "password", msg: "errorPassword"}
+ ]'
+ data-msg_target="#emailMsg"
+ >
+ <div class="form-tips">{{msg . "inputLoginPasswordTips"}}</div>
+ </div>
+
+ -->
</div>
+ <!--
<footer class="panel-footer text-right bg-light lter">
<button type="submit" id="emailBtn" class="btn btn-success">{{msg . "submit"}}</button>
</footer>
+ -->
</section>
</form>
</div>
@@ -76,7 +96,8 @@ $("#emailBtn").click(function(e) {
return;
}
var email = $("#email").val();
- post("/user/updateEmailSendActiveEmail", {email: email}, function(e) {
+ var pwd = $("#pwd").val();
+ post("/user/updateEmailSendActiveEmail", {email: email, pwd: pwd}, function(e) {
if(e.Ok) {
var url = getEmailLoginAddress(email);
showAlert("#emailMsg", getMsg("verifiedEmaiHasSent") +" <a href='" + url + "' target='_blank'>" + getMsg("checkEmail") + "</a>", "success");
diff --git a/app/views/member/user/password.html b/app/views/member/user/password.html
index 7a791e4..778c5f0 100644
--- a/app/views/member/user/password.html
+++ b/app/views/member/user/password.html
@@ -24,7 +24,7 @@
]'
data-msg_target="#pwdMsg"
>
- {{msg . "passwordTips"}}
+ <div class="form-tips">{{msg . "passwordTips"}}</div>
</div>
<div class="form-group">
<label class="control-label" for="pwd2">{{msg . "password2"}}</label>