mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 13:35:54 +01:00
ea00ed320d
Backport #25264 by @silverwind Numerous small UI fixes: - Fix double border in collaborator list - Fix system notice table background - Mute links in repo and org lists - Downsize projects edit buttons - Improve milestones and project list rendering - Condense milestone list entry to a single line of "metas" - Mute ".." button in repo files list <img width="899" alt="Screenshot 2023-06-14 at 21 19 23" src="https://github.com/go-gitea/gitea/assets/115237/40d70006-5f76-49ad-b43c-4343ec3311e1"> <img width="905" alt="Screenshot 2023-06-14 at 21 18 29" src="https://github.com/go-gitea/gitea/assets/115237/46ef39ea-ab26-452d-89b0-a55d0cfacfdb"> <img width="270" alt="Screenshot 2023-06-14 at 21 14 09" src="https://github.com/go-gitea/gitea/assets/115237/aa16e833-a03b-4231-bc7c-159a6a6bee19"> <img width="409" alt="Screenshot 2023-06-14 at 21 12 13" src="https://github.com/go-gitea/gitea/assets/115237/b5242d41-f87a-4837-b0cf-9cc4c1f43daf"> <img width="286" alt="Screenshot 2023-06-14 at 21 10 03" src="https://github.com/go-gitea/gitea/assets/115237/d0c36e47-651b-4d34-ad95-3d59474a7c3e"> <img width="928" alt="Screenshot 2023-06-14 at 21 05 24" src="https://github.com/go-gitea/gitea/assets/115237/fc3b713e-d252-40f5-b6ba-6e5a741ab500"> <img width="217" alt="Screenshot 2023-06-14 at 21 02 01" src="https://github.com/go-gitea/gitea/assets/115237/c4c33376-18d6-4820-aff5-f508f6d351a0"> <img width="79" alt="Screenshot 2023-06-14 at 20 42 43" src="https://github.com/go-gitea/gitea/assets/115237/034b5950-c0bf-473b-a2f7-0c27a0259f29"> <img width="607" alt="Screenshot 2023-06-14 at 21 00 42" src="https://github.com/go-gitea/gitea/assets/115237/fba2d3fd-bd3e-4daf-8b2f-530a1c99c8bc"> Co-authored-by: silverwind <me@silverwind.io>
159 lines
6.8 KiB
Handlebars
159 lines
6.8 KiB
Handlebars
<div class="issue list">
|
|
{{$approvalCounts := .ApprovalCounts}}
|
|
{{range .Issues}}
|
|
<li class="item gt-df gt-py-3">
|
|
<div class="issue-item-left gt-df gt-items-start">
|
|
{{if $.CanWriteIssuesOrPulls}}
|
|
<input type="checkbox" autocomplete="off" class="issue-checkbox gt-mt-2 gt-mr-4" data-issue-id={{.ID}} aria-label="{{$.locale.Tr "repo.issues.action_check"}} "{{.Title}}"">
|
|
{{end}}
|
|
<div class="issue-item-icon">
|
|
{{template "shared/issueicon" .}}
|
|
</div>
|
|
</div>
|
|
<div class="issue-item-main gt-f1 gt-fc gt-df">
|
|
<div class="issue-item-top-row">
|
|
<a class="title 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>
|
|
<div class="desc issue-item-bottom-row gt-df gt-ac gt-fw gt-my-1">
|
|
<a class="index gt-ml-0 gt-mr-2" 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 gt-df gt-ac">
|
|
<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 "gt-mx-1"}}
|
|
{{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" {{if $.RepoLink}}href="{{$.RepoLink}}/milestone/{{.Milestone.ID}}"{{else}}href="{{.Repo.Link}}/milestone/{{.Milestone.ID}}"{{end}}>
|
|
{{svg "octicon-milestone" 14 "gt-mr-2"}}{{.Milestone.Name}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Project}}
|
|
<a class="project" href="{{.Project.Link}}">
|
|
{{svg .Project.IconName 14 "gt-mr-2"}}{{.Project.Title}}
|
|
</a>
|
|
{{end}}
|
|
{{if .Ref}}
|
|
<a class="ref" {{if $.RepoLink}}href="{{index $.IssueRefURLs .ID}}"{{else}}href="{{.Repo.Link}}{{index $.IssueRefURLs .ID}}"{{end}}>
|
|
{{svg "octicon-git-branch" 14 "gt-mr-2"}}{{index $.IssueRefEndNames .ID}}
|
|
</a>
|
|
{{end}}
|
|
{{$tasks := .GetTasks}}
|
|
{{if gt $tasks 0}}
|
|
{{$tasksDone := .GetTasksDone}}
|
|
<span class="checklist">
|
|
{{svg "octicon-checklist" 14 "gt-mr-2"}}{{$tasksDone}} / {{$tasks}}
|
|
<progress value="{{$tasksDone}}" max="{{$tasks}}"></progress>
|
|
</span>
|
|
{{end}}
|
|
{{if ne .DeadlineUnix 0}}
|
|
<span class="due-date" data-tooltip-content="{{$.locale.Tr "repo.issues.due_date"}}">
|
|
<span{{if .IsOverdue}} class="text red"{{end}}>
|
|
{{svg "octicon-calendar" 14 "gt-mr-2"}}
|
|
{{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 gt-df gt-ac green">
|
|
{{svg "octicon-check" 14 "gt-mr-1"}}
|
|
{{$.locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $rejectOfficial 0}}
|
|
<span class="rejects gt-df gt-ac red">
|
|
{{svg "octicon-diff" 14 "gt-mr-2"}}
|
|
{{$.locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}}
|
|
</span>
|
|
{{end}}
|
|
{{if gt $waitingOfficial 0}}
|
|
<span class="waiting gt-df gt-ac">
|
|
{{svg "octicon-eye" 14 "gt-mr-2"}}
|
|
{{$.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 gt-df gt-ac">
|
|
{{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>
|
|
{{if or .TotalTrackedTime .Assignees .NumComments}}
|
|
<div class="issue-item-icons-right gt-df gt-p-2">
|
|
{{if .TotalTrackedTime}}
|
|
<div class="issue-item-icon-right text grey">
|
|
{{svg "octicon-clock" 16 "gt-mr-2"}}
|
|
{{.TotalTrackedTime | Sec2Time}}
|
|
</div>
|
|
{{end}}
|
|
{{if .Assignees}}
|
|
<div class="issue-item-icon-right 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="issue-item-icon-right text grey">
|
|
<a class="gt-no-underline muted" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
|
{{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}}
|
|
</a>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</li>
|
|
{{end}}
|
|
{{if .IssueIndexerUnavailable}}
|
|
<div class="ui error message">
|
|
<p>{{$.locale.Tr "repo.issues.keyword_search_unavailable"}}</p>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{template "base/paginate" .}}
|