diff options
author | silverwind <me@silverwind.io> | 2023-06-14 20:17:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-14 18:17:58 +0000 |
commit | e24f651c86a5168da8181f2c75f5f99b56561224 (patch) | |
tree | 1f604dc894e29a0c99adca856bd55ad1ca78d4be /templates/user | |
parent | a0eaf0881235d41ca98f4718af815908d1237d2c (diff) | |
download | gitea-e24f651c86a5168da8181f2c75f5f99b56561224.tar.gz gitea-e24f651c86a5168da8181f2c75f5f99b56561224.zip |
Add template linting via djlint (#25212)
So I found this [linter](https://github.com/Riverside-Healthcare/djlint)
which features a mode for go templates, so I gave it a try and it did
find a number of valid issue, like unbalanced tags etc. It also has a
number of bugs, I had to disable/workaround many issues.
Given that this linter is written in python, this does add a dependency
on `python` >= 3.8 and `poetry` to the development environment to be
able to run this linter locally.
- `e.g.` prefixes on placeholders are removed because the linter had a
false-positive on `placeholder="e.g. cn=Search"` for the `attr=value`
syntax and it's not ideal anyways to write `e.g.` into a placeholder
because a placeholder is meant to hold a sample value.
- In `templates/repo/settings/options.tmpl` I simplified the logic to
not conditionally create opening tags without closing tags because this
stuff confuses the linter (and possibly the reader as well).
Diffstat (limited to 'templates/user')
-rw-r--r-- | templates/user/notification/notification_div.tmpl | 8 | ||||
-rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/packages.tmpl | 1 | ||||
-rw-r--r-- | templates/user/settings/repos.tmpl | 4 | ||||
-rw-r--r-- | templates/user/settings/security/openid.tmpl | 1 | ||||
-rw-r--r-- | templates/user/settings/security/twofa_enroll.tmpl | 4 |
6 files changed, 9 insertions, 11 deletions
diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 0b46e43b4f..a8c070d764 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -12,7 +12,7 @@ </a> </div> {{if and (eq .Status 1)}} - <form action="{{AppSubUrl}}/notifications/purge" method="POST"> + <form action="{{AppSubUrl}}/notifications/purge" method="post"> {{$.CsrfTokenHtml}} <div class="{{if not $notificationUnreadCount}}gt-hidden{{end}}"> <button class="ui mini button primary gt-mr-0" title='{{$.locale.Tr "notification.mark_all_as_read"}}'> @@ -70,7 +70,7 @@ </div> <div class="notifications-buttons gt-ac gt-je gt-gap-2 gt-px-2"> {{if ne .Status 3}} - <form action="{{AppSubUrl}}/notifications/status" method="POST"> + <form action="{{AppSubUrl}}/notifications/status" method="post"> {{$.CsrfTokenHtml}} <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="pinned"> @@ -85,7 +85,7 @@ </form> {{end}} {{if or (eq .Status 1) (eq .Status 3)}} - <form action="{{AppSubUrl}}/notifications/status" method="POST"> + <form action="{{AppSubUrl}}/notifications/status" method="post"> {{$.CsrfTokenHtml}} <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="read"> @@ -100,7 +100,7 @@ </button> </form> {{else if eq .Status 2}} - <form action="{{AppSubUrl}}/notifications/status" method="POST"> + <form action="{{AppSubUrl}}/notifications/status" method="post"> {{$.CsrfTokenHtml}} <input type="hidden" name="notification_id" value="{{.ID}}"> <input type="hidden" name="status" value="unread"> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index f442e8b2d6..ecbcf265ff 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -18,7 +18,7 @@ <p>{{.locale.Tr "settings.gpg_token_required"}}</p> </div> <div class="field"> - <label for="token">{{.locale.Tr "settings.gpg_token"}} + <label for="token">{{.locale.Tr "settings.gpg_token"}}</label> <input readonly="" value="{{.TokenToSign}}"> <div class="help"> <p>{{.locale.Tr "settings.gpg_token_help"}}</p> diff --git a/templates/user/settings/packages.tmpl b/templates/user/settings/packages.tmpl index 4f70b9e02c..a07c3c8356 100644 --- a/templates/user/settings/packages.tmpl +++ b/templates/user/settings/packages.tmpl @@ -21,5 +21,4 @@ </div> </div> </div> -</div> {{template "user/settings/layout_footer" .}} diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 3ac381fd90..64b08ca2c5 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -42,7 +42,7 @@ <div class="content"> <p>{{$.locale.Tr "repo.adopt_preexisting_content" $dir}}</p> </div> - <form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted"> + <form class="ui form" method="post" action="{{AppSubUrl}}/user/settings/repos/unadopted"> {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="adopt"> @@ -59,7 +59,7 @@ <div class="content"> <p>{{$.locale.Tr "repo.delete_preexisting_content" $dir}}</p> </div> - <form class="ui form" method="POST" action="{{AppSubUrl}}/user/settings/repos/unadopted"> + <form class="ui form" method="post" action="{{AppSubUrl}}/user/settings/repos/unadopted"> {{$.CsrfTokenHtml}} <input type="hidden" name="id" value="{{$dir}}"> <input type="hidden" name="action" value="delete"> diff --git a/templates/user/settings/security/openid.tmpl b/templates/user/settings/security/openid.tmpl index 2719b3b495..21a2d4f6b6 100644 --- a/templates/user/settings/security/openid.tmpl +++ b/templates/user/settings/security/openid.tmpl @@ -28,7 +28,6 @@ {{$.locale.Tr "settings.show_openid"}} </button> {{end}} - </button> </form> </div> <div class="content"> diff --git a/templates/user/settings/security/twofa_enroll.tmpl b/templates/user/settings/security/twofa_enroll.tmpl index 0ff0beb1bc..3c27c4d8fa 100644 --- a/templates/user/settings/security/twofa_enroll.tmpl +++ b/templates/user/settings/security/twofa_enroll.tmpl @@ -6,8 +6,8 @@ <div class="ui attached segment"> <p>{{.locale.Tr "settings.scan_this_image"}}</p> <img src="{{.QrUri}}" alt="{{.TwofaSecret}}"> - <p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}} - <p>{{.locale.Tr "settings.then_enter_passcode"}} + <p>{{.locale.Tr "settings.or_enter_secret" .TwofaSecret}}</p> + <p>{{.locale.Tr "settings.then_enter_passcode"}}</p> <form class="ui form" action="{{.Link}}" method="post"> {{.CsrfTokenHtml}} <div class="inline required field {{if .Err_Passcode}}error{{end}}"> |