mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-27 13:39:19 -05: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>
65 lines
2.6 KiB
Go HTML Template
65 lines
2.6 KiB
Go HTML Template
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content user reset password">
|
|
<div class="ui middle very relaxed page grid">
|
|
<div class="column">
|
|
<form class="ui form ignore-dirty" action="{{.Link}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input name="code" type="hidden" value="{{.Code}}">
|
|
<h2 class="ui top attached header">
|
|
{{ctx.Locale.Tr "auth.reset_password"}}
|
|
</h2>
|
|
<div class="ui attached segment">
|
|
{{template "base/alert" .}}
|
|
{{if .user_email}}
|
|
<div class="inline field">
|
|
<label for="user_name">{{ctx.Locale.Tr "email"}}</label>
|
|
<input id="user_name" type="text" value="{{.user_email}}" disabled>
|
|
</div>
|
|
{{end}}
|
|
{{if .IsResetForm}}
|
|
<div class="required field {{if .Err_Password}}error{{end}}">
|
|
<label for="password">{{ctx.Locale.Tr "settings.new_password"}}</label>
|
|
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" autofocus required>
|
|
</div>
|
|
{{if not .user_signed_in}}
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
|
|
<input name="remember" type="checkbox">
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
{{if .has_two_factor}}
|
|
<h4 class="ui dividing header">
|
|
{{ctx.Locale.Tr "twofa"}}
|
|
</h4>
|
|
<div class="ui warning visible message">{{ctx.Locale.Tr "settings.twofa_is_enrolled"}}</div>
|
|
{{if .scratch_code}}
|
|
<div class="required inline field {{if .Err_Token}}error{{end}}">
|
|
<label for="token">{{ctx.Locale.Tr "auth.scratch_code"}}</label>
|
|
<input id="token" name="token" type="text" autocomplete="off" autofocus required>
|
|
</div>
|
|
<input type="hidden" name="scratch_code" value="true">
|
|
{{else}}
|
|
<div class="required field {{if .Err_Passcode}}error{{end}}">
|
|
<label for="passcode">{{ctx.Locale.Tr "passcode"}}</label>
|
|
<input id="passcode" name="passcode" type="number" autocomplete="off" autofocus required>
|
|
</div>
|
|
{{end}}
|
|
{{end}}
|
|
<div class="divider"></div>
|
|
<div class="inline field">
|
|
<button class="ui primary button">{{ctx.Locale.Tr "auth.reset_password_helper"}}</button>
|
|
{{if and .has_two_factor (not .scratch_code)}}
|
|
<a href="{{.Link}}?code={{.Code}}&scratch_code=true">{{ctx.Locale.Tr "auth.use_scratch_code"}}</a>
|
|
{{end}}
|
|
</div>
|
|
{{else}}
|
|
<p class="center">{{ctx.Locale.Tr "auth.invalid_code_forgot_password" (printf "%s/user/forgot_password" AppSubUrl)}}</p>
|
|
{{end}}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|