2023-08-31 21:28:45 +00:00
|
|
|
<div id="issue-list" class="flex-list">
|
2022-08-25 21:55:52 +00:00
|
|
|
{{$approvalCounts := .ApprovalCounts}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{range .Issues}}
|
2023-09-08 13:57:18 +00:00
|
|
|
<div class="flex-item">
|
2023-09-09 12:23:57 +00:00
|
|
|
|
|
|
|
<div class="flex-item-icon">
|
2020-11-25 11:20:40 +00:00
|
|
|
{{if $.CanWriteIssuesOrPulls}}
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<input type="checkbox" autocomplete="off" class="issue-checkbox tw-mr-4" data-issue-id={{.ID}} aria-label="{{ctx.Locale.Tr "repo.issues.action_check"}} "{{.Title}}"">
|
2020-11-25 11:20:40 +00:00
|
|
|
{{end}}
|
2023-09-09 12:23:57 +00:00
|
|
|
{{template "shared/issueicon" .}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</div>
|
2023-09-09 12:23:57 +00:00
|
|
|
|
2023-07-31 22:13:42 +00:00
|
|
|
<div class="flex-item-main">
|
|
|
|
<div class="flex-item-header">
|
|
|
|
<div class="flex-item-title">
|
2024-03-08 21:02:05 +00:00
|
|
|
<a class="tw-no-underline issue-title" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">{{RenderEmoji $.Context .Title | RenderCodeBlock}}</a>
|
2023-07-09 19:38:01 +00:00
|
|
|
{{if .IsPull}}
|
|
|
|
{{if (index $.CommitStatuses .PullRequest.ID)}}
|
2023-11-02 14:49:02 +00:00
|
|
|
{{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID)}}
|
2023-07-09 19:38:01 +00:00
|
|
|
{{end}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{end}}
|
Migrate margin and padding helpers to tailwind (#30043)
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
2024-03-24 16:42:49 +00:00
|
|
|
<span class="labels-list tw-ml-1">
|
2023-07-09 19:38:01 +00:00
|
|
|
{{range .Labels}}
|
2024-03-29 18:07:01 +00:00
|
|
|
<a href="?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}{{if ne $.listType "milestone"}}&milestone={{$.MilestoneID}}{{end}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}{{if $.ShowArchivedLabels}}&archived=true{{end}}">{{RenderLabel $.Context ctx.Locale .}}</a>
|
2023-07-09 19:38:01 +00:00
|
|
|
{{end}}
|
|
|
|
</span>
|
|
|
|
</div>
|
|
|
|
{{if or .TotalTrackedTime .Assignees .NumComments}}
|
2023-07-31 22:13:42 +00:00
|
|
|
<div class="flex-item-trailing">
|
2023-07-09 19:38:01 +00:00
|
|
|
{{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}}
|
2024-03-08 21:02:05 +00:00
|
|
|
<a class="ui assignee tw-no-underline" href="{{.HomeLink}}" data-tooltip-content="{{.GetDisplayName}}">
|
2023-08-10 03:19:39 +00:00
|
|
|
{{ctx.AvatarUtils.Avatar . 20}}
|
2023-07-09 19:38:01 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
{{end}}
|
|
|
|
{{if .NumComments}}
|
|
|
|
<div class="text grey">
|
2024-03-08 21:02:05 +00:00
|
|
|
<a class="tw-no-underline muted flex-text-block" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
2023-07-09 19:38:01 +00:00
|
|
|
{{svg "octicon-comment" 16}}{{.NumComments}}
|
|
|
|
</a>
|
|
|
|
</div>
|
2020-11-29 03:26:03 +00:00
|
|
|
{{end}}
|
2023-07-09 19:38:01 +00:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</div>
|
2023-07-31 22:13:42 +00:00
|
|
|
<div class="flex-item-body">
|
2023-07-09 19:38:01 +00:00
|
|
|
<a class="index" href="{{if .Link}}{{.Link}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
|
2020-12-21 08:31:20 +00:00
|
|
|
{{if eq $.listType "dashboard"}}
|
2021-04-11 03:46:37 +00:00
|
|
|
{{.Repo.FullName}}#{{.Index}}
|
|
|
|
{{else}}
|
2020-12-21 08:31:20 +00:00
|
|
|
#{{.Index}}
|
|
|
|
{{end}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</a>
|
2023-09-25 12:42:40 +00:00
|
|
|
{{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}}
|
2022-08-25 21:55:52 +00:00
|
|
|
{{if .OriginalAuthor}}
|
2024-02-25 14:02:20 +00:00
|
|
|
{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{else if gt .Poster.ID 0}}
|
2024-02-25 14:02:20 +00:00
|
|
|
{{ctx.Locale.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.GetDisplayName}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{else}}
|
2024-02-25 14:02:20 +00:00
|
|
|
{{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .Poster.GetDisplayName}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{end}}
|
2022-05-25 13:33:35 +00:00
|
|
|
{{if .IsPull}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<div class="branches flex-text-inline">
|
2022-05-25 13:33:35 +00:00
|
|
|
<div class="branch">
|
2023-02-06 18:09:18 +00:00
|
|
|
<a href="{{.PullRequest.BaseRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.BaseBranch}}">
|
2022-05-25 13:33:35 +00:00
|
|
|
{{/* 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>
|
2023-07-09 19:38:01 +00:00
|
|
|
{{svg "gitea-double-chevron-left" 12}}
|
2022-05-25 13:33:35 +00:00
|
|
|
{{if .PullRequest.HeadRepo}}
|
|
|
|
<div class="branch">
|
2023-02-06 18:09:18 +00:00
|
|
|
<a href="{{.PullRequest.HeadRepo.Link}}/src/branch/{{PathEscapeSegments .PullRequest.HeadBranch}}">
|
2022-05-25 13:33:35 +00:00
|
|
|
{{/* 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}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{if and .Milestone (ne $.listType "milestone")}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<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}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
2022-07-26 13:42:23 +00:00
|
|
|
{{if .Project}}
|
2023-09-29 12:12:54 +00:00
|
|
|
<a class="project flex-text-inline" href="{{.Project.Link ctx}}">
|
2023-07-09 19:38:01 +00:00
|
|
|
{{svg .Project.IconName 14}}{{.Project.Title}}
|
2022-07-26 13:42:23 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
2020-11-25 11:20:40 +00:00
|
|
|
{{if .Ref}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<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}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</a>
|
|
|
|
{{end}}
|
|
|
|
{{$tasks := .GetTasks}}
|
|
|
|
{{if gt $tasks 0}}
|
|
|
|
{{$tasksDone := .GetTasksDone}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<span class="checklist flex-text-inline">
|
|
|
|
{{svg "octicon-checklist" 14}}{{$tasksDone}} / {{$tasks}}
|
2022-05-20 03:04:45 +00:00
|
|
|
<progress value="{{$tasksDone}}" max="{{$tasks}}"></progress>
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
{{if ne .DeadlineUnix 0}}
|
2023-09-25 08:56:50 +00:00
|
|
|
<span class="due-date flex-text-inline" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date"}}">
|
2023-06-22 01:59:49 +00:00
|
|
|
<span{{if .IsOverdue}} class="text red"{{end}}>
|
2023-07-09 19:38:01 +00:00
|
|
|
{{svg "octicon-calendar" 14}}
|
2023-12-28 10:09:57 +00:00
|
|
|
{{DateTime "short" (.DeadlineUnix.FormatDate)}}
|
2020-11-29 15:52:11 +00:00
|
|
|
</span>
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
{{if .IsPull}}
|
|
|
|
{{$approveOfficial := call $approvalCounts .ID "approve"}}
|
|
|
|
{{$rejectOfficial := call $approvalCounts .ID "reject"}}
|
|
|
|
{{$waitingOfficial := call $approvalCounts .ID "waiting"}}
|
|
|
|
{{if gt $approveOfficial 0}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<span class="approvals green flex-text-inline">
|
|
|
|
{{svg "octicon-check" 14}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
{{if gt $rejectOfficial 0}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<span class="rejects red flex-text-inline">
|
|
|
|
{{svg "octicon-diff" 14}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
{{if gt $waitingOfficial 0}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<span class="waiting flex-text-inline">
|
|
|
|
{{svg "octicon-eye" 14}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if and (not .PullRequest.HasMerged) .PullRequest.ConflictedFiles}}
|
2023-07-09 19:38:01 +00:00
|
|
|
<span class="conflicting flex-text-inline">
|
2020-11-25 11:20:40 +00:00
|
|
|
{{svg "octicon-x" 14}}
|
2023-09-25 08:56:50 +00:00
|
|
|
{{ctx.Locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</span>
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
</div>
|
|
|
|
</div>
|
2023-07-31 22:13:42 +00:00
|
|
|
</div>
|
2020-11-25 11:20:40 +00:00
|
|
|
{{end}}
|
2022-01-27 08:30:51 +00:00
|
|
|
{{if .IssueIndexerUnavailable}}
|
|
|
|
<div class="ui error message">
|
2024-03-14 23:24:59 +00:00
|
|
|
<p>{{ctx.Locale.Tr "search.keyword_search_unavailable"}}</p>
|
2022-01-27 08:30:51 +00:00
|
|
|
</div>
|
|
|
|
{{end}}
|
2020-11-25 11:20:40 +00:00
|
|
|
</div>
|
|
|
|
{{template "base/paginate" .}}
|