diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bac0e8515a..b5bd435990 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -399,8 +399,8 @@ relevant_repositories = Only relevant repositories are being shown, %s. Please check your inbox within the next %s to complete the registration process. If the email is incorrect, you can log in, and request another confirmation email to be sent to a different address. must_change_password = Update your password @@ -473,6 +474,7 @@ sspi_auth_failed = SSPI authentication failed password_pwned = The password you chose is on a list of stolen passwords previously exposed in public data breaches. Please try again with a different password and consider changing this password elsewhere too. password_pwned_err = Could not complete request to HaveIBeenPwned last_admin = You cannot remove the last admin. There must be at least one admin. +back_to_sign_in = Back to Sign In [mail] view_it_on = View it on %s diff --git a/templates/user/auth/captcha.tmpl b/templates/user/auth/captcha.tmpl index 0e9c2b9d22..8dd4d1cc51 100644 --- a/templates/user/auth/captcha.tmpl +++ b/templates/user/auth/captcha.tmpl @@ -1,5 +1,5 @@ {{if .EnableCaptcha}}{{if eq .CaptchaType "image"}} -
+
{{.Captcha.CreateHTML}}
@@ -7,18 +7,17 @@
{{else if eq .CaptchaType "recaptcha"}} -
+
{{else if eq .CaptchaType "hcaptcha"}} -
+
{{else if eq .CaptchaType "mcaptcha"}} -
- +
diff --git a/templates/user/auth/oauth_container.tmpl b/templates/user/auth/oauth_container.tmpl new file mode 100644 index 0000000000..7599b49fbb --- /dev/null +++ b/templates/user/auth/oauth_container.tmpl @@ -0,0 +1,29 @@ +{{if or .OAuth2Providers .EnableOpenIDSignIn}} +
+ {{ctx.Locale.Tr "sign_in_or"}} +
+ +{{end}} diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index b0e9ce8c74..54cc82d49d 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -1,8 +1,7 @@ {{template "base/head" .}}
- {{template "user/auth/signin_navbar" .}}
-
+
{{template "user/auth/signin_inner" .}}
diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index 9872096fbc..b0a52d2c64 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -1,70 +1,65 @@ -{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} -{{template "base/alert" .}} -{{end}} -

- {{if .LinkAccountMode}} - {{ctx.Locale.Tr "auth.oauth_signin_title"}} - {{else}} - {{ctx.Locale.Tr "auth.login_userpass"}} +
+ {{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} + {{template "base/alert" .}} {{end}} -

-
-
- {{.CsrfTokenHtml}} -
- - -
- {{if or (not .DisablePassword) .LinkAccountMode}} -
- - -
- {{end}} - {{if not .LinkAccountMode}} -
-
- - -
-
- {{end}} - - {{template "user/auth/captcha" .}} - -
- - {{ctx.Locale.Tr "auth.forgot_password"}} -
- - {{if .ShowRegistrationButton}} -
- {{ctx.Locale.Tr "auth.sign_up_now"}} -
- {{end}} - - {{if .OAuth2Providers}} -
- {{ctx.Locale.Tr "sign_in_or"}} -
-
-
-
- {{range $provider := .OAuth2Providers}} - - {{end}} +

+ {{if .LinkAccountMode}} + {{ctx.Locale.Tr "auth.oauth_signin_title"}} + {{else}} + {{ctx.Locale.Tr "auth.login_userpass"}} + {{end}} +

+
+ + {{.CsrfTokenHtml}} +
+ +
-
+ {{if or (not .DisablePassword) .LinkAccountMode}} +
+ + {{ctx.Locale.Tr "auth.forgot_password"}} + +
+ {{end}} + {{if not .LinkAccountMode}} +
+
+ + +
+
+ {{end}} + + {{template "user/auth/captcha" .}} + +
+ +
+ + + {{template "user/auth/oauth_container" .}} +
+
+ +
+ {{template "user/auth/webauthn_error" .}} + +
+ + + {{if .ShowRegistrationButton}} +
+ {{ctx.Locale.Tr "auth.need_account"}} + {{ctx.Locale.Tr "auth.sign_up_now"}} +
+ {{end}}
- {{end}} -
diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl deleted file mode 100644 index 01b994b982..0000000000 --- a/templates/user/auth/signin_navbar.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -{{if or .EnableOpenIDSignIn .EnableSSPI}} - -
- - {{ctx.Locale.Tr "auth.tab_signin"}} - - - {{ctx.Locale.Tr "auth.tab_signup"}} - - {{if .EnableOpenIDSignIn}} - - {{svg "fontawesome-openid"}} -  {{ctx.Locale.Tr "auth.tab_openid"}} - - {{end}} - {{if .EnableSSPI}} - - {{svg "fontawesome-windows"}} -  SSPI - - {{end}} -
- -{{end}} diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl index c1f392dc13..20c7bdc924 100644 --- a/templates/user/auth/signin_openid.tmpl +++ b/templates/user/auth/signin_openid.tmpl @@ -1,35 +1,50 @@ {{template "base/head" .}}