Skip to content

Commit 486d61f

Browse files
committed
Enforce tab indendation in templates
This adds editorconfig-checker [1] to lint the template files so they conform the editorconfig files. I fixed all current identation issues using the fix mode of eclint [2] and some manual corrections. We can extend this linting to other files later, for now I'd like this PR to focus on HTML template files only. [1] https://github.com/editorconfig-checker/editorconfig-checker [2] https://github.com/jedmao/eclint
1 parent 84f5a0b commit 486d61f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+677
-608
lines changed

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ insert_final_newline = true
1212
[*.{go,tmpl,html}]
1313
indent_style = tab
1414

15+
[templates/custom/*.tmpl]
16+
insert_final_newline = false
17+
18+
[templates/swagger/v1_json.tmpl]
19+
indent_style = space
20+
1521
[Makefile]
1622
indent_style = tab
1723

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ lint: lint-frontend lint-backend
325325
lint-frontend: node_modules
326326
npx eslint --color --max-warnings=0 web_src/js build templates *.config.js
327327
npx stylelint --color --max-warnings=0 web_src/less
328+
npx editorconfig-checker templates
328329

329330
.PHONY: lint-backend
330331
lint-backend: golangci-lint revive vet

package-lock.json

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
},
4848
"devDependencies": {
4949
"eslint": "7.23.0",
50+
"editorconfig-checker": "4.0.2",
5051
"eslint-plugin-html": "6.1.2",
5152
"eslint-plugin-import": "2.22.1",
5253
"eslint-plugin-unicorn": "29.0.0",

templates/admin/auth/edit.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
<input id="attribute_mail" name="attribute_mail" value="{{$cfg.AttributeMail}}" placeholder="e.g. mail" required>
9797
</div>
9898
<div class="field">
99-
<label for="attribute_ssh_public_key">{{.i18n.Tr "admin.auths.attribute_ssh_public_key"}}</label>
100-
<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
99+
<label for="attribute_ssh_public_key">{{.i18n.Tr "admin.auths.attribute_ssh_public_key"}}</label>
100+
<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{$cfg.AttributeSSHPublicKey}}" placeholder="e.g. SshPublicKey">
101101
</div>
102102
<div class="inline field">
103103
<div class="ui checkbox">
@@ -215,9 +215,9 @@
215215
<input id="oauth2_secret" name="oauth2_secret" value="{{$cfg.ClientSecret}}" required>
216216
</div>
217217
<div class="optional field">
218-
<label for="oauth2_icon_url">{{.i18n.Tr "admin.auths.oauth2_icon_url"}}</label>
219-
<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
220-
</div>
218+
<label for="oauth2_icon_url">{{.i18n.Tr "admin.auths.oauth2_icon_url"}}</label>
219+
<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{$cfg.IconURL}}">
220+
</div>
221221
<div class="open_id_connect_auto_discovery_url required field">
222222
<label for="open_id_connect_auto_discovery_url">{{.i18n.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
223223
<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{$cfg.OpenIDConnectAutoDiscoveryURL}}">

templates/admin/auth/new.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<span>{{.i18n.Tr "admin.auths.tip.nextcloud"}}</span>
120120
<li>Yandex</li>
121121
<span>{{.i18n.Tr "admin.auths.tip.yandex"}}</span>
122-
<li>Mastodon</li>
123-
<span>{{.i18n.Tr "admin.auths.tip.mastodon"}}</span>
122+
<li>Mastodon</li>
123+
<span>{{.i18n.Tr "admin.auths.tip.mastodon"}}</span>
124124
</div>
125125
</div>
126126
</div>

templates/admin/auth/source/ldap.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<input id="attribute_mail" name="attribute_mail" value="{{.attribute_mail}}" placeholder="e.g. mail">
6969
</div>
7070
<div class="field">
71-
<label for="attribute_ssh_public_key">{{.i18n.Tr "admin.auths.attribute_ssh_public_key"}}</label>
72-
<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{.attribute_ssh_public_key}}" placeholder="e.g. SshPublicKey">
71+
<label for="attribute_ssh_public_key">{{.i18n.Tr "admin.auths.attribute_ssh_public_key"}}</label>
72+
<input id="attribute_ssh_public_key" name="attribute_ssh_public_key" value="{{.attribute_ssh_public_key}}" placeholder="e.g. SshPublicKey">
7373
</div>
7474
<div class="inline field">
7575
<div class="ui checkbox">

templates/admin/auth/source/oauth.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<input id="oauth2_secret" name="oauth2_secret" value="{{.oauth2_secret}}">
2222
</div>
2323
<div class="optional field">
24-
<label for="oauth2_icon_url">{{.i18n.Tr "admin.auths.oauth2_icon_url"}}</label>
25-
<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{.oauth2_icon_url}}">
26-
</div>
24+
<label for="oauth2_icon_url">{{.i18n.Tr "admin.auths.oauth2_icon_url"}}</label>
25+
<input id="oauth2_icon_url" name="oauth2_icon_url" value="{{.oauth2_icon_url}}">
26+
</div>
2727
<div class="open_id_connect_auto_discovery_url required field">
2828
<label for="open_id_connect_auto_discovery_url">{{.i18n.Tr "admin.auths.openIdConnectAutoDiscoveryURL"}}</label>
2929
<input id="open_id_connect_auto_discovery_url" name="open_id_connect_auto_discovery_url" value="{{.open_id_connect_auto_discovery_url}}">

templates/admin/base/search.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</div>
1818
<form class="ui form ignore-dirty" style="max-width: 90%">
1919
<div class="ui fluid action input">
20-
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
21-
<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
20+
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
21+
<button class="ui blue button">{{.i18n.Tr "explore.search"}}</button>
2222
</div>
2323
</form>

templates/admin/repo/list.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
88
<div class="ui right">
99
<a class="ui blue tiny button" href="{{AppSubUrl}}/admin/repos/unadopted">{{.i18n.Tr "admin.repos.unadopted"}}</a>
10-
</div>
10+
</div>
1111
</h4>
1212
<div class="ui attached segment">
1313
{{template "admin/repo/search" .}}

0 commit comments

Comments
 (0)