mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-07-02 20:15:54 +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>
71 lines
2.4 KiB
Go HTML Template
71 lines
2.4 KiB
Go HTML Template
{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}}
|
|
{{template "base/alert" .}}
|
|
{{end}}
|
|
<h4 class="ui top attached header center">
|
|
{{if .LinkAccountMode}}
|
|
{{ctx.Locale.Tr "auth.oauth_signin_title"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "auth.login_userpass"}}
|
|
{{end}}
|
|
</h4>
|
|
<div class="ui attached segment">
|
|
<form class="ui form tw-max-w-2xl tw-m-auto" action="{{.SignInLink}}" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
|
|
<label for="user_name">{{ctx.Locale.Tr "home.uname_holder"}}</label>
|
|
<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
|
|
</div>
|
|
{{if or (not .DisablePassword) .LinkAccountMode}}
|
|
<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn))}}error{{end}}">
|
|
<label for="password">{{ctx.Locale.Tr "password"}}</label>
|
|
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="current-password" required>
|
|
</div>
|
|
{{end}}
|
|
{{if not .LinkAccountMode}}
|
|
<div class="inline field">
|
|
<div class="ui checkbox">
|
|
<label>{{ctx.Locale.Tr "auth.remember_me"}}</label>
|
|
<input name="remember" type="checkbox">
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
|
|
{{template "user/auth/captcha" .}}
|
|
|
|
<div class="field">
|
|
<button class="ui primary button">
|
|
{{if .LinkAccountMode}}
|
|
{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "sign_in"}}
|
|
{{end}}
|
|
</button>
|
|
<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
|
|
</div>
|
|
|
|
{{if .ShowRegistrationButton}}
|
|
<div class="field">
|
|
<a href="{{AppSubUrl}}/user/sign_up">{{ctx.Locale.Tr "auth.sign_up_now"}}</a>
|
|
</div>
|
|
{{end}}
|
|
|
|
{{if .OAuth2Providers}}
|
|
<div class="divider divider-text">
|
|
{{ctx.Locale.Tr "sign_in_or"}}
|
|
</div>
|
|
<div id="oauth2-login-navigator" class="gt-py-2">
|
|
<div class="gt-df gt-fc gt-jc">
|
|
<div id="oauth2-login-navigator-inner" class="gt-df gt-fc gt-fw gt-ac gt-gap-3">
|
|
{{range $provider := .OAuth2Providers}}
|
|
<a class="{{$provider.Name}} ui button gt-df gt-ac gt-jc gt-py-3 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
|
|
{{$provider.IconHTML 28}}
|
|
{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</form>
|
|
</div>
|