mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 04:06:10 +01:00
95d9fbdcf3
On activating local accounts, the error message didn't differentiate
between using a wrong or expired token, or a wrong password. The result
could already be obtained from the behaviour (different screens were
presented), but the error message was misleading and lead to confusion
for new users on Codeberg with Forgejo.
Now, entering a wrong password for a valid token prints a different
error message.
The problem was introduced in 0f14f69e60.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
53 lines
2.1 KiB
Handlebars
53 lines
2.1 KiB
Handlebars
{{template "base/head" .}}
|
|
<div class="page-content user activate">
|
|
<div class="ui middle very relaxed page grid">
|
|
<div class="column">
|
|
<form class="ui form ignore-dirty" action="{{AppSubUrl}}/user/activate" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<h2 class="ui top attached header">
|
|
{{.locale.Tr "auth.active_your_account"}}
|
|
</h2>
|
|
<div class="ui attached segment">
|
|
{{template "base/alert" .}}
|
|
{{if .IsActivatePage}}
|
|
{{if .ServiceNotEnabled}}
|
|
<p class="center">{{.locale.Tr "auth.disable_register_mail"}}</p>
|
|
{{else if .ResendLimited}}
|
|
<p class="center">{{.locale.Tr "auth.resent_limit_prompt"}}</p>
|
|
{{else}}
|
|
<p>{{.locale.Tr "auth.confirmation_mail_sent_prompt" (.SignedUser.Email|Escape) .ActiveCodeLives | Str2html}}</p>
|
|
{{end}}
|
|
{{else}}
|
|
{{if .NeedsPassword}}
|
|
<div class="required inline field">
|
|
<label for="password">{{.locale.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" autocomplete="off" required>
|
|
</div>
|
|
<div class="inline field">
|
|
<label></label>
|
|
<button class="ui green button">{{.locale.Tr "install.confirm_password"}}</button>
|
|
</div>
|
|
<input id="code" name="code" type="hidden" value="{{.Code}}">
|
|
{{else if .IsSendRegisterMail}}
|
|
<p>{{.locale.Tr "auth.confirmation_mail_sent_prompt" (.Email|Escape) .ActiveCodeLives | Str2html}}</p>
|
|
{{else if .IsCodeInvalid}}
|
|
<p>{{.locale.Tr "auth.invalid_code"}}</p>
|
|
{{else if .IsPasswordInvalid}}
|
|
<p>{{.locale.Tr "auth.invalid_password"}}</p>
|
|
{{else if .ManualActivationOnly}}
|
|
<p class="center">{{.locale.Tr "auth.manual_activation_only"}}</p>
|
|
{{else}}
|
|
<p>{{.locale.Tr "auth.has_unconfirmed_mail" (.SignedUser.Name|Escape) (.SignedUser.Email|Escape) | Str2html}}</p>
|
|
<div class="ui divider"></div>
|
|
<div class="text right">
|
|
<button class="ui primary button">{{.locale.Tr "auth.resend_mail"}}</button>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|