mirror of https://github.com/go-gitea/gitea.git
De-emphasize signed commits (#31160)
The new code structure is easier to make more improvements or refactor, for example: change the colors to de-emphasize more, or design some new layouts. --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>pull/33008/head
Blender Defender
1 month ago
committed by
GitHub
parent
ea198f9ea8
commit
079a1ffe8f
@ -0,0 +1,13 @@
|
|||||||
|
{{template "devtest/devtest-header"}}
|
||||||
|
<div class="page-content devtest ui container">
|
||||||
|
<div>
|
||||||
|
<h1>Commit Sign Badges</h1>
|
||||||
|
{{range $commit := .MockCommits}}
|
||||||
|
<div class="flex-text-block tw-my-2">
|
||||||
|
{{template "repo/commit_sign_badge" dict "Commit" $commit "CommitBaseLink" "/devtest/commit" "CommitSignVerification" $commit.Verification}}
|
||||||
|
{{template "repo/commit_sign_badge" dict "CommitSignVerification" $commit.Verification}}
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{template "devtest/devtest-footer"}}
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
{{/* Template attributes:
|
||||||
|
* Commit
|
||||||
|
* CommitBaseLink
|
||||||
|
* CommitSignVerification
|
||||||
|
If you'd like to modify this template, you could test it on the devtest page.
|
||||||
|
ATTENTION: this template could be re-rendered many times (on the graph and commit list page),
|
||||||
|
so this template should be kept as small as possbile, DO NOT put large components like modal/dialog into it.
|
||||||
|
*/}}
|
||||||
|
{{- $commit := $.Commit -}}
|
||||||
|
{{- $commitBaseLink := $.CommitBaseLink -}}
|
||||||
|
{{- $verification := $.CommitSignVerification -}}
|
||||||
|
|
||||||
|
{{- $extraClass := "" -}}
|
||||||
|
{{- $verified := false -}}
|
||||||
|
{{- $signingUser := NIL -}}
|
||||||
|
{{- $signingEmail := "" -}}
|
||||||
|
{{- $msgReasonPrefix := "" -}}
|
||||||
|
{{- $msgReason := "" -}}
|
||||||
|
{{- $msgSigningKey := "" -}}
|
||||||
|
|
||||||
|
{{- if $verification -}}
|
||||||
|
{{- $signingUser = $verification.SigningUser -}}
|
||||||
|
{{- $signingEmail = $verification.SigningEmail -}}
|
||||||
|
{{- $extraClass = print $extraClass " commit-is-signed" -}}
|
||||||
|
{{- if $verification.Verified -}}
|
||||||
|
{{- /* reason is "{name} / {key-id}" */ -}}
|
||||||
|
{{- $msgReason = $verification.Reason -}}
|
||||||
|
{{- $verified = true -}}
|
||||||
|
{{- if eq $verification.TrustStatus "trusted" -}}
|
||||||
|
{{- $extraClass = print $extraClass " sign-trusted" -}}
|
||||||
|
{{- else if eq $verification.TrustStatus "untrusted" -}}
|
||||||
|
{{- $extraClass = print $extraClass " sign-untrusted" -}}
|
||||||
|
{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user" -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- $extraClass = print $extraClass " sign-unmatched" -}}
|
||||||
|
{{- $msgReasonPrefix = ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched" -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- else -}}
|
||||||
|
{{- if $verification.Warning -}}
|
||||||
|
{{- $extraClass = print $extraClass " sign-warning" -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- $msgReason = ctx.Locale.Tr $verification.Reason -}}{{- /* dirty part: it is the translation key ..... */ -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- if $msgReasonPrefix -}}
|
||||||
|
{{- $msgReason = print $msgReasonPrefix ": " $msgReason -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- if $verification.SigningSSHKey -}}
|
||||||
|
{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.ssh_key_fingerprint") ": " $verification.SigningSSHKey.Fingerprint -}}
|
||||||
|
{{- else if $verification.SigningKey -}}
|
||||||
|
{{- $msgSigningKey = print (ctx.Locale.Tr "repo.commits.gpg_key_id") ": " $verification.SigningKey.PaddedKeyID -}}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- if $commit -}}
|
||||||
|
<a {{if $commitBaseLink}}href="{{$commitBaseLink}}/{{$commit.ID}}"{{end}} class="ui label commit-id-short {{$extraClass}}" rel="nofollow">
|
||||||
|
{{- ShortSha $commit.ID.String -}}
|
||||||
|
{{- end -}}
|
||||||
|
<span class="ui label commit-sign-badge {{$extraClass}}">
|
||||||
|
{{- if $verified -}}
|
||||||
|
{{- if and $signingUser $signingUser.ID -}}
|
||||||
|
<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-lock"}}</span>
|
||||||
|
<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.Avatar $signingUser 16}}</span>
|
||||||
|
{{- else -}}
|
||||||
|
<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-lock-cog"}}</span>
|
||||||
|
<span data-tooltip-content="{{$msgSigningKey}}">{{ctx.AvatarUtils.AvatarByEmail $signingEmail "" 16}}</span>
|
||||||
|
{{- end -}}
|
||||||
|
{{- else -}}
|
||||||
|
<span data-tooltip-content="{{$msgReason}}">{{svg "gitea-unlock"}}</span>
|
||||||
|
{{- end -}}
|
||||||
|
</span>
|
||||||
|
|
||||||
|
{{- if $commit -}}
|
||||||
|
</a>
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{- /* This template should be kept as small as possbile, DO NOT put large components like modal/dialog into it. */ -}}
|
||||||
@ -1,15 +0,0 @@
|
|||||||
<div class="ui detail icon button">
|
|
||||||
{{if .verification.Verified}}
|
|
||||||
<div title="{{if eq .verification.TrustStatus "trusted"}}{{else if eq .verification.TrustStatus "untrusted"}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{ctx.Locale.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.verification.Reason}}">
|
|
||||||
{{if ne .verification.SigningUser.ID 0}}
|
|
||||||
{{svg "gitea-lock"}}
|
|
||||||
{{ctx.AvatarUtils.Avatar .verification.SigningUser 16 "signature"}}
|
|
||||||
{{else}}
|
|
||||||
<span title="{{ctx.Locale.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
|
|
||||||
{{ctx.AvatarUtils.AvatarByEmail .verification.SigningEmail "" 16 "signature"}}
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
{{else}}
|
|
||||||
<span title="{{ctx.Locale.Tr .verification.Reason}}">{{svg "gitea-unlock"}}</span>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
Loading…
Reference in New Issue