2021-07-20 06:22:23 +00:00
|
|
|
<div class="ui container column fluid{{if .LinkAccountMode}} icon{{end}}">
|
2020-11-14 02:46:40 +00:00
|
|
|
<h4 class="ui top attached header center">
|
|
|
|
{{if .LinkAccountMode}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "auth.oauth_signup_title"}}
|
2020-11-14 02:46:40 +00:00
|
|
|
{{else}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "sign_up"}}
|
2020-11-14 02:46:40 +00:00
|
|
|
{{end}}
|
|
|
|
</h4>
|
|
|
|
<div class="ui attached segment">
|
2024-03-06 14:20:26 +00:00
|
|
|
<form class="ui form tw-max-w-2xl tw-m-auto" action="{{.SignUpLink}}" method="post">
|
2020-11-14 02:46:40 +00:00
|
|
|
{{.CsrfTokenHtml}}
|
|
|
|
{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister)}}
|
|
|
|
{{template "base/alert" .}}
|
|
|
|
{{end}}
|
|
|
|
{{if .DisableRegistration}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<p>{{ctx.Locale.Tr "auth.disable_register_prompt"}}</p>
|
2020-11-14 02:46:40 +00:00
|
|
|
{{else}}
|
2024-03-06 14:20:26 +00:00
|
|
|
<div class="required field {{if and (.Err_UserName) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
2023-09-25 08:56:50 +00:00
|
|
|
<label for="user_name">{{ctx.Locale.Tr "username"}}</label>
|
2024-02-21 14:14:37 +00:00
|
|
|
<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
|
2020-11-14 02:46:40 +00:00
|
|
|
</div>
|
2024-03-06 14:20:26 +00:00
|
|
|
<div class="required field {{if .Err_Email}}error{{end}}">
|
2023-09-25 08:56:50 +00:00
|
|
|
<label for="email">{{ctx.Locale.Tr "email"}}</label>
|
2024-02-21 14:14:37 +00:00
|
|
|
<input id="email" name="email" type="email" value="{{.email}}" required>
|
2020-11-14 02:46:40 +00:00
|
|
|
</div>
|
2017-02-22 07:14:37 +00:00
|
|
|
|
2020-11-14 02:46:40 +00:00
|
|
|
{{if not .DisablePassword}}
|
2024-03-06 14:20:26 +00:00
|
|
|
<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
2023-09-25 08:56:50 +00:00
|
|
|
<label for="password">{{ctx.Locale.Tr "password"}}</label>
|
2024-02-21 14:14:37 +00:00
|
|
|
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
|
2020-11-14 02:46:40 +00:00
|
|
|
</div>
|
2024-03-06 14:20:26 +00:00
|
|
|
<div class="required field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
|
2023-09-25 08:56:50 +00:00
|
|
|
<label for="retype">{{ctx.Locale.Tr "re_type"}}</label>
|
2024-02-21 14:14:37 +00:00
|
|
|
<input id="retype" name="retype" type="password" value="{{.retype}}" autocomplete="new-password" required>
|
2020-11-14 02:46:40 +00:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2022-08-10 13:20:10 +00:00
|
|
|
|
2022-11-22 21:13:18 +00:00
|
|
|
{{template "user/auth/captcha" .}}
|
2017-02-22 07:14:37 +00:00
|
|
|
|
2020-11-14 02:46:40 +00:00
|
|
|
<div class="inline field">
|
2023-09-18 22:05:31 +00:00
|
|
|
<button class="ui primary button">
|
2020-11-14 02:46:40 +00:00
|
|
|
{{if .LinkAccountMode}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "auth.oauth_signup_submit"}}
|
2020-11-14 02:46:40 +00:00
|
|
|
{{else}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "auth.create_new_account"}}
|
2017-02-22 07:14:37 +00:00
|
|
|
{{end}}
|
2020-11-14 02:46:40 +00:00
|
|
|
</button>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
{{if not .LinkAccountMode}}
|
|
|
|
<div class="inline field">
|
2023-09-25 08:56:50 +00:00
|
|
|
<a href="{{AppSubUrl}}/user/login">{{ctx.Locale.Tr "auth.register_helper_msg"}}</a>
|
2017-02-22 07:14:37 +00:00
|
|
|
</div>
|
2020-11-14 02:46:40 +00:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2023-09-13 05:14:21 +00:00
|
|
|
|
2023-11-03 01:41:00 +00:00
|
|
|
{{if .OAuth2Providers}}
|
2023-09-13 05:14:21 +00:00
|
|
|
<div class="divider divider-text">
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "sign_in_or"}}
|
2023-09-13 05:14:21 +00:00
|
|
|
</div>
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<div id="oauth2-login-navigator" class="tw-py-1">
|
2024-03-22 13:45:10 +00:00
|
|
|
<div class="tw-flex tw-flex-col tw-justify-center">
|
2024-03-24 14:31:35 +00:00
|
|
|
<div id="oauth2-login-navigator-inner" class="tw-flex tw-flex-col tw-flex-wrap tw-items-center tw-gap-2">
|
2023-11-03 01:41:00 +00:00
|
|
|
{{range $provider := .OAuth2Providers}}
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<a class="{{$provider.Name}} ui button tw-flex tw-items-center tw-justify-center tw-py-2 tw-w-full oauth-login-link" href="{{AppSubUrl}}/user/oauth2/{{$provider.DisplayName}}">
|
2023-09-19 21:47:13 +00:00
|
|
|
{{$provider.IconHTML 28}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.Tr "sign_in_with_provider" $provider.DisplayName}}
|
2023-09-13 05:14:21 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
{{end}}
|
2020-11-14 02:46:40 +00:00
|
|
|
</form>
|
2017-02-22 07:14:37 +00:00
|
|
|
</div>
|
2017-03-07 10:47:56 +00:00
|
|
|
</div>
|