diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-02-26 05:55:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-25 21:55:00 +0000 |
| commit | 49e482674700e184aa84806acfb7edaae0554291 (patch) | |
| tree | 26b14bcdb2d348fc2f7e34a884205af1fa491d9a /templates | |
| parent | ed3892d8430652c2bc8e2af21844d14769825e8a (diff) | |
| download | gitea-49e482674700e184aa84806acfb7edaae0554291.tar.gz gitea-49e482674700e184aa84806acfb7edaae0554291.zip | |
Refactor "user/active" related logic (#29390)
And add more tests. Remove a lot of fragile "if" blocks.
The old logic is kept as-is.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/user/auth/activate.tmpl | 48 | ||||
| -rw-r--r-- | templates/user/auth/activate_prompt.tmpl | 15 |
2 files changed, 30 insertions, 33 deletions
diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 9cd1712275..51dc1eb6a6 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -9,40 +9,22 @@ </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}} + {{if .NeedVerifyLocalPassword}} + <div class="required inline field"> + <label for="verify-password">{{ctx.Locale.Tr "password"}}</label> + <input id="verify-password" name="password" type="password" autocomplete="off" required> + </div> + <div class="inline field"> + <label></label> + <button class="ui primary button">{{ctx.Locale.Tr "install.confirm_password"}}</button> + </div> + <input name="code" type="hidden" value="{{.ActivationCode}}"> {{else}} - {{if .NeedsPassword}} - <div class="required inline field"> - <label for="password">{{ctx.Locale.Tr "password"}}</label> - <input id="password" name="password" type="password" autocomplete="off" required> - </div> - <div class="inline field"> - <label></label> - <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> - <div class="text right"> - <button class="ui primary button">{{ctx.Locale.Tr "auth.resend_mail"}}</button> - </div> - {{end}} + <p>{{ctx.Locale.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email}}</p> + <div class="divider"></div> + <div class="text right"> + <button class="ui primary button">{{ctx.Locale.Tr "auth.resend_mail"}}</button> + </div> {{end}} </div> </form> diff --git a/templates/user/auth/activate_prompt.tmpl b/templates/user/auth/activate_prompt.tmpl new file mode 100644 index 0000000000..237244df8c --- /dev/null +++ b/templates/user/auth/activate_prompt.tmpl @@ -0,0 +1,15 @@ +{{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"> + <h2 class="ui top attached header"> + {{ctx.Locale.Tr "auth.active_your_account"}} + </h2> + <div class="ui attached segment"> + {{template "base/alert" .}} + <p>{{.ActivationPromptMessage}}</p> + </div> + </div> + </div> +</div> +{{template "base/footer" .}} |