From bd1a915bdbaf464266ed00221f539187d233bfbc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 17 Mar 2023 11:39:31 -0400 Subject: [PATCH] Use octicon-verified for gpg signatures (#23529) (#23536) Backport #23529 by @silverwind Before: Screenshot 2023-03-16 at 23 40 47 Screenshot 2023-03-16 at 23 51 05 After: Screenshot 2023-03-16 at 23 40 37 image Co-authored-by: silverwind Co-authored-by: KN4CK3R Co-authored-by: Lunny Xiao --- templates/repo/commit_page.tmpl | 10 +++++----- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 028fdc7e5..ac2dde419 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -216,7 +216,7 @@
{{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} - {{svg "octicon-shield-check" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -225,7 +225,7 @@ {{.Verification.SigningKey.PaddedKeyID}} {{end}} {{else}} - {{svg "octicon-shield-lock" 16 "gt-mr-3"}} + {{svg "octicon-unverified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -235,7 +235,7 @@ {{end}} {{end}} {{else if .Verification.Warning}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-unverified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -246,14 +246,14 @@ {{else}} {{if .Verification.SigningKey}} {{if ne .Verification.SigningKey.KeyID ""}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{.locale.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.PaddedKeyID}} {{end}} {{end}} {{if .Verification.SigningSSHKey}} {{if ne .Verification.SigningSSHKey.Fingerprint ""}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} {{end}} diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index c80890940..2374b2a01 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -58,7 +58,7 @@
{{if .Verified}} - {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.gpg_key_verified"}} + {{svg "octicon-verified"}} {{$.locale.Tr "settings.gpg_key_verified"}} {{end}} {{if gt (len .Emails) 0}} {{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 891959d35..691d288b0 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -51,7 +51,7 @@
{{if .Verified}} - {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.ssh_key_verified"}} + {{svg "octicon-verified"}} {{$.locale.Tr "settings.ssh_key_verified"}} {{end}} {{.Name}}