Finish new reset password, etc.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@ __pycache__
|
||||
*.pem
|
||||
output*
|
||||
config.codekit
|
||||
.brackets.json
|
||||
|
@ -52,9 +52,23 @@ create_new_account = Create New Account
|
||||
register_hepler_msg = Already have an account? Sign in now!
|
||||
social_register_hepler_msg = Already have an account? Bind now!
|
||||
disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
|
||||
disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
|
||||
remember_me = Remember Me
|
||||
forgot_password= Fotgot Password
|
||||
forget_password = Fotget password?
|
||||
sign_up_now = Need an account? Sign up now.
|
||||
confirmation_mail_sent_prompt = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete your registration.
|
||||
sign_in_email = Sign in to your e-mail
|
||||
active_your_account = Activate Your Account
|
||||
resent_limit_prompt = Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.
|
||||
has_unconfirmed_mail = Hi %s, you have an unconfirmed email address(<b>%s</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.
|
||||
resend_mail = Click here to resend your activation e-mail
|
||||
email_not_associate = This e-mail address does not associate to any account.
|
||||
send_reset_mail = Click here to (re)send your passowrd reset e-mail
|
||||
reset_password = Reset Your Password
|
||||
invalid_code = Sorry, your confirmation code has exipired or not valid.
|
||||
reset_password_helper = Click here to reset your password
|
||||
password_too_short = Password length cannot be less then 6.
|
||||
|
||||
[form]
|
||||
UserName = Username
|
||||
|
@ -52,9 +52,23 @@ create_new_account = 创建帐户
|
||||
register_hepler_msg = 已经注册?立即登录!
|
||||
social_register_hepler_msg = 已经注册?立即绑定!
|
||||
disable_register_prompt = 对不起,注册功能已被关闭。请联系网站管理员。
|
||||
disable_register_mail = 对不起,注册邮箱确认功能已被关闭。
|
||||
remember_me = 记住登录
|
||||
forgot_password = 忘记密码
|
||||
forget_password = 忘记密码?
|
||||
sign_up_now = 还没帐户?马上注册。
|
||||
confirmation_mail_sent_prompt = 一封新的确认邮件已经被发送至 <b>%s</b>,请检查您的收件箱并在 %d 小时内完成确认注册操作。
|
||||
sign_in_email = 登录到您的邮箱
|
||||
active_your_account = 激活您的帐户
|
||||
resent_limit_prompt = 对不起,您请求发送激活邮件过于频繁,请等待 3 分钟后再试!
|
||||
has_unconfirmed_mail = %s 您好,系统检测到您有一封发送至 <b>%s</b> 但未被确认的邮件。如果您未收到激活邮件,或需要重新发送,请单击下方的按钮。
|
||||
resend_mail = 单击此处重新发送确认邮件
|
||||
email_not_associate = 您输入的邮箱地址未被关联到任何帐号!
|
||||
send_reset_mail = 单击此处(重新)发送您的密码重置邮件
|
||||
reset_password = 重置密码
|
||||
invalid_code = 对不起,您的确认代码已过期或已失效。
|
||||
reset_password_helper = 单击此处重置密码
|
||||
password_too_short = 密码长度不能少于 6 位!
|
||||
|
||||
[form]
|
||||
UserName = 用户名
|
||||
|
@ -5,6 +5,7 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
@ -43,6 +44,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
|
||||
}
|
||||
|
||||
if options.SignInRequire {
|
||||
fmt.Println(ctx.User.IsActive, setting.Service.RegisterEmailConfirm)
|
||||
if !ctx.IsSigned {
|
||||
// Ignore watch repository operation.
|
||||
if strings.HasSuffix(ctx.Req.RequestURI, "watch") {
|
||||
@ -52,7 +54,7 @@ func Toggle(options *ToggleOptions) macaron.Handler {
|
||||
ctx.Redirect("/user/login")
|
||||
return
|
||||
} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
|
||||
// ctx.Data["Title"] = "Activate Your Account"
|
||||
ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
|
||||
ctx.HTML(200, "user/activate")
|
||||
return
|
||||
}
|
||||
|
@ -435,6 +435,7 @@ dt {
|
||||
}
|
||||
.btn-link {
|
||||
overflow: visible;
|
||||
color: white;
|
||||
padding: .6em 1.2em;
|
||||
}
|
||||
.btn-radius {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -81,6 +81,7 @@
|
||||
}
|
||||
.btn-link {
|
||||
overflow: visible;
|
||||
color: white;
|
||||
padding: .6em 1.2em;
|
||||
}
|
||||
.btn-radius {
|
||||
|
@ -17,7 +17,12 @@ const (
|
||||
|
||||
func Home(ctx *middleware.Context) {
|
||||
if ctx.IsSigned {
|
||||
user.Dashboard(ctx)
|
||||
if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
|
||||
ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
|
||||
ctx.HTML(200, user.ACTIVATE)
|
||||
} else {
|
||||
user.Dashboard(ctx)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -106,10 +106,9 @@ func SignInPost(ctx *middleware.Context, form auth.SignInForm) {
|
||||
if err != nil {
|
||||
if err == models.ErrUserNotExist {
|
||||
ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &form)
|
||||
return
|
||||
} else {
|
||||
ctx.Handle(500, "UserSignIn", err)
|
||||
}
|
||||
|
||||
ctx.Handle(500, "UserSignIn", err)
|
||||
return
|
||||
}
|
||||
|
||||
@ -294,55 +293,59 @@ func SignUpPost(ctx *middleware.Context, cpt *captcha.Captcha, form auth.Registe
|
||||
}
|
||||
|
||||
func Activate(ctx *middleware.Context) {
|
||||
// code := ctx.Query("code")
|
||||
// if len(code) == 0 {
|
||||
// ctx.Data["IsActivatePage"] = true
|
||||
// if ctx.User.IsActive {
|
||||
// ctx.Handle(404, "user.Activate", nil)
|
||||
// return
|
||||
// }
|
||||
// // Resend confirmation e-mail.
|
||||
// if setting.Service.RegisterEmailConfirm {
|
||||
// if ctx.Cache.IsExist("MailResendLimit_" + ctx.User.LowerName) {
|
||||
// ctx.Data["ResendLimited"] = true
|
||||
// } else {
|
||||
// ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
|
||||
// mailer.SendActiveMail(ctx.Render, ctx.User)
|
||||
code := ctx.Query("code")
|
||||
if len(code) == 0 {
|
||||
ctx.Data["IsActivatePage"] = true
|
||||
if ctx.User.IsActive {
|
||||
ctx.Error(404)
|
||||
return
|
||||
}
|
||||
// Resend confirmation e-mail.
|
||||
if setting.Service.RegisterEmailConfirm {
|
||||
if ctx.Cache.IsExist("MailResendLimit_" + ctx.User.LowerName) {
|
||||
ctx.Data["ResendLimited"] = true
|
||||
} else {
|
||||
ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
|
||||
mailer.SendActiveMail(ctx.Render, ctx.User)
|
||||
|
||||
// if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
|
||||
// log.Error("Set cache(MailResendLimit) fail: %v", err)
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// ctx.Data["ServiceNotEnabled"] = true
|
||||
// }
|
||||
// ctx.HTML(200, ACTIVATE)
|
||||
// return
|
||||
// }
|
||||
if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil {
|
||||
log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
ctx.Data["ServiceNotEnabled"] = true
|
||||
}
|
||||
ctx.HTML(200, ACTIVATE)
|
||||
return
|
||||
}
|
||||
|
||||
// // Verify code.
|
||||
// if user := models.VerifyUserActiveCode(code); user != nil {
|
||||
// user.IsActive = true
|
||||
// user.Rands = models.GetUserSalt()
|
||||
// if err := models.UpdateUser(user); err != nil {
|
||||
// ctx.Handle(404, "user.Activate", err)
|
||||
// return
|
||||
// }
|
||||
// Verify code.
|
||||
if user := models.VerifyUserActiveCode(code); user != nil {
|
||||
user.IsActive = true
|
||||
user.Rands = models.GetUserSalt()
|
||||
if err := models.UpdateUser(user); err != nil {
|
||||
if err == models.ErrUserNotExist {
|
||||
ctx.Error(404)
|
||||
} else {
|
||||
ctx.Handle(500, "UpdateUser", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// log.Trace("%s User activated: %s", ctx.Req.RequestURI, user.Name)
|
||||
log.Trace("User activated: %s", user.Name)
|
||||
|
||||
// ctx.Session.Set("userId", user.Id)
|
||||
// ctx.Session.Set("userName", user.Name)
|
||||
// ctx.Redirect("/")
|
||||
// return
|
||||
// }
|
||||
ctx.Session.Set("uid", user.Id)
|
||||
ctx.Session.Set("uname", user.Name)
|
||||
ctx.Redirect("/")
|
||||
return
|
||||
}
|
||||
|
||||
// ctx.Data["IsActivateFailed"] = true
|
||||
// ctx.HTML(200, ACTIVATE)
|
||||
ctx.Data["IsActivateFailed"] = true
|
||||
ctx.HTML(200, ACTIVATE)
|
||||
}
|
||||
|
||||
func ForgotPasswd(ctx *middleware.Context) {
|
||||
ctx.Data["Title"] = "Forgot Password"
|
||||
ctx.Data["Title"] = ctx.Tr("auth.forgot_password")
|
||||
|
||||
if setting.MailService == nil {
|
||||
ctx.Data["IsResetDisable"] = true
|
||||
@ -355,44 +358,45 @@ func ForgotPasswd(ctx *middleware.Context) {
|
||||
}
|
||||
|
||||
func ForgotPasswdPost(ctx *middleware.Context) {
|
||||
// ctx.Data["Title"] = "Forgot Password"
|
||||
ctx.Data["Title"] = ctx.Tr("auth.forgot_password")
|
||||
|
||||
// if setting.MailService == nil {
|
||||
// ctx.Handle(403, "user.ForgotPasswdPost", nil)
|
||||
// return
|
||||
// }
|
||||
// ctx.Data["IsResetRequest"] = true
|
||||
if setting.MailService == nil {
|
||||
ctx.Handle(403, "user.ForgotPasswdPost", nil)
|
||||
return
|
||||
}
|
||||
ctx.Data["IsResetRequest"] = true
|
||||
|
||||
// email := ctx.Query("email")
|
||||
// u, err := models.GetUserByEmail(email)
|
||||
// if err != nil {
|
||||
// if err == models.ErrUserNotExist {
|
||||
// ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil)
|
||||
// } else {
|
||||
// ctx.Handle(500, "user.ResetPasswd(check existence)", err)
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
email := ctx.Query("email")
|
||||
u, err := models.GetUserByEmail(email)
|
||||
if err != nil {
|
||||
if err == models.ErrUserNotExist {
|
||||
ctx.Data["Err_Email"] = true
|
||||
ctx.RenderWithErr(ctx.Tr("auth.email_not_associate"), FORGOT_PASSWORD, nil)
|
||||
} else {
|
||||
ctx.Handle(500, "user.ResetPasswd(check existence)", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// if ctx.Cache.IsExist("MailResendLimit_" + u.LowerName) {
|
||||
// ctx.Data["ResendLimited"] = true
|
||||
// ctx.HTML(200, FORGOT_PASSWORD)
|
||||
// return
|
||||
// }
|
||||
if ctx.Cache.IsExist("MailResendLimit_" + u.LowerName) {
|
||||
ctx.Data["ResendLimited"] = true
|
||||
ctx.HTML(200, FORGOT_PASSWORD)
|
||||
return
|
||||
}
|
||||
|
||||
// mailer.SendResetPasswdMail(ctx.Render, u)
|
||||
// if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil {
|
||||
// log.Error("Set cache(MailResendLimit) fail: %v", err)
|
||||
// }
|
||||
mailer.SendResetPasswdMail(ctx.Render, u)
|
||||
if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil {
|
||||
log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
|
||||
}
|
||||
|
||||
// ctx.Data["Email"] = email
|
||||
// ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
|
||||
// ctx.Data["IsResetSent"] = true
|
||||
// ctx.HTML(200, FORGOT_PASSWORD)
|
||||
ctx.Data["Email"] = email
|
||||
ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
|
||||
ctx.Data["IsResetSent"] = true
|
||||
ctx.HTML(200, FORGOT_PASSWORD)
|
||||
}
|
||||
|
||||
func ResetPasswd(ctx *middleware.Context) {
|
||||
ctx.Data["Title"] = "Reset Password"
|
||||
ctx.Data["Title"] = ctx.Tr("auth.reset_password")
|
||||
|
||||
code := ctx.Query("code")
|
||||
if len(code) == 0 {
|
||||
@ -405,38 +409,39 @@ func ResetPasswd(ctx *middleware.Context) {
|
||||
}
|
||||
|
||||
func ResetPasswdPost(ctx *middleware.Context) {
|
||||
// ctx.Data["Title"] = "Reset Password"
|
||||
ctx.Data["Title"] = ctx.Tr("auth.reset_password")
|
||||
|
||||
// code := ctx.Query("code")
|
||||
// if len(code) == 0 {
|
||||
// ctx.Error(404)
|
||||
// return
|
||||
// }
|
||||
// ctx.Data["Code"] = code
|
||||
code := ctx.Query("code")
|
||||
if len(code) == 0 {
|
||||
ctx.Error(404)
|
||||
return
|
||||
}
|
||||
ctx.Data["Code"] = code
|
||||
|
||||
// if u := models.VerifyUserActiveCode(code); u != nil {
|
||||
// // Validate password length.
|
||||
// passwd := ctx.Query("passwd")
|
||||
// if len(passwd) < 6 || len(passwd) > 30 {
|
||||
// ctx.Data["IsResetForm"] = true
|
||||
// ctx.RenderWithErr("Password length should be in 6 and 30.", "user/reset_passwd", nil)
|
||||
// return
|
||||
// }
|
||||
if u := models.VerifyUserActiveCode(code); u != nil {
|
||||
// Validate password length.
|
||||
passwd := ctx.Query("password")
|
||||
if len(passwd) < 6 {
|
||||
ctx.Data["IsResetForm"] = true
|
||||
ctx.Data["Err_Password"] = true
|
||||
ctx.RenderWithErr(ctx.Tr("auth.password_too_short"), RESET_PASSWORD, nil)
|
||||
return
|
||||
}
|
||||
|
||||
// u.Passwd = passwd
|
||||
// u.Rands = models.GetUserSalt()
|
||||
// u.Salt = models.GetUserSalt()
|
||||
// u.EncodePasswd()
|
||||
// if err := models.UpdateUser(u); err != nil {
|
||||
// ctx.Handle(500, "user.ResetPasswd(UpdateUser)", err)
|
||||
// return
|
||||
// }
|
||||
u.Passwd = passwd
|
||||
u.Rands = models.GetUserSalt()
|
||||
u.Salt = models.GetUserSalt()
|
||||
u.EncodePasswd()
|
||||
if err := models.UpdateUser(u); err != nil {
|
||||
ctx.Handle(500, "UpdateUser", err)
|
||||
return
|
||||
}
|
||||
|
||||
// log.Trace("%s User password reset: %s", ctx.Req.RequestURI, u.Name)
|
||||
// ctx.Redirect("/user/login")
|
||||
// return
|
||||
// }
|
||||
log.Trace("User password reset: %s", u.Name)
|
||||
ctx.Redirect("/user/login")
|
||||
return
|
||||
}
|
||||
|
||||
// ctx.Data["IsResetFailed"] = true
|
||||
// ctx.HTML(200, RESET_PASSWORD)
|
||||
ctx.Data["IsResetFailed"] = true
|
||||
ctx.HTML(200, RESET_PASSWORD)
|
||||
}
|
||||
|
@ -1,5 +0,0 @@
|
||||
{
|
||||
"language.fileExtensions": {
|
||||
"tmpl": "html"
|
||||
}
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
{{template "ng/base/head" .}} {{template "ng/base/header" .}}
|
||||
{{template "ng/base/head" .}}
|
||||
{{template "ng/base/header" .}}
|
||||
<div id="promo-wrapper">
|
||||
<div class="container clear">
|
||||
<div id="promo-logo" class="left">
|
||||
|
@ -1,36 +1,39 @@
|
||||
{{template "base/head" .}}
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container">
|
||||
<form action="/user/activate" method="post" class="form-horizontal card" id="login-card">
|
||||
{{template "ng/base/head" .}}
|
||||
{{template "ng/base/header" .}}
|
||||
<div id="sign-wrapper">
|
||||
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="/user/activate" method="post">
|
||||
{{.CsrfTokenHtml}}
|
||||
<h3>Activate Your Account</h3>
|
||||
<div class="panel-header">
|
||||
<h2>{{.i18n.Tr "auth.active_your_account"}}</h2>
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
{{if .IsActivatePage}}
|
||||
{{if .ServiceNotEnabled}}
|
||||
<p>Sorry, Register Mail Confirmation has been disabled.</p>
|
||||
<p>{{.i18n.Tr "auth.disable_register_mail"}}</p>
|
||||
{{else if .ResendLimited}}
|
||||
<p>Sorry, you are sending an activation e-mail too frequently. Please wait 3 minutes.</p>
|
||||
<p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
|
||||
{{else}}
|
||||
<p>A new confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within the next {{.Hours}} hours to complete your registration.</p>
|
||||
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p>
|
||||
<hr/>
|
||||
<a href="http://{{Mail2Domain .SignedUser.Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
|
||||
<label></label>
|
||||
<a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a>
|
||||
{{end}}
|
||||
{{else}}
|
||||
{{if .IsSendRegisterMail}}
|
||||
<p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within the next {{.Hours}} hours to complete your registration.</p>
|
||||
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
|
||||
<hr/>
|
||||
<a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
|
||||
<label></label>
|
||||
<a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a>
|
||||
{{else if .IsActivateFailed}}
|
||||
<p>Sorry, your confirmation code has exipired or not valid.</p>
|
||||
<p>{{.i18n.Tr "auth.invalid_code"}}</p>
|
||||
{{else}}
|
||||
<p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click on the button below.</p>
|
||||
<hr/>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-4 col-md-6">
|
||||
<button type="submit" class="btn btn-lg btn-primary">Click here to resend your activation e-mail</button>
|
||||
</div>
|
||||
</div>
|
||||
<p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
|
||||
<hr/>
|
||||
<label></label>
|
||||
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.resend_mail"}}</button>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
{{template "ng/base/footer" .}}
|
||||
|
@ -1,32 +1,32 @@
|
||||
{{template "base/head" .}}
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container">
|
||||
<form action="/user/forget_password" method="post" class="form-horizontal card" id="login-card">
|
||||
{{template "ng/base/head" .}}
|
||||
{{template "ng/base/header" .}}
|
||||
<div id="sign-wrapper">
|
||||
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="/user/forget_password" method="post">
|
||||
{{.CsrfTokenHtml}}
|
||||
<h3>Reset Your Password</h3>
|
||||
{{template "base/alert" .}}
|
||||
{{if .IsResetSent}}
|
||||
<p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours.</p>
|
||||
<hr/>
|
||||
<a href="http://{{Mail2Domain .Email}}" class="btn btn-lg btn-success">Sign in to your e-mail</a>
|
||||
{{else if .IsResetRequest}}
|
||||
<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
|
||||
<label class="col-md-3 control-label">Email: </label>
|
||||
<div class="col-md-7">
|
||||
<input name="email" class="form-control" placeholder="Type your e-mail address" required="required">
|
||||
</div>
|
||||
<div class="panel-header">
|
||||
<h2>{{.i18n.Tr "auth.forgot_password"}}</h2>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-4 col-md-6">
|
||||
<button type="submit" class="btn btn-lg btn-primary">Click here to send resend confirmation e-mail</button>
|
||||
<div class="panel-content">
|
||||
{{template "ng/base/alert" .}}
|
||||
{{if .IsResetSent}}
|
||||
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
|
||||
<hr/>
|
||||
<label></label>
|
||||
<a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a>
|
||||
{{else if .IsResetRequest}}
|
||||
<div class="field">
|
||||
<label class="req" for="email">{{.i18n.Tr "email"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}"required/>
|
||||
</div>
|
||||
<hr/>
|
||||
<label></label>
|
||||
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.send_reset_mail"}}</button>
|
||||
{{else if .IsResetDisable}}
|
||||
<p>{{.i18n.Tr "auth.disable_register_mail"}}</p>
|
||||
{{else if .ResendLimited}}
|
||||
<p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
|
||||
{{end}}
|
||||
</div>
|
||||
{{else if .IsResetDisable}}
|
||||
<p>Sorry, mail service is not enabled.</p>
|
||||
{{else if .ResendLimited}}
|
||||
<p>Sorry, you are sending an e-mail too frequently, please wait another 3 minutes and try again.</p>
|
||||
{{end}}
|
||||
</form>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
{{template "ng/base/footer" .}}
|
||||
|
@ -1,26 +1,25 @@
|
||||
{{template "base/head" .}}
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container">
|
||||
<form action="/user/reset_password?code={{.Code}}" method="post" class="form-horizontal card" id="login-card">
|
||||
{{template "ng/base/head" .}}
|
||||
{{template "ng/base/header" .}}
|
||||
<div id="sign-wrapper">
|
||||
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="/user/reset_password?code={{.Code}}" method="post">
|
||||
{{.CsrfTokenHtml}}
|
||||
<h3>Reset Your Pasword</h3>
|
||||
{{template "base/alert" .}}
|
||||
{{if .IsResetForm}}
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label">Password: </label>
|
||||
<div class="col-md-6">
|
||||
<input name="passwd" type="password" class="form-control" placeholder="Type your password" required="required">
|
||||
</div>
|
||||
<div class="panel-header">
|
||||
<h2>{{.i18n.Tr "auth.reset_password"}}</h2>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-4 col-md-6">
|
||||
<button type="submit" class="btn btn-lg btn-primary">Click here to reset your password</button>
|
||||
<div class="panel-content">
|
||||
{{template "ng/base/alert" .}}
|
||||
{{if .IsResetForm}}
|
||||
<div class="field">
|
||||
<label class="req" for="password">{{.i18n.Tr "password"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/>
|
||||
</div>
|
||||
<hr/>
|
||||
<label></label>
|
||||
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.reset_password_helper"}}</button>
|
||||
{{else}}
|
||||
<p>{{.i18n.Tr "auth.invalid_code"}}</p>
|
||||
{{end}}
|
||||
</div>
|
||||
{{else}}
|
||||
<p>Sorry, your confirmation code has expired or is not valid.</p>
|
||||
{{end}}
|
||||
</form>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
{{template "ng/base/footer" .}}
|
||||
|
@ -7,30 +7,30 @@
|
||||
</div>
|
||||
<div class="panel-content">
|
||||
{{template "ng/base/alert" .}}
|
||||
<p class="field">
|
||||
<div class="field">
|
||||
<label class="req" for="username">{{.i18n.Tr "home.uname_holder"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.uname}}" required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="req" for="password">{{.i18n.Tr "password"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" required/>
|
||||
</p>
|
||||
</div>
|
||||
{{if not .IsSocialLogin}}
|
||||
<p class="field">
|
||||
<div class="field">
|
||||
<span class="form-label"></span>
|
||||
<input class="ipt-chk" id="remember" name="remember" type="checkbox"/> <strong>{{.i18n.Tr "auth.remember_me"}}</strong>
|
||||
</p>
|
||||
</div>
|
||||
{{end}}
|
||||
<p class="field">
|
||||
<div class="field">
|
||||
<span class="form-label"></span>
|
||||
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>
|
||||
{{if not .IsSocialLogin}}<a href="/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
|
||||
</p>
|
||||
</div>
|
||||
{{if not .IsSocialLogin}}
|
||||
<p class="field">
|
||||
<span class="form-label"></span>
|
||||
<div class="field">
|
||||
<label></label>
|
||||
<a href="/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
|
||||
</p>
|
||||
</div>
|
||||
{{if .OauthEnabled}}
|
||||
<hr/>
|
||||
<div id="sign-social" class="text-center social-buttons">
|
||||
|
@ -10,38 +10,38 @@
|
||||
{{if .DisableRegistration}}
|
||||
<p>{{.i18n.Tr "auth.disable_register_prompt"}}</p>
|
||||
{{else}}
|
||||
<p class="field">
|
||||
<div class="field">
|
||||
<label class="req" for="username">{{.i18n.Tr "username"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.uname}}" required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="req" for="email">{{.i18n.Tr "email"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}"required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="req" for="password">{{.i18n.Tr "password"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="req" for="re-type">{{.i18n.Tr "re_type"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="re-type" name="retype" type="password" required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label></label>
|
||||
{{.Captcha.CreateHtml}}
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<label class="req" for="captcha">{{.i18n.Tr "captcha"}}</label>
|
||||
<input class="ipt ipt-large ipt-radius {{if .Err_Captcha}}ipt-error{{end}}" id="captcha" name="captcha" type="text" required/>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<span class="form-label"></span>
|
||||
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.create_new_account"}}</button>
|
||||
</p>
|
||||
<p class="field">
|
||||
</div>
|
||||
<div class="field">
|
||||
<span class="form-label"></span>
|
||||
<a href="/user/login">{{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}}</a>
|
||||
</p>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</form>
|
||||
|
Reference in New Issue
Block a user