Skip to content

Commit 95d81c6

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Reference labels by IDs instead of names in `keys` settings (go-gitea#29194)
2 parents 1688a0c + 7132a0b commit 95d81c6

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

templates/repo/settings/deploy_keys.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
{{ctx.Locale.Tr "repo.settings.deploy_key_desc"}}
1919
</div>
2020
<div class="field {{if .Err_Title}}error{{end}}">
21-
<label for="title">{{ctx.Locale.Tr "repo.settings.title"}}</label>
21+
<label for="ssh-key-title">{{ctx.Locale.Tr "repo.settings.title"}}</label>
2222
<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
2323
</div>
2424
<div class="field {{if .Err_Content}}error{{end}}">
25-
<label for="content">{{ctx.Locale.Tr "repo.settings.deploy_key_content"}}</label>
25+
<label for="ssh-key-content">{{ctx.Locale.Tr "repo.settings.deploy_key_content"}}</label>
2626
<textarea id="ssh-key-content" name="content" placeholder="{{ctx.Locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
2727
</div>
2828
<div class="field">

templates/user/settings/keys_gpg.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{{.CsrfTokenHtml}}
1111
<input type="hidden" name="title" value="none">
1212
<div class="field {{if .Err_Content}}error{{end}}">
13-
<label for="content">{{ctx.Locale.Tr "settings.key_content"}}</label>
13+
<label for="gpg-key-content">{{ctx.Locale.Tr "settings.key_content"}}</label>
1414
<textarea id="gpg-key-content" name="content" placeholder="{{ctx.Locale.Tr "settings.key_content_gpg_placeholder"}}" required>{{.content}}</textarea>
1515
</div>
1616
{{if .Err_Signature}}
@@ -26,7 +26,7 @@
2626
</div>
2727
</div>
2828
<div class="field">
29-
<label for="signature">{{ctx.Locale.Tr "settings.gpg_token_signature"}}</label>
29+
<label for="gpg-key-signature">{{ctx.Locale.Tr "settings.gpg_token_signature"}}</label>
3030
<textarea id="gpg-key-signature" name="signature" placeholder="{{ctx.Locale.Tr "settings.key_signature_gpg_placeholder"}}" required>{{.signature}}</textarea>
3131
</div>
3232
{{end}}

templates/user/settings/keys_principal.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<form class="ui form" action="{{.Link}}" method="post">
4545
{{.CsrfTokenHtml}}
4646
<div class="field {{if .Err_Content}}error{{end}}">
47-
<label for="content">{{ctx.Locale.Tr "settings.principal_content"}}</label>
47+
<label for="ssh-principal-content">{{ctx.Locale.Tr "settings.principal_content"}}</label>
4848
<input id="ssh-principal-content" name="content" value="{{.content}}" autofocus required>
4949
</div>
5050
<input name="title" type="hidden" value="principal">

templates/user/settings/keys_ssh.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<form class="ui form" action="{{.Link}}" method="post">
1212
{{.CsrfTokenHtml}}
1313
<div class="field {{if .Err_Title}}error{{end}}">
14-
<label for="title">{{ctx.Locale.Tr "settings.key_name"}}</label>
14+
<label for="ssh-key-title">{{ctx.Locale.Tr "settings.key_name"}}</label>
1515
<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required maxlength="50">
1616
</div>
1717
<div class="field {{if .Err_Content}}error{{end}}">
18-
<label for="content">{{ctx.Locale.Tr "settings.key_content"}}</label>
18+
<label for="ssh-key-content">{{ctx.Locale.Tr "settings.key_content"}}</label>
1919
<textarea id="ssh-key-content" name="content" class="js-quick-submit" placeholder="{{ctx.Locale.Tr "settings.key_content_ssh_placeholder"}}" required>{{.content}}</textarea>
2020
</div>
2121
<input name="type" type="hidden" value="ssh">

0 commit comments

Comments
 (0)