From f685edf51073ac3be50ff00073a2432b4113bf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=99=BA=E8=B6=85?= <1012112796@qq.com> Date: Fri, 3 Apr 2020 13:12:42 +0800 Subject: [PATCH] Change review status icons on PR view style to Github style (#10737) * change the icon of ApproveReview pr from "eye" to "check" like github * change the icon of RejectReview pr from "x" to "request-change" like github * add "-" after "{{" which need to be one line (TODO: may be not change all) Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: Lunny Xiao Co-authored-by: John Olheiser Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> --- models/review.go | 6 ++-- models/review_test.go | 4 +-- .../repo/issue/view_content/comments.tmpl | 5 ++- templates/repo/issue/view_content/pull.tmpl | 32 +++++++++---------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/models/review.go b/models/review.go index ec28b41d3..993b5577b 100644 --- a/models/review.go +++ b/models/review.go @@ -33,10 +33,10 @@ const ( func (rt ReviewType) Icon() string { switch rt { case ReviewTypeApprove: - return "eye" + return "check" case ReviewTypeReject: - return "x" - case ReviewTypeComment, ReviewTypeUnknown: + return "request-changes" + case ReviewTypeComment: return "comment" default: return "comment" diff --git a/models/review_test.go b/models/review_test.go index a94a65f75..442501240 100644 --- a/models/review_test.go +++ b/models/review_test.go @@ -44,8 +44,8 @@ func TestReview_LoadCodeComments(t *testing.T) { } func TestReviewType_Icon(t *testing.T) { - assert.Equal(t, "eye", ReviewTypeApprove.Icon()) - assert.Equal(t, "x", ReviewTypeReject.Icon()) + assert.Equal(t, "check", ReviewTypeApprove.Icon()) + assert.Equal(t, "request-changes", ReviewTypeReject.Icon()) assert.Equal(t, "comment", ReviewTypeComment.Icon()) assert.Equal(t, "comment", ReviewTypeUnknown.Icon()) assert.Equal(t, "comment", ReviewType(4).Icon()) diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 2e9d8a32b..bb8188def 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -318,7 +318,10 @@ {{else if eq .Type 22}}
- {{svg (printf "octicon-%s" .Review.Type.Icon) 16}} + {{svg (printf "octicon-%s" .Review.Type.Icon) 16}} {{if .OriginalAuthor }} {{else}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 758733fc4..3714e15cf 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -8,9 +8,9 @@
+ {{- else if eq .Type 2}}grey + {{- else if eq .Type 3}}red + {{- else}}grey{{end}}"> {{svg (printf "octicon-%s" .Type.Icon) 16}} {{if .Stale}} @@ -40,19 +40,19 @@ {{end}}
{{svg "octicon-git-merge" 32}} + {{- if .Issue.PullRequest.HasMerged}}purple + {{- else if .Issue.IsClosed}}grey + {{- else if .IsPullWorkInProgress}}grey + {{- else if .IsFilesConflicted}}grey + {{- else if .IsPullRequestBroken}}red + {{- else if .IsBlockedByApprovals}}red + {{- else if .IsBlockedByRejection}}red + {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red + {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow + {{- else if and .RequireSigned (not .WillSign)}}}red + {{- else if .Issue.PullRequest.IsChecking}}yellow + {{- else if .Issue.PullRequest.CanAutoMerge}}green + {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}
{{template "repo/pulls/status" .}}