diff options
author | Denys Konovalov <kontakt@denyskon.de> | 2023-08-12 12:30:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-12 10:30:28 +0000 |
commit | ab78c39e4152e6d2e3ace594a24b6e13cb3a1678 (patch) | |
tree | 369e037b8a22677d3125abb77692a89693d28ef7 /templates/repo/issue | |
parent | 74930b1ccd9acacd1ddaa30d1b4849b0e4570d7c (diff) | |
download | gitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.tar.gz gitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.zip |
Refactor project templates (#26448)
This PR refactors a bunch of projects-related code, mostly the
templates.
The following things were done:
- rename boards to columns in frontend code
- use the new `ctx.Locale.Tr` method
- cleanup template, remove useless newlines, classes, comments
- merge org-/user and repo level project template together
- move "new column" button into project toolbar
- move issue card (shared by projects and pinned issues) to shared
template, remove useless duplicated styles
- add search function to projects (to make the layout more similar to
milestones list where it is inherited from :laughing:)
- maybe more changes I forgot I've done :laughing:
Closes #24893
After:
![Bildschirmfoto vom 2023-08-10
23-02-00](https://github.com/go-gitea/gitea/assets/47871822/cab61456-1d23-4373-8163-e567f1b3b5f9)
![Bildschirmfoto vom 2023-08-10
23-02-26](https://github.com/go-gitea/gitea/assets/47871822/94b55d60-5572-48eb-8111-538a52d8bcc6)
![Bildschirmfoto vom 2023-08-10
23-02-46](https://github.com/go-gitea/gitea/assets/47871822/a0358f4b-4e05-4194-a7bc-6e0ecba5a9b6)
---------
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/repo/issue')
-rw-r--r-- | templates/repo/issue/card.tmpl | 66 | ||||
-rw-r--r-- | templates/repo/issue/list.tmpl | 57 |
2 files changed, 68 insertions, 55 deletions
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl new file mode 100644 index 0000000000..05b7dbaabc --- /dev/null +++ b/templates/repo/issue/card.tmpl @@ -0,0 +1,66 @@ +{{with .Issue}} + {{if eq $.Page.Project.CardType 1}}{{/* Images and Text*/}} + <div class="card-attachment-images"> + {{range (index $.Page.issuesAttachmentMap .ID)}} + <img src="{{.DownloadURL}}" alt="{{.Name}}" /> + {{end}} + </div> + {{end}} + <div class="content gt-p-0 gt-w-100"> + <div class="gt-df gt-items-start"> + <div class="issue-card-icon"> + {{template "shared/issueicon" .}} + </div> + <a class="issue-card-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji ctx | RenderCodeBlock}}</a> + {{if and $.isPinnedIssueCard $.Page.IsRepoAdmin}} + <a role="button" class="issue-card-unpin muted gt-df gt-ac" data-tooltip-content={{ctx.Locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Page.Link}}/unpin/{{.Index}}"> + {{svg "octicon-x" 16}} + </a> + {{end}} + </div> + <div class="meta gt-my-2"> + <span class="text light grey muted-links"> + {{if not $.Page.Repository}}{{.Repo.FullName}}{{end}}#{{.Index}} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}} + {{if .OriginalAuthor}} + {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} + {{else if gt .Poster.ID 0}} + {{ctx.Locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} + {{else}} + {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} + {{end}} + </span> + </div> + {{if .MilestoneID}} + <div class="meta gt-my-2"> + <a class="milestone" href="{{$.Page.RepoLink}}/milestone/{{.MilestoneID}}"> + {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} + <span class="gt-vm">{{.Milestone.Name}}</span> + </a> + </div> + {{end}} + {{if $.Page.LinkedPRs}} + {{range index $.Page.LinkedPRs .ID}} + <div class="meta gt-my-2"> + <a href="{{$.Page.RepoLink}}/pulls/{{.Index}}"> + <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span> + <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span> + </a> + </div> + {{end}} + {{end}} + </div> + + {{if or .Labels .Assignees}} + <div class="extra content labels-list gt-p-0 gt-pt-2"> + {{range .Labels}} + <a target="_blank" href="{{$.Page.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel ctx .}}</a> + {{end}} + <div class="right floated"> + {{range .Assignees}} + <a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{ctx.Locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}}</a> + {{end}} + </div> + </div> + {{end}} +{{end}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 7ae65efedc..789ba4020f 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -6,61 +6,8 @@ {{if .PinnedIssues}} <div id="issue-pins" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}> {{range .PinnedIssues}} - <div class="pinned-issue-card gt-word-break" data-move-url="{{$.Link}}/move_pin" data-issue-id="{{.ID}}"> - {{if eq $.Project.CardType 1}} - <div class="card-attachment-images"> - {{range (index $.issuesAttachmentMap .ID)}} - <img src="{{.DownloadURL}}" alt="{{.Name}}"> - {{end}} - </div> - {{end}} - <div class="content gt-p-0"> - <div class="header gt-df gt-items-start"> - <div class="pinned-issue-icon"> - {{template "shared/issueicon" .}} - </div> - <a class="pinned-issue-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji $.Context | RenderCodeBlock}}</a> - {{if $.IsRepoAdmin}} - <a role="button" class="pinned-issue-unpin muted gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.Index}}"> - {{svg "octicon-x" 16}} - </a> - {{end}} - </div> - <div class="meta gt-my-2"> - <span class="text light grey muted-links"> - #{{.Index}} - {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}} - {{if .OriginalAuthor}} - {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}} - {{else if gt .Poster.ID 0}} - {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}} - {{else}} - {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} - {{end}} - </span> - </div> - {{- if .MilestoneID}} - <div class="meta gt-my-2"> - <a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}"> - {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}} - <span class="gt-vm">{{.Milestone.Name}}</span> - </a> - </div> - {{- end}} - </div> - - {{if or .Labels .Assignees}} - <div class="extra content labels-list gt-p-0 gt-pt-2"> - {{range .Labels}} - <a href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a> - {{end}} - <div class="right floated"> - {{range .Assignees}} - <a href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}}</a> - {{end}} - </div> - </div> - {{end}} + <div class="issue-card gt-word-break {{if $.IsRepoAdmin}}gt-cursor-grab{{end}}" data-move-url="{{$.Link}}/move_pin" data-issue-id="{{.ID}}"> + {{template "repo/issue/card" (dict "Issue" . "Page" $ "isPinnedIssueCard" true)}} </div> {{end}} </div> |