mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-09-10 17:01:26 +02:00
This PR introduces a new UI element type for Gitea called `flex-item`. It consists of a horizontal card with a leading, main and trailing part: ![grafik](https://github.com/go-gitea/gitea/assets/47871822/395dd3f3-3906-4481-8f65-be6ac0acbe03) The idea behind it is that in Gitea UI, we have many cases where we use this kind of layout, but it is achieved in many different ways: - grid layout - `.ui.list` with additional hacky flexbox - `.ui.key.list` - looks to me like a style set originally created for ssh/gpg key list, was used in many other places - `.issue.list` - created for issue cards, used in many other places - ... This new style is based on `.issue.list`, specifically the refactoring of it done in #25750. In this PR, the new element is introduced and lots of templates are being refactored to use that style. This allows to remove a lot of page-specific css, makes many of the elements responsive or simply provides a cleaner/better-looking way to present information. A devtest section with the new style is also available. <details> <summary>Screenshots (left: before, right: after)</summary> ![Bildschirmfoto vom 2023-07-09 21-01-21](https://github.com/go-gitea/gitea/assets/47871822/545b7da5-b300-475f-bd6d-b7d836950bb5) ![Bildschirmfoto vom 2023-07-09 21-01-56](https://github.com/go-gitea/gitea/assets/47871822/b6f70415-6795-4f71-a5ea-117d56107ea1) ![Bildschirmfoto vom 2023-07-09 21-02-45](https://github.com/go-gitea/gitea/assets/47871822/47407121-3f2a-4778-8f6d-ad2687c2e7b3) ![Bildschirmfoto vom 2023-07-09 21-03-44](https://github.com/go-gitea/gitea/assets/47871822/76167aaf-c3b2-46f6-9ffd-709f20aa6a34) ![Bildschirmfoto vom 2023-07-09 21-04-52](https://github.com/go-gitea/gitea/assets/47871822/af8fdde5-711e-4524-99cf-fb5d68af85b9) ![Bildschirmfoto vom 2023-07-09 21-05-25](https://github.com/go-gitea/gitea/assets/47871822/ae406946-e3e4-4109-abfe-b3588a07b468) ![Bildschirmfoto vom 2023-07-09 21-06-35](https://github.com/go-gitea/gitea/assets/47871822/2dbacc04-24d6-4f91-9e42-e16d6e4b5f1f) ![Bildschirmfoto vom 2023-07-09 21-09-03](https://github.com/go-gitea/gitea/assets/47871822/d3ca4e56-a72f-4179-adc8-98bfd638025b) ![Bildschirmfoto vom 2023-07-09 21-09-44](https://github.com/go-gitea/gitea/assets/47871822/df1fa689-499c-4e54-b6fb-3b81644b725f) ![Bildschirmfoto vom 2023-07-09 21-10-27](https://github.com/go-gitea/gitea/assets/47871822/b21cac71-a85a-4c8c-bb99-ab90373d8e09) ![Bildschirmfoto vom 2023-07-09 21-11-12](https://github.com/go-gitea/gitea/assets/47871822/89be39cf-0af9-4f2d-9fca-42f9eb5e7824) ![Bildschirmfoto vom 2023-07-09 21-12-01](https://github.com/go-gitea/gitea/assets/47871822/079579ea-1ecb-49c0-b32b-b59ed957caec) ![Bildschirmfoto vom 2023-07-09 21-17-44](https://github.com/go-gitea/gitea/assets/47871822/61ac6ec4-a319-4d5c-9c99-2e02a77295ba) ![Bildschirmfoto vom 2023-07-09 21-18-27](https://github.com/go-gitea/gitea/assets/47871822/5b55b73f-6244-47f7-a3e6-c5e4a7474585) ![Bildschirmfoto vom 2023-07-09 21-19-18](https://github.com/go-gitea/gitea/assets/47871822/c1b7c22e-3e5a-46d4-b8d6-5560db478c0b) ![Bildschirmfoto vom 2023-07-09 21-29-13](https://github.com/go-gitea/gitea/assets/47871822/82ffca8d-ab2e-4a18-9954-5b685bf6a422) ![Bildschirmfoto vom 2023-07-09 21-30-11](https://github.com/go-gitea/gitea/assets/47871822/ad2fdccc-2be8-41bb-bfdc-a084aa387b61) ![Bildschirmfoto vom 2023-07-09 21-32-44](https://github.com/go-gitea/gitea/assets/47871822/2d298ba7-d084-48b5-a139-f86d56262110) ![Bildschirmfoto vom 2023-07-09 21-33-28](https://github.com/go-gitea/gitea/assets/47871822/4cbd838e-9de8-4ad0-8ed9-438da5c9a5cb) </details> --------- Co-authored-by: Giteabot <teabot@gitea.io>
161 lines
6.8 KiB
Handlebars
161 lines
6.8 KiB
Handlebars
<div id="issue-list" class="flex-list gt-pt-4">
|
|
{{$approvalCounts := .ApprovalCounts}}
|
|
{{range .Issues}}
|
|
<div class="flex-item flex-item-baseline">
|
|
<div class="flex-item-leading gt-ac">
|
|
{{if $.CanWriteIssuesOrPulls}}
|
|
<input type="checkbox" autocomplete="off" class="issue-checkbox gt-mr-4" data-issue-id={{.ID}} aria-label="{{$.locale.Tr "repo.issues.action_check"}} "{{.Title}}"">
|
|
{{end}}
|
|
<div class="flex-item-icon">
|
|
{{template "shared/issueicon" .}}
|
|
</div>
|
|
</div>
|
|
<div class="flex-item-main">
|
|
<div class="flex-item-header">
|
|
<div class="flex-item-title">
|
|
<a class="gt-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
|
|
{{if .IsPull}}
|
|
{{if (index $.CommitStatuses .PullRequest.ID)}}
|
|
{{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}}
|
|
{{end}}
|
|
{{end}}
|
|
<span class="labels-list gt-ml-2">
|
|
{{range .Labels}}
|
|
<a href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{RenderLabel $.Context .}}</a>
|
|
{{end}}
|
|
</span>
|
|
</div>
|
|
{{if or .TotalTrackedTime .Assignees .NumComments}}
|
|
<div class="flex-item-trailing">
|
|
{{if .TotalTrackedTime}}
|
|
<div class="text grey flex-text-block">
|
|
{{svg "octicon-clock" 16}}
|
|
{{.TotalTrackedTime | Sec2Time}}
|
|
</div>
|
|
{{end}}
|
|
{{if .Assignees}}
|
|
<div class="text grey">
|
|
{{range .Assignees}}
|
|
<a class="ui assignee gt-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
|
|
{{avatar $.Context . 20}}
|
|
</a>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
{{if .NumComments}}
|
|
<div class="text grey">
|
|
<a class="gt-no-underline muted flex-text-inline" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
|
{{svg "octicon-comment" 16}}{{.NumComments}}
|
|
</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="flex-item-body">
|
|
<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
|
{{if eq $.listType "dashboard"}}
|
|
{{.Repo.FullName}}#{{.Index}}
|
|
{{else}}
|
|
#{{.Index}}
|
|
{{end}}
|
|
</a>
|
|
{{$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}}
|
|
{{if .IsPull}}
|
|
<div class="branches flex-text-inline">
|
|
<div class="branch">
|
|
<a href="{{.PullRequest.BaseRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
|
|
{{/* inline to remove the spaces between spans */}}
|
|
{{if ne .RepoID .PullRequest.BaseRepoID}}<span class="truncated-name">{{.PullRequest.BaseRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.BaseBranch}}</span>
|
|
</a>
|
|
</div>
|
|
{{svg "gitea-double-chevron-left" 12}}
|
|
{{if .PullRequest.HeadRepo}}
|
|
<div class="branch">
|
|
<a href="{{.PullRequest.HeadRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.HeadBranch}}">
|
|
{{/* inline to remove the spaces between spans */}}
|
|
{{if ne .RepoID .PullRequest.HeadRepoID}}<span class="truncated-name">{{.PullRequest.HeadRepo.OwnerName}}</span>:{{end}}<span class="truncated-name">{{.PullRequest.HeadBranch}}</span>
|
|
</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
{{if and .Milestone (ne $.listType "milestone")}}
|
|
<a class="milestone flex-text-inline" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
|
|
{{svg "octicon-milestone" 14}}{{.Milestone.Name}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Project}}
|
|
<a class="project flex-text-inline" href="{{.Project.Link}}">
|
|
{{svg .Project.IconName 14}}{{.Project.Title}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Ref}}
|
|
<a class="ref flex-text-inline" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{.Repo.Link}}{{index $.IssueRefURLs .ID}}"{{end}}>
|
|
{{svg "octicon-git-branch" 14}}{{index $.IssueRefEndNames .ID}}
|
|
</a>
|
|
{{end}}
|
|
{{$tasks := .GetTasks}}
|
|
{{if gt $tasks 0}}
|
|
{{$tasksDone := .GetTasksDone}}
|
|
<span class="checklist flex-text-inline">
|
|
{{svg "octicon-checklist" 14}}{{$tasksDone}} / {{$tasks}}
|
|
<progress value="{{$tasksDone}}" max="{{$tasks}}"></progress>
|
|
</span>
|
|
{{end}}
|
|
{{if ne .DeadlineUnix 0}}
|
|
<span class="due-date flex-text-inline" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
|
|
<span{{if .IsOverdue}} class="text red"{{end}}>
|
|
{{svg "octicon-calendar" 14}}
|
|
{{DateTime "short" .DeadlineUnix}}
|
|
</span>
|
|
</span>
|
|
{{end}}
|
|
{{if .IsPull}}
|
|
{{$approveOfficial := call $approvalCounts .ID "approve"}}
|
|
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
|
|
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
|
|
{{if gt $approveOfficial 0}}
|
|
<span class="approvals green flex-text-inline">
|
|
{{svg "octicon-check" 14}}
|
|
{{$.locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $rejectOfficial 0}}
|
|
<span class="rejects red flex-text-inline">
|
|
{{svg "octicon-diff" 14}}
|
|
{{$.locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $waitingOfficial 0}}
|
|
<span class="waiting flex-text-inline">
|
|
{{svg "octicon-eye" 14}}
|
|
{{$.locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
|
|
<span class="conflicting flex-text-inline">
|
|
{{svg "octicon-x" 14}}
|
|
{{$.locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}}
|
|
</span>
|
|
{{end}}
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
{{if .IssueIndexerUnavailable}}
|
|
<div class="ui error message">
|
|
<p>{{$.locale.Tr "repo.issues.keyword_search_unavailable"}}</p>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|