From 291e145ac55bb1d9ab59424be73703ba5a4b9e52 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sat, 15 Jun 2024 16:11:31 +0000 Subject: [PATCH] Move global issue/pull sidebar filter into an option (#4096) Sidebar repo filtering was removed in gitea1.22-legacy, so in Forgejo 7.0. Now it only has filtering based on issue/pull type (created by me, i'm assigned..), which can easily fit into a regular filtering option to be consistent with other UI pages: subscriptions and repo issues. * move these filtering from sidebar to a "Type" option. You can find the same option in repo issues Affected pages (you can view how "Before" looks like here): * https://codeberg.org/issues * https://codeberg.org/pulls * https://codeberg.org/org/forgejo/issues * https://codeberg.org/org/forgejo/pulls ## Preview https://codeberg.org/attachments/652db186-9bd4-414b-ae0e-06a11f9c1abd https://codeberg.org/attachments/76c2b040-0900-4fed-aa69-e76d31072fa7 ## The inspiration This PR improves consistency with repo issues/pulls view: https://codeberg.org/attachments/2f503ca7-89a0-4c0a-ad37-b0d7755e044d Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4096 Reviewed-by: Mai-Lapyst --- templates/user/dashboard/issues.tmpl | 145 ++++++++++++++------------- 1 file changed, 74 insertions(+), 71 deletions(-) diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index b7cc54091c..0f147d4a5f 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -3,84 +3,87 @@ {{template "user/dashboard/navbar" .}}
{{template "base/alert" .}} -
-
-
- - {{ctx.Locale.Tr "home.issues.in_your_repos"}} - {{CountFmt .IssueStats.YourRepositoriesCount}} - - - {{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} - {{CountFmt .IssueStats.AssignCount}} - - - {{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} - {{CountFmt .IssueStats.CreateCount}} - - {{if .PageIsPulls}} - - {{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} - {{CountFmt .IssueStats.ReviewRequestedCount}} - - - {{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} - {{CountFmt .IssueStats.ReviewedCount}} - - {{end}} - - {{ctx.Locale.Tr "repo.issues.filter_type.mentioning_you"}} - {{CountFmt .IssueStats.MentionCount}} - -
+
+
+ + {{svg "octicon-issue-opened" 16 "tw-mr-2"}} + {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} + + + {{svg "octicon-issue-closed" 16 "tw-mr-2"}} + {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} +
-
-
-
- - {{svg "octicon-issue-opened" 16 "tw-mr-2"}} - {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} +
+
+ + + + {{template "shared/search/input" dict "Value" $.Keyword}} + + {{template "shared/search/button"}} +
+
+
+ + {{if .PageIsOrgIssues}} + {{template "shared/label_filter" .}} + {{end}} + +
+ + {{ctx.Locale.Tr "repo.issues.filter_type"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ +
{{CountFmt .IssueStats.YourRepositoriesCount}}
+ {{ctx.Locale.Tr "home.issues.in_your_repos"}} - - {{svg "octicon-issue-closed" 16 "tw-mr-2"}} - {{ctx.Locale.PrettyNumber .IssueStats.ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} + +
{{CountFmt .IssueStats.AssignCount}}
+ {{ctx.Locale.Tr "repo.issues.filter_type.assigned_to_you"}} + + +
{{CountFmt .IssueStats.CreateCount}}
+ {{ctx.Locale.Tr "repo.issues.filter_type.created_by_you"}} + + {{if .PageIsPulls}} + +
{{CountFmt .IssueStats.ReviewRequestedCount}}
+ {{ctx.Locale.Tr "repo.issues.filter_type.review_requested"}} + + +
{{CountFmt .IssueStats.ReviewedCount}}
+ {{ctx.Locale.Tr "repo.issues.filter_type.reviewed_by_you"}} + + {{end}} + +
{{CountFmt .IssueStats.MentionCount}}
+ {{ctx.Locale.Tr "repo.issues.filter_type.mentioning_you"}} -
-
-
- - - - {{template "shared/search/input" dict "Value" $.Keyword}} - - {{template "shared/search/button"}} -
-
- - {{if .PageIsOrgIssues}} - {{template "shared/label_filter" .}} - {{end}} - -
- - {{ctx.Locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}} -
- {{template "shared/issuelist" dict "." . "listType" "dashboard"}} + +
+ + {{ctx.Locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}} +
+
+ {{template "shared/issuelist" dict "." . "listType" "dashboard"}}
{{template "base/footer" .}}