Skip to content

Commit bd1a915

Browse files
GiteaBotsilverwindKN4CK3Rlunny
authored
Use octicon-verified for gpg signatures (#23529) (#23536)
Backport #23529 by @silverwind Before: <img width="292" alt="Screenshot 2023-03-16 at 23 40 47" src="https://user-images.githubusercontent.com/115237/225768871-43e11ced-e340-4c88-b756-25f9f7076fd2.png"> <img width="288" alt="Screenshot 2023-03-16 at 23 51 05" src="https://user-images.githubusercontent.com/115237/225770071-b51f3ed6-ef14-421b-a5bc-6a26e808d404.png"> After: <img width="291" alt="Screenshot 2023-03-16 at 23 40 37" src="https://user-images.githubusercontent.com/115237/225768864-ea4956c7-8c57-4148-9d89-c818991a7538.png"> <img width="281" alt="image" src="https://user-images.githubusercontent.com/115237/225769978-0b9c6c52-9a13-4c23-b13e-8a8a692abf43.png"> Co-authored-by: silverwind <[email protected]> Co-authored-by: KN4CK3R <[email protected]> Co-authored-by: Lunny Xiao <[email protected]>
1 parent cab7044 commit bd1a915

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

templates/repo/commit_page.tmpl

+5-5
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
<div class="gt-df gt-ac">
217217
{{if .Verification.Verified}}
218218
{{if ne .Verification.SigningUser.ID 0}}
219-
{{svg "octicon-shield-check" 16 "gt-mr-3"}}
219+
{{svg "octicon-verified" 16 "gt-mr-3"}}
220220
{{if .Verification.SigningSSHKey}}
221221
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
222222
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -225,7 +225,7 @@
225225
{{.Verification.SigningKey.PaddedKeyID}}
226226
{{end}}
227227
{{else}}
228-
{{svg "octicon-shield-lock" 16 "gt-mr-3"}}
228+
{{svg "octicon-unverified" 16 "gt-mr-3"}}
229229
{{if .Verification.SigningSSHKey}}
230230
<span class="ui text gt-mr-3 tooltip" data-content="{{.locale.Tr "gpg.default_key"}}">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
231231
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -235,7 +235,7 @@
235235
{{end}}
236236
{{end}}
237237
{{else if .Verification.Warning}}
238-
{{svg "octicon-shield" 16 "gt-mr-3"}}
238+
{{svg "octicon-unverified" 16 "gt-mr-3"}}
239239
{{if .Verification.SigningSSHKey}}
240240
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
241241
{{.Verification.SigningSSHKey.Fingerprint}}
@@ -246,14 +246,14 @@
246246
{{else}}
247247
{{if .Verification.SigningKey}}
248248
{{if ne .Verification.SigningKey.KeyID ""}}
249-
{{svg "octicon-shield" 16 "gt-mr-3"}}
249+
{{svg "octicon-verified" 16 "gt-mr-3"}}
250250
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.gpg_key_id"}}:</span>
251251
{{.Verification.SigningKey.PaddedKeyID}}
252252
{{end}}
253253
{{end}}
254254
{{if .Verification.SigningSSHKey}}
255255
{{if ne .Verification.SigningSSHKey.Fingerprint ""}}
256-
{{svg "octicon-shield" 16 "gt-mr-3"}}
256+
{{svg "octicon-verified" 16 "gt-mr-3"}}
257257
<span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span>
258258
{{.Verification.SigningSSHKey.Fingerprint}}
259259
{{end}}

templates/user/settings/keys_gpg.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</div>
5959
<div class="content">
6060
{{if .Verified}}
61-
<span class="tooltip" data-content="{{$.locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-shield-check"}} <strong>{{$.locale.Tr "settings.gpg_key_verified"}}</strong></span>
61+
<span class="tooltip" data-content="{{$.locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{$.locale.Tr "settings.gpg_key_verified"}}</strong></span>
6262
{{end}}
6363
{{if gt (len .Emails) 0}}
6464
<span class="tooltip" data-content="{{$.locale.Tr "settings.gpg_key_matched_identities_long"}}">{{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}<strong>{{.Email}} </strong>{{end}}</span>

templates/user/settings/keys_ssh.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</div>
5252
<div class="content">
5353
{{if .Verified}}
54-
<span class="tooltip" data-content="{{$.locale.Tr "settings.ssh_key_verified_long"}}">{{svg "octicon-shield-check"}} <strong>{{$.locale.Tr "settings.ssh_key_verified"}}</strong></span>
54+
<span class="tooltip" data-content="{{$.locale.Tr "settings.ssh_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{$.locale.Tr "settings.ssh_key_verified"}}</strong></span>
5555
{{end}}
5656
<strong>{{.Name}}</strong>
5757
<div class="print meta">

0 commit comments

Comments
 (0)