From 9f8db7bfb3b991b45f72663d104abb9781dd66f6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 16 Mar 2023 23:40:57 +0100 Subject: [PATCH 1/2] Use octicon-verified for gpg signatures --- templates/repo/commit_page.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index ace5a410875e4..da9819c320c56 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}} diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 93ca12a0880ce..ddb4960642d50 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 1ff4dab34e318..262b6e0d739ce 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}}
From e20a68f86a6a9356bd5d7277bb5150386cc15e1e Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 16 Mar 2023 23:49:35 +0100 Subject: [PATCH 2/2] fix unverified icon on commits page --- templates/repo/commit_page.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index da9819c320c56..b01532db48fb2 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -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}}