From b1b36cec23273f7b848ef3ff28e2036fed2e3a68 Mon Sep 17 00:00:00 2001
From: life <lifephp@gmail.com>
Date: Tue, 27 May 2014 11:37:03 +0800
Subject: [PATCH] update email
---
app/service/UserService.go | 4 ++--
app/views/Note/note-dev.html | 2 +-
app/views/Note/note.html | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/service/UserService.go b/app/service/UserService.go
index 19f8073..c976f1b 100644
--- a/app/service/UserService.go
+++ b/app/service/UserService.go
@@ -212,7 +212,7 @@ func (this *UserService) UpdateEmailSendActiveEmail(userId, email string) (ok bo
body := "邮箱验证后您的登录邮箱为: <b>" + email + "</b><br />";
body += fmt.Sprintf("请点击链接验证邮箱: <a href='%v'>%v</a>. %v小时后过期.", url, url, tokenService.GetOverHours(info.TokenUpdateEmail));
if !SendEmail(email, "leanote-验证邮箱", "验证邮箱", body) {
- msg = "发送失败"
+ msg = "发送失败, 该邮箱存在?"
return
}
ok = true
@@ -291,4 +291,4 @@ func (this *UserService)UpdateColumnWidth(userId string, notebookWidth, noteList
// 左侧是否隐藏
func (this *UserService)UpdateLeftIsMin(userId string, leftIsMin bool) bool {
return db.UpdateByQMap(db.Users, bson.M{"_id": bson.ObjectIdHex(userId)}, bson.M{"LeftIsMin": leftIsMin})
-}
+}
\ No newline at end of file
diff --git a/app/views/Note/note-dev.html b/app/views/Note/note-dev.html
index 97454cd..014e5aa 100644
--- a/app/views/Note/note-dev.html
+++ b/app/views/Note/note-dev.html
@@ -834,7 +834,7 @@ function log(o) {
<tr>
<td>
- <button id="pwdBtn" class="btn btn-success" style="width: 100%">{{msg . "submit"}}</button>
+ <button id="pwdBtn" class="btn btn-success">{{msg . "submit"}}</button>
</td>
</tr>
</table>
diff --git a/app/views/Note/note.html b/app/views/Note/note.html
index e3b70c4..e052e7f 100755
--- a/app/views/Note/note.html
+++ b/app/views/Note/note.html
@@ -834,7 +834,7 @@ function log(o) {
<tr>
<td>
- <button id="pwdBtn" class="btn btn-success" style="width: 100%">{{msg . "submit"}}</button>
+ <button id="pwdBtn" class="btn btn-success">{{msg . "submit"}}</button>
</td>
</tr>
</table>