pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use dedicated draft PR icon when possible (#20303)

Browse source 
* Use dedicated draft PR icon when possible

- Currently the generic pull-request icon is used for draft PR's. This
patch changes that by using the dedicated icon for this.
- Resolves #20296

* Use draft title
This commit is contained in:
Gusted 2022-07-10 00:17:04 +02:00 committed by GitHub
parent 11c0748146
commit 87c563b706
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View file

@ -1303,6 +1303,7 @@ issues.previous = Previous
issues.next = Next issues.next = Next
issues.open_title = Open issues.open_title = Open
issues.closed_title = Closed issues.closed_title = Closed
issues.draft_title = Draft
issues.num_comments = %d comments issues.num_comments = %d comments
issues.commented_at = `commented <a href="#%s">%s</a>` issues.commented_at = `commented <a href="#%s">%s</a>`
issues.delete_comment_confirm = Are you sure you want to delete this comment? issues.delete_comment_confirm = Are you sure you want to delete this comment?

4
templates/repo/issue/view_title.tmpl
View file

@ -24,7 +24,11 @@
{{else if .Issue.IsClosed}} {{else if .Issue.IsClosed}}
<div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div> <div class="ui red large label">{{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}</div>
{{else if .Issue.IsPull}} {{else if .Issue.IsPull}}
{{if .IsPullWorkInProgress}}
<div class="ui grey large label">{{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}</div>
{{else}}
<div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div> <div class="ui green large label">{{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}</div>
{{end}}
{{else}} {{else}}
<div class="ui green large label">{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}</div> <div class="ui green large label">{{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}</div>
{{end}} {{end}}

4
templates/shared/issuelist.tmpl
View file

@ -16,10 +16,14 @@
{{else}} {{else}}
{{if .IsClosed}} {{if .IsClosed}}
{{svg "octicon-git-pull-request" 16 "text red"}} {{svg "octicon-git-pull-request" 16 "text red"}}
{{else}}
{{if .PullRequest.IsWorkInProgress}}
{{svg "octicon-git-pull-request-draft" 16 "text grey"}}
{{else}} {{else}}
{{svg "octicon-git-pull-request" 16 "text green"}} {{svg "octicon-git-pull-request" 16 "text green"}}
{{end}} {{end}}
{{end}} {{end}}
{{end}}
{{else}} {{else}}
{{if .IsClosed}} {{if .IsClosed}}
{{svg "octicon-issue-closed" 16 "text red"}} {{svg "octicon-issue-closed" 16 "text red"}}