Skip to content

Commit 3411b33

Browse files
committed
Fix: remove duplicated signed commit icons
Signed-off-by: Wenxuan Zhao <viz@linux.com>
1 parent ee52498 commit 3411b33

File tree

1 file changed

+32
-33
lines changed

1 file changed

+32
-33
lines changed

templates/repo/commits_list.tmpl

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,55 @@
1313
{{range $r}}
1414
<tr>
1515
<td class="author">
16-
{{$userName := .Author.Name}}
16+
{{$userName := .Author.Name}}
1717
{{if .User}}
1818
{{if .User.FullName}}
19-
{{$userName = .User.FullName}}
19+
{{$userName = .User.FullName}}
2020
{{end}}
21-
<img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{$userName}}</a>
21+
<img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{$userName}}</a>
2222
{{else}}
2323
<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{$userName}}
2424
{{end}}
2525
</td>
2626
<td class="sha">
27-
{{$class := "ui sha label"}}
28-
{{if .Signature}}
29-
{{$class = (printf "%s%s" $class " isSigned")}}
30-
{{if .Verification.Verified}}
31-
{{$class = (printf "%s%s" $class " isVerified")}}
32-
{{else if .Verification.Warning}}
33-
{{$class = (printf "%s%s" $class " isWarning")}}
34-
{{end}}
35-
{{end}}
36-
{{if $.Reponame}}
37-
<a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
38-
{{else}}
39-
<span class="{{$class}}">
40-
{{end}}
27+
{{$class := "ui sha label"}}
28+
{{if .Signature}}
29+
{{$class = (printf "%s%s" $class " isSigned")}}
30+
{{if .Verification.Verified}}
31+
{{$class = (printf "%s%s" $class " isVerified")}}
32+
{{else if .Verification.Warning}}
33+
{{$class = (printf "%s%s" $class " isWarning")}}
34+
{{end}}
35+
{{end}}
36+
{{if $.Reponame}}
37+
<a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
38+
{{else}}
39+
<span class="{{$class}}">
40+
{{end}}
4141
{{ShortSha .ID.String}}
4242
{{if .Signature}}
4343
<div class="ui detail icon button">
4444
{{if .Verification.Verified}}
45-
<i title="{{.Verification.Reason}}" class="lock green icon"></i>
4645
{{if ne .Verification.SigningUser.ID 0}}
47-
<i title="{{.Verification.Reason}}" class="lock green icon"></i>
48-
{{else}}
49-
<i title="{{.Verification.Reason}}" class="icons">
50-
<i class="green lock icon"></i>
51-
<i class="tiny inverted cog icon centerlock"></i>
52-
</i>
53-
{{end}}
46+
<i title="{{.Verification.Reason}}" class="lock green icon"></i>
47+
{{else}}
48+
<i title="{{.Verification.Reason}}" class="icons">
49+
<i class="green lock icon"></i>
50+
<i class="tiny inverted cog icon centerlock"></i>
51+
</i>
52+
{{end}}
5453
{{else if .Verification.Warning}}
55-
<i title="{{$.i18n.Tr .Verification.Reason}}" class="red unlock icon"></i>
56-
{{else}}
54+
<i title="{{$.i18n.Tr .Verification.Reason}}" class="red unlock icon"></i>
55+
{{else}}
5756
<i title="{{$.i18n.Tr .Verification.Reason}}" class="unlock icon"></i>
5857
{{end}}
5958
</div>
6059
{{end}}
61-
{{if $.Reponame}}
62-
</a>
63-
{{else}}
64-
</span>
65-
{{end}}
60+
{{if $.Reponame}}
61+
</a>
62+
{{else}}
63+
</span>
64+
{{end}}
6665
</td>
6766
<td class="message">
6867
<span class="message-wrapper">
@@ -73,7 +72,7 @@
7372
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
7473
{{end}}
7574
{{if eq (CommitType .) "SignCommitWithStatuses"}}
76-
{{template "repo/commit_status" .Status}}
75+
{{template "repo/commit_status" .Status}}
7776
{{end}}
7877
{{if IsMultilineCommitMessage .Message}}
7978
<pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre>

0 commit comments

Comments
 (0)