From b406025aae8c050b029a9ad2497a75436feb57e4 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 20:41:35 +0200 Subject: [PATCH 01/14] Move branch_selection to sidebar folder --- templates/repo/issue/new_form.tmpl | 2 +- templates/repo/issue/view_content/sidebar.tmpl | 2 +- .../issue/{ => view_content/sidebar}/branch_selector_field.tmpl | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename templates/repo/issue/{ => view_content/sidebar}/branch_selector_field.tmpl (100%) diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 88a6c39e52..465cb44f6f 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -47,7 +47,7 @@
- {{template "repo/issue/branch_selector_field" .}} + {{template "repo/issue/view_content/sidebar/branch_selector_field" .}} {{template "repo/issue/labels/labels_selector_field" .}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index cbea32d303..e8b1b2258f 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -1,5 +1,5 @@
- {{template "repo/issue/branch_selector_field" .}} + {{template "repo/issue/view_content/sidebar/branch_selector_field" .}} {{if .Issue.IsPull}}
diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl similarity index 100% rename from templates/repo/issue/branch_selector_field.tmpl rename to templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl From 66cab785fce8878af2208baf8de45f5dbbc00061 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 21:06:22 +0200 Subject: [PATCH 02/14] Split PR-only templates --- .../repo/issue/view_content/sidebar.tmpl | 125 +----------------- .../view_content/sidebar/pull_review.tmpl | 45 +++++++ .../view_content/sidebar/pull_reviewers.tmpl | 67 ++++++++++ .../issue/view_content/sidebar/pull_wip.tmpl | 11 ++ 4 files changed, 125 insertions(+), 123 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/pull_review.tmpl create mode 100644 templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl create mode 100644 templates/repo/issue/view_content/sidebar/pull_wip.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index e8b1b2258f..37280f69e4 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -1,129 +1,8 @@
{{template "repo/issue/view_content/sidebar/branch_selector_field" .}} {{if .Issue.IsPull}} - -
- - {{ctx.Locale.Tr "repo.issues.review.reviewers"}} - {{if and .CanChooseReviewer (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{if .Reviewers}} -
- {{svg "octicon-search" 16}} - -
- {{end}} - {{if .Reviewers}} - {{range .Reviewers}} - {{if .User}} - - {{svg "octicon-check"}} - - {{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}} - - - {{end}} - {{end}} - {{end}} - {{if .TeamReviewers}} - {{if .Reviewers}} -
- {{end}} - {{range .TeamReviewers}} - {{if .Team}} - - {{svg "octicon-check" 16}} - - {{svg "octicon-people" 16 "tw-ml-4 tw-mr-1"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} - - - {{end}} - {{end}} - {{end}} -
-
- -
- {{ctx.Locale.Tr "repo.issues.new.no_reviewers"}} -
- {{range .PullReviewers}} -
-
- {{if .User}} - {{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}} - {{else if .Team}} - {{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} - {{end}} -
-
- {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged))}} - - {{svg "octicon-x" 20}} - - - {{end}} - {{if .Review.Stale}} - - {{svg "octicon-hourglass" 16}} - - {{end}} - {{if and .CanChange (or .Checked (and (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged)))}} - {{if .Checked}}{{svg "octicon-trash"}}{{else}}{{svg "octicon-sync"}}{{end}} - {{end}} - {{svg (printf "octicon-%s" .Review.Type.Icon) 16 (printf "text %s" (.Review.HTMLTypeColorName))}} -
-
- {{end}} - {{range .OriginalReviews}} -
-
- - {{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "tw-mr-2"}} - {{.OriginalAuthor}} - -
-
- {{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}} -
-
- {{end}} -
-
- {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed)}} -
- - {{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}} - -
- {{end}} + {{template "repo/issue/view_content/sidebar/pull_review" .}} + {{template "repo/issue/view_content/sidebar/pull_wip" .}}
{{end}} diff --git a/templates/repo/issue/view_content/sidebar/pull_review.tmpl b/templates/repo/issue/view_content/sidebar/pull_review.tmpl new file mode 100644 index 0000000000..930c2a6392 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/pull_review.tmpl @@ -0,0 +1,45 @@ + +
+ + {{ctx.Locale.Tr "repo.issues.review.reviewers"}} + {{if and .CanChooseReviewer (not .Repository.IsArchived)}} + {{svg "octicon-gear" 16 "tw-ml-1"}} + {{end}} + +
+ {{if .Reviewers}} +
+ {{svg "octicon-search" 16}} + +
+ {{end}} + {{if .Reviewers}} + {{range .Reviewers}} + {{if .User}} + + {{svg "octicon-check"}} + + {{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{template "repo/search_name" .User}} + + + {{end}} + {{end}} + {{end}} + {{if .TeamReviewers}} + {{if .Reviewers}} +
+ {{end}} + {{range .TeamReviewers}} + {{if .Team}} + + {{svg "octicon-check" 16}} + + {{svg "octicon-people" 16 "tw-ml-4 tw-mr-1"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} + + + {{end}} + {{end}} + {{end}} +
+
+{{template "repo/issue/view_content/sidebar/pull_reviewers" .}} diff --git a/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl b/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl new file mode 100644 index 0000000000..102508fdaf --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/pull_reviewers.tmpl @@ -0,0 +1,67 @@ +
+ {{ctx.Locale.Tr "repo.issues.new.no_reviewers"}} +
+ {{range .PullReviewers}} +
+
+ {{if .User}} + {{ctx.AvatarUtils.Avatar .User 20 "tw-mr-2"}}{{.User.GetDisplayName}} + {{else if .Team}} + {{svg "octicon-people" 20 "tw-mr-2"}}{{$.Issue.Repo.OwnerName}}/{{.Team.Name}} + {{end}} +
+
+ {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged))}} + + {{svg "octicon-x" 20}} + + + {{end}} + {{if .Review.Stale}} + + {{svg "octicon-hourglass" 16}} + + {{end}} + {{if and .CanChange (or .Checked (and (not $.Issue.IsClosed) (not $.Issue.PullRequest.HasMerged)))}} + {{if .Checked}}{{svg "octicon-trash"}}{{else}}{{svg "octicon-sync"}}{{end}} + {{end}} + {{svg (printf "octicon-%s" .Review.Type.Icon) 16 (printf "text %s" (.Review.HTMLTypeColorName))}} +
+
+ {{end}} + {{range .OriginalReviews}} +
+
+ + {{svg (MigrationIcon $.Repository.GetOriginalURLHostname) 20 "tw-mr-2"}} + {{.OriginalAuthor}} + +
+
+ {{svg (printf "octicon-%s" .Type.Icon) 16 (printf "text %s" (.HTMLTypeColorName))}} +
+
+ {{end}} +
+
diff --git a/templates/repo/issue/view_content/sidebar/pull_wip.tmpl b/templates/repo/issue/view_content/sidebar/pull_wip.tmpl new file mode 100644 index 0000000000..f1588b3f80 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/pull_wip.tmpl @@ -0,0 +1,11 @@ +{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .HasMerged) (not .Issue.IsClosed)}} +
+ + {{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}} + +
+{{end}} From 3d5c1c6cef82d366b762a41261b1a14793b37edb Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 22:54:55 +0200 Subject: [PATCH 03/14] Split milestones and projects --- .../repo/issue/view_content/sidebar.tmpl | 80 +------------------ .../view_content/sidebar/milestones.tmpl | 22 +++++ .../issue/view_content/sidebar/projects.tmpl | 54 +++++++++++++ 3 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/milestones.tmpl create mode 100644 templates/repo/issue/view_content/sidebar/projects.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 37280f69e4..b410d1d19c 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -11,86 +11,10 @@
-
- - {{ctx.Locale.Tr "repo.issues.new.milestone"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{template "repo/issue/milestone/select_menu" .}} -
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_milestone"}} -
- {{if .Issue.Milestone}} - - {{svg "octicon-milestone" 18 "tw-mr-2"}} - {{.Issue.Milestone.Name}} - - {{end}} -
-
- + {{template "repo/issue/view_content/sidebar/milestones" .}}
-
- - {{ctx.Locale.Tr "repo.issues.new.projects"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
- {{if or .OpenProjects .ClosedProjects}} -
- {{svg "octicon-search" 16}} - -
- {{end}} -
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
- {{if and (not .OpenProjects) (not .ClosedProjects)}} -
- {{ctx.Locale.Tr "repo.issues.new.no_items"}} -
- {{end}} - {{if .OpenProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.open_projects"}} -
- {{range .OpenProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} - - {{end}} - {{end}} - {{if .ClosedProjects}} -
-
- {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} -
- {{range .ClosedProjects}} - - {{svg .IconName 18 "tw-mr-2"}}{{.Title}} - - {{end}} - {{end}} -
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_projects"}} -
- {{if .Issue.Project}} - - {{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}} - - {{end}} -
-
- + {{template "repo/issue/view_content/sidebar/projects" .}}
diff --git a/templates/repo/issue/view_content/sidebar/milestones.tmpl b/templates/repo/issue/view_content/sidebar/milestones.tmpl new file mode 100644 index 0000000000..661ca80743 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/milestones.tmpl @@ -0,0 +1,22 @@ +
+ + {{ctx.Locale.Tr "repo.issues.new.milestone"}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} + {{svg "octicon-gear" 16 "tw-ml-1"}} + {{end}} + +
+ {{template "repo/issue/milestone/select_menu" .}} +
+
+
+ {{ctx.Locale.Tr "repo.issues.new.no_milestone"}} +
+ {{if .Issue.Milestone}} + + {{svg "octicon-milestone" 18 "tw-mr-2"}} + {{.Issue.Milestone.Name}} + + {{end}} +
+
diff --git a/templates/repo/issue/view_content/sidebar/projects.tmpl b/templates/repo/issue/view_content/sidebar/projects.tmpl new file mode 100644 index 0000000000..91d75f3bd9 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/projects.tmpl @@ -0,0 +1,54 @@ +
+ + {{ctx.Locale.Tr "repo.issues.new.projects"}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} + {{svg "octicon-gear" 16 "tw-ml-1"}} + {{end}} + +
+ {{if or .OpenProjects .ClosedProjects}} +
+ {{svg "octicon-search" 16}} + +
+ {{end}} +
{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}
+ {{if and (not .OpenProjects) (not .ClosedProjects)}} +
+ {{ctx.Locale.Tr "repo.issues.new.no_items"}} +
+ {{end}} + {{if .OpenProjects}} +
+
+ {{ctx.Locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} + + {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + + {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{ctx.Locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} + + {{svg .IconName 18 "tw-mr-2"}}{{.Title}} + + {{end}} + {{end}} +
+
+
+ {{ctx.Locale.Tr "repo.issues.new.no_projects"}} +
+ {{if .Issue.Project}} + + {{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}} + + {{end}} +
+
From 019d32235129afbc1b9effe86511dcec8a7979cc Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 22:58:03 +0200 Subject: [PATCH 04/14] Split assignees --- .../repo/issue/view_content/sidebar.tmpl | 47 +------------------ .../issue/view_content/sidebar/assignees.tmpl | 45 ++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/assignees.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index b410d1d19c..effbdc3072 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -17,52 +17,7 @@ {{template "repo/issue/view_content/sidebar/projects" .}}
- -
- - {{ctx.Locale.Tr "repo.issues.new.assignees"}} - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-gear" 16 "tw-ml-1"}} - {{end}} - -
-
- {{svg "octicon-search" 16}} - -
-
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
- {{range .Assignees}} - - {{$AssigneeID := .ID}} - - {{$checked := false}} - {{range $.Issue.Assignees}} - {{if eq .ID $AssigneeID}} - {{$checked = true}} - {{end}} - {{end}} - {{svg "octicon-check"}} - - {{ctx.AvatarUtils.Avatar . 20 "tw-mr-2"}}{{template "repo/search_name" .}} - - - {{end}} -
-
-
- {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} -
- {{range .Issue.Assignees}} -
- - {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}} - {{.GetDisplayName}} - -
- {{end}} -
-
- + {{template "repo/issue/view_content/sidebar/assignees" .}}
{{if .Participants}} diff --git a/templates/repo/issue/view_content/sidebar/assignees.tmpl b/templates/repo/issue/view_content/sidebar/assignees.tmpl new file mode 100644 index 0000000000..e51bda95de --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/assignees.tmpl @@ -0,0 +1,45 @@ + +
+ + {{ctx.Locale.Tr "repo.issues.new.assignees"}} + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} + {{svg "octicon-gear" 16 "tw-ml-1"}} + {{end}} + +
+
+ {{svg "octicon-search" 16}} + +
+
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
+ {{range .Assignees}} + + {{$AssigneeID := .ID}} + + {{$checked := false}} + {{range $.Issue.Assignees}} + {{if eq .ID $AssigneeID}} + {{$checked = true}} + {{end}} + {{end}} + {{svg "octicon-check"}} + + {{ctx.AvatarUtils.Avatar . 20 "tw-mr-2"}}{{template "repo/search_name" .}} + + + {{end}} +
+
+
+ {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} +
+ {{range .Issue.Assignees}} +
+ + {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}} + {{.GetDisplayName}} + +
+ {{end}} +
+
From dfaeb4692c6933df3e7a19462f567ec1acbd379f Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 23:01:03 +0200 Subject: [PATCH 05/14] Split participants --- templates/repo/issue/view_content/sidebar.tmpl | 9 +-------- .../repo/issue/view_content/sidebar/participants.tmpl | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/participants.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index effbdc3072..5972f3dbcf 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -21,14 +21,7 @@
{{if .Participants}} - {{ctx.Locale.TrN .NumParticipants "repo.issues.num_participants_one" "repo.issues.num_participants_few" .NumParticipants}} -
- {{range .Participants}} - - {{ctx.AvatarUtils.Avatar . 28 "tw-my-0.5 tw-mr-1"}} - - {{end}} -
+ {{template "repo/issue/view_content/sidebar/participants" .}} {{end}} {{if and $.IssueWatch (not .Repository.IsArchived)}} diff --git a/templates/repo/issue/view_content/sidebar/participants.tmpl b/templates/repo/issue/view_content/sidebar/participants.tmpl new file mode 100644 index 0000000000..93e2579d8f --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/participants.tmpl @@ -0,0 +1,8 @@ +{{ctx.Locale.TrN .NumParticipants "repo.issues.num_participants_one" "repo.issues.num_participants_few" .NumParticipants}} +
+ {{range .Participants}} + + {{ctx.AvatarUtils.Avatar . 28 "tw-my-0.5 tw-mr-1"}} + + {{end}} +
From 35c967653b61e54a07e27619cfcf5ac78810ffc4 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 23:03:47 +0200 Subject: [PATCH 06/14] Split watching --- templates/repo/issue/view_content/sidebar.tmpl | 8 ++------ templates/repo/issue/view_content/sidebar/watch.tmpl | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/watch.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 5972f3dbcf..c3e8e24d03 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -27,13 +27,9 @@ {{if and $.IssueWatch (not .Repository.IsArchived)}}
-
- {{ctx.Locale.Tr "notification.notifications"}} -
- {{template "repo/issue/view_content/watching" .}} -
-
+ {{template "repo/issue/view_content/sidebar/watch" .}} {{end}} + {{if .Repository.IsTimetrackerEnabled $.Context}} {{if and .CanUseTimetracker (not .Repository.IsArchived)}}
diff --git a/templates/repo/issue/view_content/sidebar/watch.tmpl b/templates/repo/issue/view_content/sidebar/watch.tmpl new file mode 100644 index 0000000000..852738a706 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/watch.tmpl @@ -0,0 +1,6 @@ +
+ {{ctx.Locale.Tr "notification.notifications"}} +
+ {{template "repo/issue/view_content/watching" .}} +
+
From 47ef51d51ee46976171bab80314baa3798e45d13 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Wed, 24 Apr 2024 23:04:58 +0200 Subject: [PATCH 07/14] Unify watching template --- .../repo/issue/view_content/sidebar/watch.tmpl | 13 ++++++++++++- templates/repo/issue/view_content/watching.tmpl | 12 ------------ 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 templates/repo/issue/view_content/watching.tmpl diff --git a/templates/repo/issue/view_content/sidebar/watch.tmpl b/templates/repo/issue/view_content/sidebar/watch.tmpl index 852738a706..6c74b140c8 100644 --- a/templates/repo/issue/view_content/sidebar/watch.tmpl +++ b/templates/repo/issue/view_content/sidebar/watch.tmpl @@ -1,6 +1,17 @@
{{ctx.Locale.Tr "notification.notifications"}}
- {{template "repo/issue/view_content/watching" .}} +
+ + +
diff --git a/templates/repo/issue/view_content/watching.tmpl b/templates/repo/issue/view_content/watching.tmpl deleted file mode 100644 index 05936d090b..0000000000 --- a/templates/repo/issue/view_content/watching.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -
- - -
From 27a9fd1792cad0de5d12606595283f670cb5e0b8 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 13:24:26 +0200 Subject: [PATCH 08/14] Split timetracking --- .../repo/issue/view_content/sidebar.tmpl | 74 +------------------ .../view_content/sidebar/timetracking.tmpl | 73 ++++++++++++++++++ 2 files changed, 74 insertions(+), 73 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/timetracking.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index c3e8e24d03..866c9e4c12 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -31,79 +31,7 @@ {{end}} {{if .Repository.IsTimetrackerEnabled $.Context}} - {{if and .CanUseTimetracker (not .Repository.IsArchived)}} -
-
- {{ctx.Locale.Tr "repo.issues.tracker"}} -
-
- {{$.CsrfTokenHtml}} -
-
- {{$.CsrfTokenHtml}} -
- {{if $.IsStopwatchRunning}} - - - {{else}} - {{if .HasUserStopwatch}} -
- {{ctx.Locale.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL}} -
- {{end}} - -
-
{{ctx.Locale.Tr "repo.issues.add_time"}}
-
-
- {{$.CsrfTokenHtml}} - - -
-
-
- - -
-
- - {{end}} -
-
- {{end}} - {{if .WorkingUsers}} -
-
- {{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}} -
- {{range $user, $trackedtime := .WorkingUsers}} -
- - {{ctx.AvatarUtils.Avatar $user}} - -
- {{template "shared/user/authorlink" $user}} -
- {{$trackedtime|Sec2Time}} -
-
-
- {{end}} -
-
- {{end}} + {{template "repo/issue/view_content/sidebar/timetracking" .}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar/timetracking.tmpl b/templates/repo/issue/view_content/sidebar/timetracking.tmpl new file mode 100644 index 0000000000..610600b2fb --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/timetracking.tmpl @@ -0,0 +1,73 @@ +{{if and .CanUseTimetracker (not .Repository.IsArchived)}} +
+
+ {{ctx.Locale.Tr "repo.issues.tracker"}} +
+
+ {{$.CsrfTokenHtml}} +
+
+ {{$.CsrfTokenHtml}} +
+ {{if $.IsStopwatchRunning}} + + + {{else}} + {{if .HasUserStopwatch}} +
+ {{ctx.Locale.Tr "repo.issues.tracking_already_started" .OtherStopwatchURL}} +
+ {{end}} + +
+
{{ctx.Locale.Tr "repo.issues.add_time"}}
+
+
+ {{$.CsrfTokenHtml}} + + +
+
+
+ + +
+
+ + {{end}} +
+
+{{end}} +{{if .WorkingUsers}} +
+
+ {{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}} +
+ {{range $user, $trackedtime := .WorkingUsers}} +
+ + {{ctx.AvatarUtils.Avatar $user}} + +
+ {{template "shared/user/authorlink" $user}} +
+ {{$trackedtime|Sec2Time}} +
+
+
+ {{end}} +
+
+{{end}} From cc83b9349df9aa49a9736fe747ecbd668c3448fc Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 13:34:48 +0200 Subject: [PATCH 09/14] Split deadline / due date --- .../repo/issue/view_content/sidebar.tmpl | 42 +------------------ .../view_content/sidebar/due_deadline.tmpl | 41 ++++++++++++++++++ 2 files changed, 42 insertions(+), 41 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/due_deadline.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 866c9e4c12..35e97085c5 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -35,47 +35,7 @@ {{end}}
- {{ctx.Locale.Tr "repo.issues.due_date"}} -
-
- {{svg "octicon-x" 16 "close icon"}} - {{ctx.Locale.Tr "repo.issues.due_date_invalid"}} -
- {{if ne .Issue.DeadlineUnix 0}} -

-

-
- {{svg "octicon-calendar" 16 "tw-mr-2"}} - {{DateTime "long" .Issue.DeadlineUnix.FormatDate}} -
-
- {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} - {{svg "octicon-pencil" 16 "tw-mr-1"}} - {{svg "octicon-trash"}} - {{end}} -
-
-

- {{else}} -

{{ctx.Locale.Tr "repo.issues.due_date_not_set"}}

- {{end}} - - {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} -
-
- {{$.CsrfTokenHtml}} - - -
-
- {{end}} -
+ {{template "repo/issue/view_content/sidebar/due_deadline" .}} {{if .Repository.IsDependenciesEnabled $.Context}}
diff --git a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl new file mode 100644 index 0000000000..2de836b4ed --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl @@ -0,0 +1,41 @@ +{{ctx.Locale.Tr "repo.issues.due_date"}} +
+
+ {{svg "octicon-x" 16 "close icon"}} + {{ctx.Locale.Tr "repo.issues.due_date_invalid"}} +
+ {{if ne .Issue.DeadlineUnix 0}} +

+

+
+ {{svg "octicon-calendar" 16 "tw-mr-2"}} + {{DateTime "long" .Issue.DeadlineUnix.FormatDate}} +
+
+ {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} + {{svg "octicon-pencil" 16 "tw-mr-1"}} + {{svg "octicon-trash"}} + {{end}} +
+
+

+ {{else}} +

{{ctx.Locale.Tr "repo.issues.due_date_not_set"}}

+ {{end}} + + {{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}} +
+
+ {{$.CsrfTokenHtml}} + + +
+
+ {{end}} +
From 0eec8b84a1d63be68d41518bfff0f7f9d9eadb0c Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 13:37:43 +0200 Subject: [PATCH 10/14] Split issue dependencies --- .../repo/issue/view_content/sidebar.tmpl | 146 +----------------- .../view_content/sidebar/dependencies.tmpl | 145 +++++++++++++++++ 2 files changed, 146 insertions(+), 145 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/dependencies.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 35e97085c5..4c14e08013 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -40,151 +40,7 @@ {{if .Repository.IsDependenciesEnabled $.Context}}
-
- {{if (and (not .BlockedByDependencies) (not .BlockedByDependenciesNotPermitted) (not .BlockingDependencies) (not .BlockingDependenciesNotPermitted))}} - {{ctx.Locale.Tr "repo.issues.dependency.title"}} -
-

- {{if .Issue.IsPull}} - {{ctx.Locale.Tr "repo.issues.dependency.pr_no_dependencies"}} - {{else}} - {{ctx.Locale.Tr "repo.issues.dependency.issue_no_dependencies"}} - {{end}} -

- {{end}} - - {{if or .BlockingDependencies .BlockingDependenciesNotPermitted}} - - {{ctx.Locale.Tr "repo.issues.dependency.blocks_short"}} - -
- {{range .BlockingDependencies}} -
-
- - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} - -
- {{.Repository.OwnerName}}/{{.Repository.Name}} -
-
-
- {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} - - {{svg "octicon-trash" 16}} - - {{end}} -
-
- {{end}} - {{if .BlockingDependenciesNotPermitted}} -
- {{ctx.Locale.TrN (len .BlockingDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockingDependenciesNotPermitted)}} -
- {{end}} -
- {{end}} - - {{if or .BlockedByDependencies .BlockedByDependenciesNotPermitted}} - - {{ctx.Locale.Tr "repo.issues.dependency.blocked_by_short"}} - -
- {{range .BlockedByDependencies}} -
-
- - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} - -
- {{.Repository.OwnerName}}/{{.Repository.Name}} -
-
-
- {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} - - {{svg "octicon-trash" 16}} - - {{end}} -
-
- {{end}} - {{if $.CanCreateIssueDependencies}} - {{range .BlockedByDependenciesNotPermitted}} -
-
-
- {{svg "octicon-lock" 16}} - - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} - -
-
- {{.Repository.OwnerName}}/{{.Repository.Name}} -
-
-
- {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} - - {{svg "octicon-trash" 16}} - - {{end}} -
-
- {{end}} - {{else if .BlockedByDependenciesNotPermitted}} -
- {{ctx.Locale.TrN (len .BlockedByDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockedByDependenciesNotPermitted)}} -
- {{end}} -
- {{end}} - - {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} -
-
- {{$.CsrfTokenHtml}} -
- - -
-
-
- {{end}} -
- - {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} - - -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.issues.dependency.remove_header"}} -
-
-
- {{$.CsrfTokenHtml}} - - -
-

{{if .Issue.IsPull}} - {{ctx.Locale.Tr "repo.issues.dependency.pr_remove_text"}} - {{else}} - {{ctx.Locale.Tr "repo.issues.dependency.issue_remove_text"}} - {{end}}

-
- {{$ModalButtonCancelText := ctx.Locale.Tr "repo.issues.dependency.cancel"}} - {{$ModalButtonOkText := ctx.Locale.Tr "repo.issues.dependency.remove"}} - {{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}} -
- {{end}} + {{template "repo/issue/view_content/sidebar/dependencies" .}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar/dependencies.tmpl b/templates/repo/issue/view_content/sidebar/dependencies.tmpl new file mode 100644 index 0000000000..791bd5c4a1 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/dependencies.tmpl @@ -0,0 +1,145 @@ +
+ {{if (and (not .BlockedByDependencies) (not .BlockedByDependenciesNotPermitted) (not .BlockingDependencies) (not .BlockingDependenciesNotPermitted))}} + {{ctx.Locale.Tr "repo.issues.dependency.title"}} +
+

+ {{if .Issue.IsPull}} + {{ctx.Locale.Tr "repo.issues.dependency.pr_no_dependencies"}} + {{else}} + {{ctx.Locale.Tr "repo.issues.dependency.issue_no_dependencies"}} + {{end}} +

+ {{end}} + + {{if or .BlockingDependencies .BlockingDependenciesNotPermitted}} + + {{ctx.Locale.Tr "repo.issues.dependency.blocks_short"}} + +
+ {{range .BlockingDependencies}} +
+
+ + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + +
+ {{.Repository.OwnerName}}/{{.Repository.Name}} +
+
+
+ {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} + + {{svg "octicon-trash" 16}} + + {{end}} +
+
+ {{end}} + {{if .BlockingDependenciesNotPermitted}} +
+ {{ctx.Locale.TrN (len .BlockingDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockingDependenciesNotPermitted)}} +
+ {{end}} +
+ {{end}} + + {{if or .BlockedByDependencies .BlockedByDependenciesNotPermitted}} + + {{ctx.Locale.Tr "repo.issues.dependency.blocked_by_short"}} + +
+ {{range .BlockedByDependencies}} +
+
+ + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + +
+ {{.Repository.OwnerName}}/{{.Repository.Name}} +
+
+
+ {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} + + {{svg "octicon-trash" 16}} + + {{end}} +
+
+ {{end}} + {{if $.CanCreateIssueDependencies}} + {{range .BlockedByDependenciesNotPermitted}} +
+
+
+ {{svg "octicon-lock" 16}} + + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}} + +
+
+ {{.Repository.OwnerName}}/{{.Repository.Name}} +
+
+
+ {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} + + {{svg "octicon-trash" 16}} + + {{end}} +
+
+ {{end}} + {{else if .BlockedByDependenciesNotPermitted}} +
+ {{ctx.Locale.TrN (len .BlockedByDependenciesNotPermitted) "repo.issues.dependency.no_permission_1" "repo.issues.dependency.no_permission_n" (len .BlockedByDependenciesNotPermitted)}} +
+ {{end}} +
+ {{end}} + + {{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} +
+
+ {{$.CsrfTokenHtml}} +
+ + +
+
+
+ {{end}} +
+ +{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}} + + +
+
+ {{svg "octicon-trash"}} + {{ctx.Locale.Tr "repo.issues.dependency.remove_header"}} +
+
+
+ {{$.CsrfTokenHtml}} + + +
+

{{if .Issue.IsPull}} + {{ctx.Locale.Tr "repo.issues.dependency.pr_remove_text"}} + {{else}} + {{ctx.Locale.Tr "repo.issues.dependency.issue_remove_text"}} + {{end}}

+
+ {{$ModalButtonCancelText := ctx.Locale.Tr "repo.issues.dependency.cancel"}} + {{$ModalButtonOkText := ctx.Locale.Tr "repo.issues.dependency.remove"}} + {{template "base/modal_actions_confirm" (dict "." . "ModalButtonCancelText" $ModalButtonCancelText "ModalButtonOkText" $ModalButtonOkText)}} +
+{{end}} From a8f8667a039171bd37a95a1789771c447b8ef287 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 14:43:51 +0200 Subject: [PATCH 11/14] Split references and actions --- .../repo/issue/view_content/sidebar.tmpl | 123 +----------------- .../issue/view_content/sidebar/actions.tmpl | 114 ++++++++++++++++ .../issue/view_content/sidebar/reference.tmpl | 7 + 3 files changed, 123 insertions(+), 121 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/actions.tmpl create mode 100644 templates/repo/issue/view_content/sidebar/reference.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 4c14e08013..b6fe04be63 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -44,131 +44,12 @@ {{end}}
-
- {{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}} -
- {{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}} - -
-
+ {{template "repo/issue/view_content/sidebar/reference" .}} {{if and .IsRepoAdmin (not .Repository.IsArchived)}}
- {{if or .PinEnabled .Issue.IsPinned}} -
- {{$.CsrfTokenHtml}} - -
- {{end}} - - - - - + {{template "repo/issue/view_content/sidebar/actions" .}} {{end}} {{if and .Issue.IsPull .IsIssuePoster (not .Issue.IsClosed) .Issue.PullRequest.HeadRepo}} diff --git a/templates/repo/issue/view_content/sidebar/actions.tmpl b/templates/repo/issue/view_content/sidebar/actions.tmpl new file mode 100644 index 0000000000..36f21822aa --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/actions.tmpl @@ -0,0 +1,114 @@ +{{if or .PinEnabled .Issue.IsPinned}} +
+ {{$.CsrfTokenHtml}} + +
+{{end}} + + + + + diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl new file mode 100644 index 0000000000..bbbc099558 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/reference.tmpl @@ -0,0 +1,7 @@ +
+ {{$issueReferenceLink := printf "%s#%d" .Issue.Repo.FullName .Issue.Index}} +
+ {{ctx.Locale.Tr "repo.issues.reference_link" $issueReferenceLink}} + +
+
From 6bd4925753665d87bef393e869cc24f2f11cc1f5 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 14:56:00 +0200 Subject: [PATCH 12/14] Split allow edits checkbox --- templates/repo/issue/view_content/sidebar.tmpl | 14 +------------- .../sidebar/pull_maintainer_edits.tmpl | 13 +++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index b6fe04be63..5740b79adb 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -53,18 +53,6 @@ {{end}} {{if and .Issue.IsPull .IsIssuePoster (not .Issue.IsClosed) .Issue.PullRequest.HeadRepo}} - {{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}} -
-
-
- - -
-
- {{end}} + {{template "repo/issue/view_content/sidebar/pull_maintainer_edits" .}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl new file mode 100644 index 0000000000..c6a87adde4 --- /dev/null +++ b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl @@ -0,0 +1,13 @@ +{{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}} +
+
+
+ + +
+
+{{end}} From 66b22c58187649c4fc03dfff2c90d6a8de790465 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 15:01:16 +0200 Subject: [PATCH 13/14] Unify allow edits logic --- .../repo/issue/view_content/sidebar.tmpl | 10 ++++++++- .../sidebar/pull_maintainer_edits.tmpl | 21 ++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 5740b79adb..ba15539841 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -52,7 +52,15 @@ {{template "repo/issue/view_content/sidebar/actions" .}} {{end}} - {{if and .Issue.IsPull .IsIssuePoster (not .Issue.IsClosed) .Issue.PullRequest.HeadRepo}} + {{if and + .Issue.IsPull + .IsIssuePoster + (not .Issue.IsClosed) + .Issue.PullRequest.HeadRepo + (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) + .CanWriteToHeadRepo + }} +
{{template "repo/issue/view_content/sidebar/pull_maintainer_edits" .}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl index c6a87adde4..6ec5c05fd7 100644 --- a/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl +++ b/templates/repo/issue/view_content/sidebar/pull_maintainer_edits.tmpl @@ -1,13 +1,10 @@ -{{if and (not (eq .Issue.PullRequest.HeadRepo.FullName .Issue.PullRequest.BaseRepo.FullName)) .CanWriteToHeadRepo}} -
-
-
- - -
+
+
+ +
-{{end}} +
From 5bc72998e0d023cd30bd4474c5a0b37e78345868 Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Thu, 25 Apr 2024 15:08:47 +0200 Subject: [PATCH 14/14] =?UTF-8?q?I=20feel=20responsible=20=E2=80=A6=20(Cod?= =?UTF-8?q?eowners)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … for dealing with conflicts and future modification of this template --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 88c71ba17e..e30d2c42b4 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -16,6 +16,8 @@ web_src/.* @caesar @crystal @gusted # HTML templates used by the backend. templates/.* @caesar @crystal @gusted +## the issue sidebar was touched by fnetx +templates/repo/issue/view_content/sidebar.* @fnetx # Files related to Go development.