Enable H014 and H023 djlint rules (#25786)

Enable these rules:

- H014 | More than 2 blank lines.
- H023 | Do not use entity references.

There are more potential rules to enable but they are blocked by bugs in
the linter:

- https://github.com/Riverside-Healthcare/djLint/issues/711
- https://github.com/Riverside-Healthcare/djLint/issues/712
pull/25648/head^2
silverwind 1 year ago committed by GitHub
parent be23b73e85
commit 61e0d1a767
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      pyproject.toml
  2. 1
      templates/admin/auth/edit.tmpl
  3. 1
      templates/base/head_navbar.tmpl
  4. 1
      templates/install.tmpl
  5. 4
      templates/repo/diff/box.tmpl
  6. 3
      templates/repo/editor/edit.tmpl
  7. 5
      templates/repo/settings/options.tmpl
  8. 1
      templates/repo/tag/list.tmpl
  9. 5
      templates/repo/wiki/revision.tmpl
  10. 3
      templates/user/auth/change_passwd_inner.tmpl

@ -12,4 +12,4 @@ djlint = "1.31.1"
[tool.djlint] [tool.djlint]
profile="golang" profile="golang"
ignore="H005,H006,H008,H013,H014,H016,H020,H021,H023,H026,H030,H031,T027" ignore="H005,H006,H008,H013,H016,H020,H021,H026,H030,H031,T027"

@ -106,7 +106,6 @@
<input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="jpegPhoto"> <input id="attribute_avatar" name="attribute_avatar" value="{{$cfg.AttributeAvatar}}" placeholder="jpegPhoto">
</div> </div>
<!-- ldap group begin --> <!-- ldap group begin -->
<div class="inline field"> <div class="inline field">
<div class="ui checkbox"> <div class="ui checkbox">

@ -23,7 +23,6 @@
<button class="item gt-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button> <button class="item gt-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button>
</div> </div>
<!-- navbar links non-mobile --> <!-- navbar links non-mobile -->
{{if and .IsSigned .MustChangePassword}} {{if and .IsSigned .MustChangePassword}}
{{/* No links */}} {{/* No links */}}

@ -155,7 +155,6 @@
<span class="help">{{.locale.Tr "install.enable_update_checker_helper"}}</span> <span class="help">{{.locale.Tr "install.enable_update_checker_helper"}}</span>
</div> </div>
<!-- Optional Settings --> <!-- Optional Settings -->
<h4 class="ui dividing header">{{.locale.Tr "install.optional_title"}}</h4> <h4 class="ui dividing header">{{.locale.Tr "install.optional_title"}}</h4>

@ -101,7 +101,7 @@
{{template "repo/diff/stats" dict "file" . "root" $}} {{template "repo/diff/stats" dict "file" . "root" $}}
{{end}} {{end}}
</div> </div>
<span class="file gt-mono"><a class="muted file-link" title="{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} &rarr; {{end}}{{$file.Name}}</a>{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}}</span> <span class="file gt-mono"><a class="muted file-link" title="{{if $file.IsRenamed}}{{$file.OldName}} {{end}}{{$file.Name}}" href="#diff-{{$file.NameHash}}">{{if $file.IsRenamed}}{{$file.OldName}} {{end}}{{$file.Name}}</a>{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}}</span>
<button class="btn interact-fg gt-p-3" data-clipboard-text="{{$file.Name}}">{{svg "octicon-copy" 14}}</button> <button class="btn interact-fg gt-p-3" data-clipboard-text="{{$file.Name}}">{{svg "octicon-copy" 14}}</button>
{{if $file.IsGenerated}} {{if $file.IsGenerated}}
<span class="ui label">{{$.locale.Tr "repo.diff.generated"}}</span> <span class="ui label">{{$.locale.Tr "repo.diff.generated"}}</span>
@ -110,7 +110,7 @@
<span class="ui label">{{$.locale.Tr "repo.diff.vendored"}}</span> <span class="ui label">{{$.locale.Tr "repo.diff.vendored"}}</span>
{{end}} {{end}}
{{if and $file.Mode $file.OldMode}} {{if and $file.Mode $file.OldMode}}
<span class="gt-ml-4 gt-mono">{{$file.OldMode}} &rarr; {{$file.Mode}}</span> <span class="gt-ml-4 gt-mono">{{$file.OldMode}} {{$file.Mode}}</span>
{{else if $file.Mode}} {{else if $file.Mode}}
<span class="gt-ml-4 gt-mono">{{$file.Mode}}</span> <span class="gt-ml-4 gt-mono">{{$file.Mode}}</span>
{{end}} {{end}}

@ -52,8 +52,6 @@
{{template "repo/editor/commit_form" .}} {{template "repo/editor/commit_form" .}}
</form> </form>
</div> </div>
<div class="ui g-modal-confirm modal" id="edit-empty-content-modal"> <div class="ui g-modal-confirm modal" id="edit-empty-content-modal">
<div class="header"> <div class="header">
{{svg "octicon-file"}} {{svg "octicon-file"}}
@ -73,6 +71,5 @@
</button> </button>
</div> </div>
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

@ -44,30 +44,25 @@
<label for="website">{{.locale.Tr "repo.settings.site"}}</label> <label for="website">{{.locale.Tr "repo.settings.site"}}</label>
<input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}"> <input id="website" name="website" type="url" maxlength="1024" value="{{.Repository.Website}}">
</div> </div>
<div class="field"> <div class="field">
<button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button> <button class="ui green button">{{$.locale.Tr "repo.settings.update_settings"}}</button>
</div> </div>
</form> </form>
<div class="divider"></div> <div class="divider"></div>
<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data"> <form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="inline field"> <div class="inline field">
<label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label> <label for="avatar">{{.locale.Tr "settings.choose_new_avatar"}}</label>
<input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp"> <input name="avatar" type="file" accept="image/png,image/jpeg,image/gif,image/webp">
</div> </div>
<div class="field"> <div class="field">
<button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button> <button class="ui green button">{{$.locale.Tr "settings.update_avatar"}}</button>
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button> <button class="ui red button link-action" data-url="{{.Link}}/avatar/delete" data-redirect="{{.Link}}">{{$.locale.Tr "settings.delete_current_avatar"}}</button>
</div> </div>
</form> </form>
</div> </div>
{{/* These variables exist to make the logic in the Settings window easier to comprehend and are not used later on. */}} {{/* These variables exist to make the logic in the Settings window easier to comprehend and are not used later on. */}}
{{$newMirrorsPartiallyEnabled := or (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}} {{$newMirrorsPartiallyEnabled := or (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}}
{{/* .Repository.IsMirror is not always reliable if the repository is not actively acting as a mirror because of errors. */}} {{/* .Repository.IsMirror is not always reliable if the repository is not actively acting as a mirror because of errors. */}}

@ -75,5 +75,4 @@
</div> </div>
{{end}} {{end}}
{{template "base/footer" .}} {{template "base/footer" .}}

@ -30,16 +30,11 @@
</div> </div>
</div> </div>
</h4> </h4>
{{if and .Commits (gt .CommitCount 0)}} {{if and .Commits (gt .CommitCount 0)}}
{{template "repo/commits_list" .}} {{template "repo/commits_list" .}}
{{end}} {{end}}
{{template "base/paginate" .}} {{template "base/paginate" .}}
</div> </div>
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

@ -11,13 +11,10 @@
<label for="password">{{.locale.Tr "password"}}</label> <label for="password">{{.locale.Tr "password"}}</label>
<input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required> <input id="password" name="password" type="password" value="{{.password}}" autocomplete="new-password" required>
</div> </div>
<div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}"> <div class="required inline field {{if and (.Err_Password) (or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeRegister))}}error{{end}}">
<label for="retype">{{.locale.Tr "re_type"}}</label> <label for="retype">{{.locale.Tr "re_type"}}</label>
<input id="retype" name="retype" type="password" autocomplete="new-password" required> <input id="retype" name="retype" type="password" autocomplete="new-password" required>
</div> </div>
<div class="inline field"> <div class="inline field">
<label></label> <label></label>
<button class="ui green button">{{.locale.Tr "settings.change_password"}}</button> <button class="ui green button">{{.locale.Tr "settings.change_password"}}</button>

Loading…
Cancel
Save