changes as per discussion
This commit is contained in:
parent
996c9cbab3
commit
5a42829dbd
|
@ -4,12 +4,6 @@ home = Home
|
|||
dashboard = Dashboard
|
||||
explore = Explore
|
||||
help = Help
|
||||
auth_link_signup_tab = Register New Account
|
||||
auth_link_signup_title = Add Email and Password (for Account Recovery)
|
||||
auth_link_signup_submit = Complete Account
|
||||
auth_link_signin_tab = Link to Existing Account
|
||||
auth_link_signin_title = Sign In to Authorize Linked Account
|
||||
auth_link_signin_submit = Link Account
|
||||
sign_in = Sign In
|
||||
sign_in_with = Sign In With
|
||||
sign_out = Sign Out
|
||||
|
@ -228,6 +222,12 @@ twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your dev
|
|||
twofa_scratch_token_incorrect = Your scratch code is incorrect.
|
||||
login_userpass = Sign In
|
||||
login_openid = OpenID
|
||||
oauth_signup_tab = Register New Account
|
||||
oauth_signup_title = Add Email and Password (for Account Recovery)
|
||||
oauth_signup_submit = Complete Account
|
||||
oauth_signin_tab = Link to Existing Account
|
||||
oauth_signin_title = Sign In to Authorize Linked Account
|
||||
oauth_signin_submit = Link Account
|
||||
openid_connect_submit = Connect
|
||||
openid_connect_title = Connect to an existing account
|
||||
openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
|
||||
|
|
|
@ -660,16 +660,18 @@ func LinkAccount(ctx *context.Context) {
|
|||
ctx.Data["user_name"] = uname
|
||||
ctx.Data["email"] = email
|
||||
|
||||
if "" != uname {
|
||||
u, _ := models.GetUserByName(uname)
|
||||
if u != nil {
|
||||
ctx.Data["user_name_exists"] = "true"
|
||||
}
|
||||
}
|
||||
if "" != email {
|
||||
if len(email) != 0 {
|
||||
// ignoring the "user not found" error
|
||||
u, _ := models.GetUserByEmail(email)
|
||||
if u != nil {
|
||||
ctx.Data["email_exists"] = "true"
|
||||
ctx.Data["user_exists"] = true
|
||||
}
|
||||
} else if len(uname) != 0 {
|
||||
// ignoring the "user not found" error
|
||||
u, _ := models.GetUserByName(uname)
|
||||
fmt.Println("Error retrieving username:", err)
|
||||
if u != nil {
|
||||
ctx.Data["user_exists"] = true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -6,21 +6,21 @@
|
|||
|
||||
<div class="ui tabular menu">
|
||||
<!-- TODO handle .ShowRegistrationButton once other login bugs are fixed -->
|
||||
<div class="item {{if not (or .user_name_exists .email_exists)}}active{{end}}"
|
||||
<div class="item {{if not .user_exists}}active{{end}}"
|
||||
data-tab="auth-link-signup-tab">
|
||||
{{.i18n.Tr "auth_link_signup_tab"}}
|
||||
{{.i18n.Tr "auth.oauth_signup_tab"}}
|
||||
</div>
|
||||
<div class="item {{if or .user_name_exists .email_exists}}active{{end}}"
|
||||
<div class="item {{if .user_exists}}active{{end}}"
|
||||
data-tab="auth-link-signin-tab">
|
||||
{{.i18n.Tr "auth_link_signin_tab"}}
|
||||
{{.i18n.Tr "auth.oauth_signin_tab"}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui tab {{if not (or .user_name_exists .email_exists)}}active{{end}}"
|
||||
<div class="ui tab {{if not .user_exists}}active{{end}}"
|
||||
data-tab="auth-link-signup-tab">
|
||||
{{template "user/auth/signup_inner" .}}
|
||||
</div>
|
||||
<div class="ui tab {{if or .user_name_exists .email_exists}}active{{end}}"
|
||||
<div class="ui tab {{if .user_exists}}active{{end}}"
|
||||
data-tab="auth-link-signin-tab">
|
||||
<div class="ui user signin container icon">
|
||||
{{template "user/auth/signin_inner" .}}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{{end}}
|
||||
<h4 class="ui top attached header center">
|
||||
{{if .LinkAccountMode}}
|
||||
{{.i18n.Tr "auth_link_signin_title"}}
|
||||
{{.i18n.Tr "auth.oauth_signin_title"}}
|
||||
{{else}}
|
||||
{{.i18n.Tr "auth.login_userpass"}}
|
||||
{{end}}
|
||||
|
@ -33,7 +33,7 @@
|
|||
<label></label>
|
||||
<button class="ui green button">
|
||||
{{if .LinkAccountMode}}
|
||||
{{.i18n.Tr "auth_link_signin_submit"}}
|
||||
{{.i18n.Tr "auth.oauth_signin_submit"}}
|
||||
{{else}}
|
||||
{{.i18n.Tr "sign_in"}}
|
||||
{{end}}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
{{.CsrfTokenHtml}}
|
||||
<h3 class="ui top attached header">
|
||||
{{if .LinkAccountMode}}
|
||||
{{.i18n.Tr "auth_link_signup_title"}}
|
||||
{{.i18n.Tr "auth.oauth_signup_title"}}
|
||||
{{else}}
|
||||
{{.i18n.Tr "sign_up"}}
|
||||
{{end}}
|
||||
|
@ -48,7 +48,7 @@
|
|||
<label></label>
|
||||
<button class="ui green button">
|
||||
{{if .LinkAccountMode}}
|
||||
{{.i18n.Tr "auth_link_signup_submit"}}
|
||||
{{.i18n.Tr "auth.oauth_signup_submit"}}
|
||||
{{else}}
|
||||
{{.i18n.Tr "auth.create_new_account"}}
|
||||
{{end}}
|
||||
|
|
Loading…
Reference in New Issue