diff options
| author | Giteabot <teabot@gitea.io> | 2023-03-17 11:39:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 11:39:31 -0400 |
| commit | bd1a915bdbaf464266ed00221f539187d233bfbc (patch) | |
| tree | 597ea7ed23ee603a4656a35815b5d52db021ca22 | |
| parent | cab704477251d0940d91462e4f93e4563532c9f3 (diff) | |
| download | gitea-bd1a915bdbaf464266ed00221f539187d233bfbc.tar.gz gitea-bd1a915bdbaf464266ed00221f539187d233bfbc.zip | |
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 <me@silverwind.io>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
| -rw-r--r-- | templates/repo/commit_page.tmpl | 10 | ||||
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 2 | ||||
| -rw-r--r-- | 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 028fdc7e51..ac2dde4192 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -216,7 +216,7 @@ <div class="gt-df gt-ac"> {{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}} <span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span> {{.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}} <span class="ui text gt-mr-3 tooltip" data-content="{{.locale.Tr "gpg.default_key"}}">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span> {{.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}} <span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span> {{.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"}} <span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.gpg_key_id"}}:</span> {{.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"}} <span class="ui text gt-mr-3">{{.locale.Tr "repo.commits.ssh_key_fingerprint"}}:</span> {{.Verification.SigningSSHKey.Fingerprint}} {{end}} diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index c80890940a..2374b2a01e 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -58,7 +58,7 @@ </div> <div class="content"> {{if .Verified}} - <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> + <span class="tooltip" data-content="{{$.locale.Tr "settings.gpg_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{$.locale.Tr "settings.gpg_key_verified"}}</strong></span> {{end}} {{if gt (len .Emails) 0}} <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> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 891959d351..691d288b05 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -51,7 +51,7 @@ </div> <div class="content"> {{if .Verified}} - <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> + <span class="tooltip" data-content="{{$.locale.Tr "settings.ssh_key_verified_long"}}">{{svg "octicon-verified"}} <strong>{{$.locale.Tr "settings.ssh_key_verified"}}</strong></span> {{end}} <strong>{{.Name}}</strong> <div class="print meta"> |