refactor(templates): update djlint to 1.46.0 and resolve its new findings (#39231)

This commit is contained in:
silverwind
2026-09-08 23:17:17 +00:00
committed by GitHub
parent 459fc13783
commit f5c7b21f1d
175 changed files with 533 additions and 528 deletions
+2 -2
View File
@@ -14,7 +14,7 @@
<input id="verify-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>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "install.confirm_password"}}</button>
</div>
<input name="code" type="hidden" value="{{.ActivationCode}}">
{{else}}
@@ -28,7 +28,7 @@
</details>
<div class="divider"></div>
<div class="text">
<button class="ui primary button">{{ctx.Locale.Tr "auth.resend_mail"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.resend_mail"}}</button>
</div>
{{end}}
</div>
+3 -3
View File
@@ -10,12 +10,12 @@
<div class="inline field tw-text-center required">
<div id="captcha" data-captcha-type="g-recaptcha" class="g-recaptcha-style" data-sitekey="{{.RecaptchaSitekey}}"></div>
</div>
<script nonce="{{ctx.CspScriptNonce}}" defer src='{{.RecaptchaAPIScriptURL}}'></script>
<script nonce="{{ctx.CspScriptNonce}}" defer src="{{.RecaptchaAPIScriptURL}}"></script>
{{else if eq .CaptchaType "hcaptcha"}}
<div class="inline field tw-text-center required">
<div id="captcha" data-captcha-type="h-captcha" class="h-captcha-style" data-sitekey="{{.HcaptchaSitekey}}"></div>
</div>
<script nonce="{{ctx.CspScriptNonce}}" defer src='https://hcaptcha.com/1/api.js'></script>
<script nonce="{{ctx.CspScriptNonce}}" defer src="https://hcaptcha.com/1/api.js"></script>
{{else if eq .CaptchaType "mcaptcha"}}
<div class="inline field tw-text-center">
<div class="m-captcha-style" id="mcaptcha__widget-container"></div>
@@ -28,5 +28,5 @@
<div class="inline field tw-text-center">
<div id="captcha" data-captcha-type="cf-turnstile" data-sitekey="{{.CfTurnstileSitekey}}"></div>
</div>
<script nonce="{{ctx.CspScriptNonce}}" defer src='https://challenges.cloudflare.com/turnstile/v0/api.js'></script>
<script nonce="{{ctx.CspScriptNonce}}" defer src="https://challenges.cloudflare.com/turnstile/v0/api.js"></script>
{{end}}{{end}}
+1 -1
View File
@@ -15,7 +15,7 @@
<input id="retype" name="retype" type="password" autocomplete="new-password" required>
</div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "settings.change_password"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "settings.change_password"}}</button>
</div>
</form>
</div>
+1 -1
View File
@@ -17,7 +17,7 @@
</div>
<div class="divider"></div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "auth.send_reset_mail"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.send_reset_mail"}}</button>
</div>
{{else if .IsResetDisable}}
<p class="center">
+1 -1
View File
@@ -48,7 +48,7 @@
{{end}}
<div class="divider"></div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "auth.reset_password_helper"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.reset_password_helper"}}</button>
{{if and .has_two_factor (not .scratch_code)}}
<a href="?code={{.Code}}&scratch_code=true">{{ctx.Locale.Tr "auth.use_scratch_code"}}</a>
{{end}}
+1 -1
View File
@@ -37,7 +37,7 @@
{{template "user/auth/captcha" .}}
<div class="field">
<button class="ui primary button tw-w-full" tabindex="3">
<button type="submit" class="ui primary button tw-w-full" tabindex="3">
{{if .LinkAccountMode}}
{{ctx.Locale.Tr "auth.oauth_signin_submit"}}
{{else}}
+1 -1
View File
@@ -31,7 +31,7 @@
</div>
</div>
<div class="inline field">
<button class="ui primary button tw-w-full">{{ctx.Locale.Tr "sign_in"}}</button>
<button type="submit" class="ui primary button tw-w-full">{{ctx.Locale.Tr "sign_in"}}</button>
</div>
</form>
</div>
+1 -1
View File
@@ -40,7 +40,7 @@
{{template "user/auth/captcha" .}}
<div class="inline field">
<button class="ui primary button tw-w-full">
<button type="submit" class="ui primary button tw-w-full">
{{if .LinkAccountMode}}
{{ctx.Locale.Tr "auth.oauth_signup_submit"}}
{{else}}
@@ -25,7 +25,7 @@
</div>
<div class="inline field">
<label></label>
<button class="ui primary button">{{ctx.Locale.Tr "auth.openid_connect_submit"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.openid_connect_submit"}}</button>
<a href="{{AppSubUrl}}/user/forgot_password">{{ctx.Locale.Tr "auth.forgot_password"}}</a>
</div>
</form>
@@ -27,7 +27,7 @@
<input id="openid" value="{{.OpenID}}" readonly>
</div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "auth.create_new_account"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.create_new_account"}}</button>
</div>
</form>
</div>
+1 -1
View File
@@ -14,7 +14,7 @@
</div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "auth.verify"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.verify"}}</button>
<a href="{{AppSubUrl}}/user/two_factor/scratch">{{ctx.Locale.Tr "auth.use_scratch_code"}}</a>
</div>
</div>
+1 -1
View File
@@ -14,7 +14,7 @@
</div>
<div class="inline field">
<button class="ui primary button">{{ctx.Locale.Tr "auth.verify"}}</button>
<button type="submit" class="ui primary button">{{ctx.Locale.Tr "auth.verify"}}</button>
</div>
</div>
</form>