diff options
| author | 赵智超 <1012112796@qq.com> | 2020-09-06 23:00:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-06 11:00:16 -0400 |
| commit | b613d70b419cb1464711e13aff7c651d4693f4dd (patch) | |
| tree | baa2198030ef25d859e4d001bda9a424a57f1987 /templates | |
| parent | a755e5adeb6eb504e039f12dec6d5e8bb57d3323 (diff) | |
| download | gitea-b613d70b419cb1464711e13aff7c651d4693f4dd.tar.gz gitea-b613d70b419cb1464711e13aff7c651d4693f4dd.zip | |
ui: Show git-pull-request icon for closed pull request (#12742)
As title, I think it's more reasonable, and it's the same as GH.
Signed-off-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/branch/list.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/issue/view_title.tmpl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index d2eedef49c..74025bd530 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -95,9 +95,9 @@ {{if .LatestPullRequest.HasMerged}} <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label purple mini label">{{svg "octicon-git-merge" 16}} {{$.i18n.Tr "repo.pulls.merged"}}</a> {{else if .LatestPullRequest.Issue.IsClosed}} - <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-issue-closed" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a> + <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label red mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.closed_title"}}</a> {{else}} - <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-issue-opened" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a> + <a href="{{.LatestPullRequest.Issue.HTMLURL}}" class="ui text-label green mini label">{{svg "octicon-git-pull-request" 16}} {{$.i18n.Tr "repo.issues.open_title"}}</a> {{end}} {{end}} </td> diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 459c44e78d..ea63dd0737 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -19,7 +19,7 @@ {{if .HasMerged}} <div class="ui purple large label">{{svg "octicon-git-merge" 16}} {{.i18n.Tr "repo.pulls.merged"}}</div> {{else if .Issue.IsClosed}} - <div class="ui red large label">{{svg "octicon-issue-closed" 16}} {{.i18n.Tr "repo.issues.closed_title"}}</div> + <div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request" 16}}{{else}}{{svg "octicon-issue-closed" 16}}{{end}} {{.i18n.Tr "repo.issues.closed_title"}}</div> {{else if .Issue.IsPull}} <div class="ui green large label">{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.issues.open_title"}}</div> {{else}} |