mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 12:15:43 +01:00
Split PR-only templates
This commit is contained in:
Otto Richter
parent
b406025aae
commit
66cab785fc
4 changed files with 125 additions and 123 deletions
|
|
@ -1,129 +1,8 @@
|
||||||
<div class="issue-content-right ui segment">
|
<div class="issue-content-right ui segment">
|
||||||
{{template "repo/issue/view_content/sidebar/branch_selector_field" .}}
|
{{template "repo/issue/view_content/sidebar/branch_selector_field" .}}
|
||||||
{{if .Issue.IsPull}}
|
{{if .Issue.IsPull}}
|
||||||
<input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}">
|
{{template "repo/issue/view_content/sidebar/pull_review" .}}
|
||||||
<div class="ui {{if or (and (not .Reviewers) (not .TeamReviewers)) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown">
|
{{template "repo/issue/view_content/sidebar/pull_wip" .}}
|
||||||
<a class="text tw-flex tw-items-center muted">
|
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong>
|
|
||||||
{{if and .CanChooseReviewer (not .Repository.IsArchived)}}
|
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
|
||||||
{{end}}
|
|
||||||
</a>
|
|
||||||
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
|
|
||||||
{{if .Reviewers}}
|
|
||||||
<div class="ui icon search input">
|
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{if .Reviewers}}
|
|
||||||
{{range .Reviewers}}
|
|
||||||
{{if .User}}
|
|
||||||
<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_{{.ItemID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
|
||||||
<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
|
|
||||||
<span class="text">
|
|
||||||
{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{if .TeamReviewers}}
|
|
||||||
{{if .Reviewers}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
{{end}}
|
|
||||||
{{range .TeamReviewers}}
|
|
||||||
{{if .Team}}
|
|
||||||
<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_team_{{.Team.ID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
|
||||||
<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check" 16}}</span>
|
|
||||||
<span class="text">
|
|
||||||
{{svg "octicon-people" 16 "tw-ml-4 tw-mr-1"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="ui assignees list">
|
|
||||||
<span class="no-select item {{if or .OriginalReviews .PullReviewers}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_reviewers"}}</span>
|
|
||||||
<div class="selected">
|
|
||||||
{{range .PullReviewers}}
|
|
||||||
<div class="item tw-flex tw-items-center tw-py-2">
|
|
||||||
<div class="tw-flex tw-items-center tw-flex-1">
|
|
||||||
{{if .User}}
|
|
||||||
<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}}</a>
|
|
||||||
{{else if .Team}}
|
|
||||||
<span class="text">{{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
<div class="tw-flex tw-items-center tw-gap-2">
|
|
||||||
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged))}}
|
|
||||||
<a href="#" class="ui muted icon tw-flex tw-items-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
|
|
||||||
{{svg "octicon-x" 20}}
|
|
||||||
</a>
|
|
||||||
<div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}">
|
|
||||||
<div class="header">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.dismiss_review"}}
|
|
||||||
</div>
|
|
||||||
<div class="content">
|
|
||||||
<div class="ui warning message">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
|
|
||||||
</div>
|
|
||||||
<form class="ui form dismiss-review-form" id="dismiss-review-{{.Review.ID}}" action="{{$.RepoLink}}/issues/dismiss_review" method="post">
|
|
||||||
{{$.CsrfTokenHtml}}
|
|
||||||
<input type="hidden" name="review_id" value="{{.Review.ID}}">
|
|
||||||
<div class="field">
|
|
||||||
<label for="message">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</label>
|
|
||||||
<input id="message" name="message">
|
|
||||||
</div>
|
|
||||||
<div class="text right actions">
|
|
||||||
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
|
||||||
<button class="ui red button" type="submit">{{ctx.Locale.Tr "ok"}}</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{if .Review.Stale}}
|
|
||||||
<span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.is_stale"}}">
|
|
||||||
{{svg "octicon-hourglass" 16}}
|
|
||||||
</span>
|
|
||||||
{{end}}
|
|
||||||
{{if and .CanChange (or .Checked (and (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged)))}}
|
|
||||||
<a href="#" class="ui muted icon re-request-review{{if .Checked}} checked{{end}}" data-tooltip-content="{{if .Checked}}{{ctx.Locale.Tr "repo.issues.remove_request_review"}}{{else}}{{ctx.Locale.Tr "repo.issues.re_request_review"}}{{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review">{{if .Checked}}{{svg "octicon-trash"}}{{else}}{{svg "octicon-sync"}}{{end}}</a>
|
|
||||||
{{end}}
|
|
||||||
{{svg (printf "octicon-%s" .Review.Type.Icon) 16 (printf "text %s" (.Review.HTMLTypeColorName))}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{range .OriginalReviews}}
|
|
||||||
<div class="item tw-flex tw-items-center tw-py-2">
|
|
||||||
<div class="tw-flex tw-items-center tw-flex-1">
|
|
||||||
<a class="muted" href="{{$.Repository.OriginalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname}}">
|
|
||||||
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "tw-mr-2"}}
|
|
||||||
{{.OriginalAuthor}}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
<div class="tw-flex tw-items-center tw-gap-2">
|
|
||||||
{{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed)}}
|
|
||||||
<div class="toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefixes="{{JsonUtils.EncodeToString .PullRequestWorkInProgressPrefixes}}" data-update-url="{{.Issue.Link}}/title">
|
|
||||||
<a class="muted">
|
|
||||||
{{if .IsPullWorkInProgress}}
|
|
||||||
{{ctx.Locale.Tr "repo.pulls.ready_for_review"}} {{ctx.Locale.Tr "repo.pulls.remove_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
|
|
||||||
{{else}}
|
|
||||||
{{ctx.Locale.Tr "repo.pulls.still_in_progress"}} {{ctx.Locale.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
|
|
||||||
{{end}}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
|
|
|
||||||
45
templates/repo/issue/view_content/sidebar/pull_review.tmpl
Normal file
45
templates/repo/issue/view_content/sidebar/pull_review.tmpl
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
<input id="reviewer_id" name="reviewer_id" type="hidden" value="{{.reviewer_id}}">
|
||||||
|
<div class="ui {{if or (and (not .Reviewers) (not .TeamReviewers)) (not .CanChooseReviewer) .Repository.IsArchived}}disabled{{end}} floating jump select-reviewers-modify dropdown">
|
||||||
|
<a class="text tw-flex tw-items-center muted">
|
||||||
|
<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong>
|
||||||
|
{{if and .CanChooseReviewer (not .Repository.IsArchived)}}
|
||||||
|
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
||||||
|
{{end}}
|
||||||
|
</a>
|
||||||
|
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/request_review">
|
||||||
|
{{if .Reviewers}}
|
||||||
|
<div class="ui icon search input">
|
||||||
|
<i class="icon">{{svg "octicon-search" 16}}</i>
|
||||||
|
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_reviewers"}}">
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
{{if .Reviewers}}
|
||||||
|
{{range .Reviewers}}
|
||||||
|
{{if .User}}
|
||||||
|
<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_{{.ItemID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
||||||
|
<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
|
||||||
|
<span class="text">
|
||||||
|
{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{if .TeamReviewers}}
|
||||||
|
{{if .Reviewers}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
{{end}}
|
||||||
|
{{range .TeamReviewers}}
|
||||||
|
{{if .Team}}
|
||||||
|
<a class="{{if not .CanChange}}ui{{end}} item {{if .Checked}}checked{{end}} {{if not .CanChange}}ban-change{{end}}" href="#" data-id="{{.ItemID}}" data-id-selector="#review_request_team_{{.Team.ID}}" {{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
||||||
|
<span class="octicon-check {{if not .Checked}}tw-invisible{{end}}">{{svg "octicon-check" 16}}</span>
|
||||||
|
<span class="text">
|
||||||
|
{{svg "octicon-people" 16 "tw-ml-4 tw-mr-1"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{template "repo/issue/view_content/sidebar/pull_reviewers" .}}
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
<div class="ui assignees list">
|
||||||
|
<span class="no-select item {{if or .OriginalReviews .PullReviewers}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_reviewers"}}</span>
|
||||||
|
<div class="selected">
|
||||||
|
{{range .PullReviewers}}
|
||||||
|
<div class="item tw-flex tw-items-center tw-py-2">
|
||||||
|
<div class="tw-flex tw-items-center tw-flex-1">
|
||||||
|
{{if .User}}
|
||||||
|
<a class="muted sidebar-item-link" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}}</a>
|
||||||
|
{{else if .Team}}
|
||||||
|
<span class="text">{{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}}</span>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
<div class="tw-flex tw-items-center tw-gap-2">
|
||||||
|
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged))}}
|
||||||
|
<a href="#" class="ui muted icon tw-flex tw-items-center show-modal" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
|
||||||
|
{{svg "octicon-x" 20}}
|
||||||
|
</a>
|
||||||
|
<div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}">
|
||||||
|
<div class="header">
|
||||||
|
{{ctx.Locale.Tr "repo.issues.dismiss_review"}}
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<div class="ui warning message">
|
||||||
|
{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
|
||||||
|
</div>
|
||||||
|
<form class="ui form dismiss-review-form" id="dismiss-review-{{.Review.ID}}" action="{{$.RepoLink}}/issues/dismiss_review" method="post">
|
||||||
|
{{$.CsrfTokenHtml}}
|
||||||
|
<input type="hidden" name="review_id" value="{{.Review.ID}}">
|
||||||
|
<div class="field">
|
||||||
|
<label for="message">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</label>
|
||||||
|
<input id="message" name="message">
|
||||||
|
</div>
|
||||||
|
<div class="text right actions">
|
||||||
|
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>
|
||||||
|
<button class="ui red button" type="submit">{{ctx.Locale.Tr "ok"}}</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
{{if .Review.Stale}}
|
||||||
|
<span data-tooltip-content="{{ctx.Locale.Tr "repo.issues.is_stale"}}">
|
||||||
|
{{svg "octicon-hourglass" 16}}
|
||||||
|
</span>
|
||||||
|
{{end}}
|
||||||
|
{{if and .CanChange (or .Checked (and (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged)))}}
|
||||||
|
<a href="#" class="ui muted icon re-request-review{{if .Checked}} checked{{end}}" data-tooltip-content="{{if .Checked}}{{ctx.Locale.Tr "repo.issues.remove_request_review"}}{{else}}{{ctx.Locale.Tr "repo.issues.re_request_review"}}{{end}}" data-issue-id="{{$.Issue.ID}}" data-id="{{.ItemID}}" data-update-url="{{$.RepoLink}}/issues/request_review">{{if .Checked}}{{svg "octicon-trash"}}{{else}}{{svg "octicon-sync"}}{{end}}</a>
|
||||||
|
{{end}}
|
||||||
|
{{svg (printf "octicon-%s" .Review.Type.Icon) 16 (printf "text %s" (.Review.HTMLTypeColorName))}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
{{range .OriginalReviews}}
|
||||||
|
<div class="item tw-flex tw-items-center tw-py-2">
|
||||||
|
<div class="tw-flex tw-items-center tw-flex-1">
|
||||||
|
<a class="muted" href="{{$.Repository.OriginalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $.Repository.GetOriginalURLHostname}}">
|
||||||
|
{{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "tw-mr-2"}}
|
||||||
|
{{.OriginalAuthor}}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="tw-flex tw-items-center tw-gap-2">
|
||||||
|
{{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
11
templates/repo/issue/view_content/sidebar/pull_wip.tmpl
Normal file
11
templates/repo/issue/view_content/sidebar/pull_wip.tmpl
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed)}}
|
||||||
|
<div class="toggle-wip" data-title="{{.Issue.Title}}" data-wip-prefixes="{{JsonUtils.EncodeToString .PullRequestWorkInProgressPrefixes}}" data-update-url="{{.Issue.Link}}/title">
|
||||||
|
<a class="muted">
|
||||||
|
{{if .IsPullWorkInProgress}}
|
||||||
|
{{ctx.Locale.Tr "repo.pulls.ready_for_review"}} {{ctx.Locale.Tr "repo.pulls.remove_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
|
||||||
|
{{else}}
|
||||||
|
{{ctx.Locale.Tr "repo.pulls.still_in_progress"}} {{ctx.Locale.Tr "repo.pulls.add_prefix" (index .PullRequestWorkInProgressPrefixes 0)}}
|
||||||
|
{{end}}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
Loading…
Reference in a new issue