mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-14 05:01:13 +00:00
3acea02eb6
There are a few inconsistencies within Gitea and this PR addresses one of them. This PR updates the sign-in page layout, including the register and openID tabs, to match the layout of the settings pages (/user/settings) for more consistency. This PR updates the following routes: `/user/login` `/user/sign_up` `/user/login/openid` `/user/forgot_password` `/user/link_account` `/user/recover_account` **Before** <img width="968" alt="Screenshot 2024-02-05 at 8 27 24 AM" src="https://github.com/go-gitea/gitea/assets/6152817/fb0cb517-57c0-4eed-be1d-56f36bd1960d"> **After** <img width="968" alt="Screenshot 2024-02-05 at 8 26 39 AM" src="https://github.com/go-gitea/gitea/assets/6152817/428d691d-0a42-4a67-a646-05527f2a7b41"> This PR addresses a revert of the original PR due to this [comment](https://github.com/go-gitea/gitea/pull/28753#issuecomment-1956596817). --------- Co-authored-by: rafh <rafaelheard@gmail.com>
61 lines
2.5 KiB
Go HTML Template
61 lines
2.5 KiB
Go HTML Template
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content user activate">
|
|
<div class="ui middle very relaxed page grid">
|
|
<div class="column">
|
|
<form class="ui form ignore-dirty tw-max-w-2xl tw-m-auto" action="{{AppSubUrl}}/user/activate" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<h2 class="ui top attached header">
|
|
{{ctx.Locale.Tr "auth.active_your_account"}}
|
|
</h2>
|
|
<div class="ui attached segment">
|
|
{{template "base/alert" .}}
|
|
{{if .IsActivatePage}}
|
|
{{if .ServiceNotEnabled}}
|
|
<p class="center">{{ctx.Locale.Tr "auth.disable_register_mail"}}</p>
|
|
{{else if .ResendLimited}}
|
|
<p class="center">{{ctx.Locale.Tr "auth.resent_limit_prompt"}}</p>
|
|
{{else}}
|
|
<p>{{ctx.Locale.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .ActiveCodeLives}}</p>
|
|
{{end}}
|
|
{{else}}
|
|
{{if .NeedsPassword}}
|
|
<div class="required field">
|
|
<label for="password">{{ctx.Locale.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" autocomplete="off" required>
|
|
</div>
|
|
<div class="inline field">
|
|
<button class="ui primary button">{{ctx.Locale.Tr "install.confirm_password"}}</button>
|
|
</div>
|
|
<input id="code" name="code" type="hidden" value="{{.Code}}">
|
|
{{else if .IsSendRegisterMail}}
|
|
<p>{{ctx.Locale.Tr "auth.confirmation_mail_sent_prompt" .Email .ActiveCodeLives}}</p>
|
|
{{else if .IsCodeInvalid}}
|
|
<p>{{ctx.Locale.Tr "auth.invalid_code"}}</p>
|
|
{{else if .IsPasswordInvalid}}
|
|
<p>{{ctx.Locale.Tr "auth.invalid_password"}}</p>
|
|
{{else if .ManualActivationOnly}}
|
|
<p class="center">{{ctx.Locale.Tr "auth.manual_activation_only"}}</p>
|
|
{{else}}
|
|
<p>{{ctx.Locale.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email}}</p>
|
|
<div class="divider"></div>
|
|
<details class="inline field">
|
|
<summary>{{ctx.Locale.Tr "auth.change_unconfirmed_email_summary"}}</summary>
|
|
|
|
<p>{{ctx.Locale.Tr "auth.change_unconfirmed_email"}}</p>
|
|
<div class="inline field">
|
|
<label for="email">{{ctx.Locale.Tr "email"}}</label>
|
|
<input id="email" name="email" type="email" autocomplete="on">
|
|
</div>
|
|
</details>
|
|
|
|
<div class="text">
|
|
<button class="ui primary button">{{ctx.Locale.Tr "auth.resend_mail"}}</button>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|