diff options
| -rw-r--r-- | models/review.go | 6 | ||||
| -rw-r--r-- | models/review_test.go | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/comments.tmpl | 5 | ||||
| -rw-r--r-- | 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 ec28b41d35..993b5577bd 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 a94a65f754..4425012408 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 2e9d8a32ba..bb8188def9 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -318,7 +318,10 @@ </div> {{else if eq .Type 22}} <div class="event" id="{{.HashTag}}"> - <span class="issue-symbol">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span> + <span class="issue-symbol {{if eq .Review.Type 1}}green + {{- else if eq .Review.Type 2}}grey + {{- else if eq .Review.Type 3}}red + {{- else}}grey{{end}}">{{svg (printf "octicon-%s" .Review.Type.Icon) 16}}</span> {{if .OriginalAuthor }} {{else}} <a class="ui avatar image"{{if gt .Poster.ID 0}} href="{{.Poster.HomeLink}}"{{end}}> diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 758733fc44..3714e15cfe 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -8,9 +8,9 @@ <div class="ui divider"></div> <div class="review-item"> <span class="type-icon text {{if eq .Type 1}}green - {{else if eq .Type 2}}grey - {{else if eq .Type 3}}red - {{else}}grey{{end}}"> + {{- else if eq .Type 2}}grey + {{- else if eq .Type 3}}red + {{- else}}grey{{end}}"> {{svg (printf "octicon-%s" .Type.Icon) 16}} </span> {{if .Stale}} @@ -40,19 +40,19 @@ {{end}} <div class="comment merge box"> <a class="avatar text - {{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}}</a> + {{- 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}}</a> <div class="content"> {{template "repo/pulls/status" .}} <div class="ui {{if not $.LatestCommitStatus}}top attached header{{else}}attached merge-section segment{{end}}"> |