test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Use `shared/issueicon` template in projects (#24922) 

We can reuse the recently created subtemplate here. I also checked the
whole templates for similar constructs, these appear to be the only one.

Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
silverwind 2023-05-25 14:25:31 +02:00 committed by GitHub
parent 033d92997f
commit 79087bdb26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/projects/view.tmpl
View File

@ -192,24 +192,8 @@
{{end}} {{end}}
<div class="content gt-p-0"> <div class="content gt-p-0">
<div class="header"> <div class="header">
<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}"> <span class="gt-dif gt-ac gt-vm">
{{if .IsPull}} {{template "shared/issueicon" .}}
{{if .PullRequest.HasMerged}}
{{svg "octicon-git-merge" 16 "text purple"}}
{{else}}
{{if .IsClosed}}
{{svg "octicon-git-pull-request" 16 "text red"}}
{{else}}
{{svg "octicon-git-pull-request" 16 "text green"}}
{{end}}
{{end}}
{{else}}
{{if .IsClosed}}
{{svg "octicon-issue-closed" 16 "text red"}}
{{else}}
{{svg "octicon-issue-opened" 16 "text green"}}
{{end}}
{{end}}
</span> </span>
<a class="project-board-title gt-vm" href="{{.Link}}"> <a class="project-board-title gt-vm" href="{{.Link}}">
{{.Title}} {{.Title}}

20
templates/repo/projects/view.tmpl
View File

@ -198,24 +198,8 @@
{{end}} {{end}}
<div class="content gt-p-0"> <div class="content gt-p-0">
<div class="header"> <div class="header">
<span class="gt-dif gt-ac gt-vm {{if .IsClosed}}red{{else}}green{{end}}"> <span class="gt-dif gt-ac gt-vm">
{{if .IsPull}} {{template "shared/issueicon" .}}
{{if .PullRequest.HasMerged}}
{{svg "octicon-git-merge" 16 "text purple"}}
{{else}}
{{if .IsClosed}}
{{svg "octicon-git-pull-request" 16 "text red"}}
{{else}}
{{svg "octicon-git-pull-request" 16 "text green"}}
{{end}}
{{end}}
{{else}}
{{if .IsClosed}}
{{svg "octicon-issue-closed" 16 "text red"}}
{{else}}
{{svg "octicon-issue-opened" 16 "text green"}}
{{end}}
{{end}}
</span> </span>
<a class="project-board-title gt-vm" href="{{.Link}}"> <a class="project-board-title gt-vm" href="{{.Link}}">
{{.Title}} {{.Title}}