]> source.dussan.org Git - gitea.git/commitdiff
Fix: remove duplicated signed commit icons (#8820)
authorWenxuan Zhao <viz@linux.com>
Mon, 4 Nov 2019 10:20:12 +0000 (02:20 -0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Mon, 4 Nov 2019 10:20:12 +0000 (18:20 +0800)
Signed-off-by: Wenxuan Zhao <viz@linux.com>
templates/repo/commits_list.tmpl

index 177c434724ffa633fe669553f433e109f96b581a..dee9dab2b53bbbe567cb533bda07b48d5a1a0773 100644 (file)
                                {{range $r}}
                                        <tr>
                                                <td class="author">
-                                                   {{$userName := .Author.Name}}
+                                                       {{$userName := .Author.Name}}
                                                        {{if .User}}
                                                                {{if .User.FullName}}
-                                                                   {{$userName = .User.FullName}}
+                                                                       {{$userName = .User.FullName}}
                                                                {{end}}
-                                                           <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{$userName}}</a>
+                                                               <img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{$userName}}</a>
                                                        {{else}}
                                                                <img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{$userName}}
                                                        {{end}}
                                                </td>
                                                <td class="sha">
-                                                   {{$class := "ui sha label"}}
-                                                   {{if .Signature}}
-                                                       {{$class = (printf "%s%s" $class " isSigned")}}
-                                {{if .Verification.Verified}}
-                                    {{$class = (printf "%s%s" $class " isVerified")}}
-                                {{else if .Verification.Warning}}
-                                    {{$class = (printf "%s%s" $class " isWarning")}}
-                                {{end}}
-                                                   {{end}}
-                                                   {{if $.Reponame}}
-                                                           <a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
-                                                   {{else}}
-                                                           <span class="{{$class}}">
-                                                   {{end}}
+                                                       {{$class := "ui sha label"}}
+                                                       {{if .Signature}}
+                                                               {{$class = (printf "%s%s" $class " isSigned")}}
+                                                               {{if .Verification.Verified}}
+                                                                       {{$class = (printf "%s%s" $class " isVerified")}}
+                                                               {{else if .Verification.Warning}}
+                                                                       {{$class = (printf "%s%s" $class " isWarning")}}
+                                                               {{end}}
+                                                       {{end}}
+                                                       {{if $.Reponame}}
+                                                               <a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.ID}}" rel="nofollow" class="{{$class}}">
+                                                       {{else}}
+                                                               <span class="{{$class}}">
+                                                       {{end}}
                                                                {{ShortSha .ID.String}}
                                                                {{if .Signature}}
                                                                        <div class="ui detail icon button">
                                                                                {{if .Verification.Verified}}
-                                                                                       <i title="{{.Verification.Reason}}" class="lock green icon"></i>
                                                                                        {{if ne .Verification.SigningUser.ID 0}}
-                                               <i title="{{.Verification.Reason}}" class="lock green icon"></i>
-                                            {{else}}
-                                               <i title="{{.Verification.Reason}}" class="icons">
-                                                       <i class="green lock icon"></i>
-                                                       <i class="tiny inverted cog icon centerlock"></i>
-                                               </i>
-                                            {{end}}
+                                                                                               <i title="{{.Verification.Reason}}" class="lock green icon"></i>
+                                                                                       {{else}}
+                                                                                               <i title="{{.Verification.Reason}}" class="icons">
+                                                                                                       <i class="green lock icon"></i>
+                                                                                                       <i class="tiny inverted cog icon centerlock"></i>
+                                                                                               </i>
+                                                                                       {{end}}
                                                                                {{else if .Verification.Warning}}
-                                               <i title="{{$.i18n.Tr .Verification.Reason}}" class="red unlock icon"></i>
-                                        {{else}}
+                                                                                       <i title="{{$.i18n.Tr .Verification.Reason}}" class="red unlock icon"></i>
+                                                                               {{else}}
                                                                                        <i title="{{$.i18n.Tr .Verification.Reason}}" class="unlock icon"></i>
                                                                                {{end}}
                                                                        </div>
                                                                {{end}}
-                                                   {{if $.Reponame}}
-                                                           </a>
-                                                   {{else}}
-                                                           </span>
-                                                   {{end}}
+                                                       {{if $.Reponame}}
+                                                               </a>
+                                                       {{else}}
+                                                               </span>
+                                                       {{end}}
                                                </td>
                                                <td class="message">
                                                        <span class="message-wrapper">
@@ -73,7 +72,7 @@
                                                        <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
                                                        {{end}}
                                                        {{if eq (CommitType .) "SignCommitWithStatuses"}}
-                                                           {{template "repo/commit_status" .Status}}
+                                                               {{template "repo/commit_status" .Status}}
                                                        {{end}}
                                                        {{if IsMultilineCommitMessage .Message}}
                                                        <pre class="commit-body" style="display: none;">{{RenderCommitBody .Message $.RepoLink $.Repository.ComposeMetas}}</pre>