diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-12-24 20:14:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-24 12:14:42 +0000 |
| commit | d7770539f6497e9181d6293700099ac742b03a81 (patch) | |
| tree | d7ccf5e37bf40cbb4e36887319469181e80884ee /templates | |
| parent | 7cc44491fae1e5f00616a5b8d8da2934a8a619f8 (diff) | |
| download | gitea-d7770539f6497e9181d6293700099ac742b03a81.tar.gz gitea-d7770539f6497e9181d6293700099ac742b03a81.zip | |
Improve interface when comparing a branch which has created a pull request (#17911)
* Improve interface when comparing a branch which has created a pull request
* Take the note back
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/compare.tmpl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 51198f4ebf..4517f0029c 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -187,8 +187,22 @@ {{end}} {{else if and .PageIsComparePull (gt .CommitCount 0)}} {{if .HasPullRequest}} - <div class="ui segment"> - {{.i18n.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}} + <div class="ui segment grid title"> + <div class="twelve wide column issue-title"> + {{.i18n.Tr "repo.pulls.has_pull_request" (Escape $.RepoLink) (Escape $.RepoRelPath) .PullRequest.Index | Safe}} + <h1> + <span id="issue-title">{{RenderIssueTitle .PullRequest.Issue.Title $.RepoLink $.Repository.ComposeMetas}}</span> + <span class="index">#{{.PullRequest.Issue.Index}}</span> + </h1> + </div> + <div class="four wide right middle aligned column"> + {{- if .PullRequest.HasMerged -}} + <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button purple show-form">{{svg "octicon-git-merge" 16}} {{.i18n.Tr "repo.pulls.view"}}</a> + {{else if .Issue.IsClosed}} + <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button red show-form">{{svg "octicon-issue-closed" 16}} {{.i18n.Tr "repo.pulls.view"}}</a> + {{else}} + <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button green show-form">{{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls.view"}}</a> + {{end}}</div> </div> {{else}} {{if and $.IsSigned (not .Repository.IsArchived)}} |