From 186ba1e1fc2b6681e053dfc9edba5fcb5cc717ea Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 7 Mar 2023 01:32:56 +0900 Subject: [PATCH] Fix incorrect project links and use symlink icon for org-wide projects (#23325) Fix displaying same projects icons between user/repo projects. And fix incorrect projects links. A part of https://github.com/go-gitea/gitea/pull/22865. ![image](https://user-images.githubusercontent.com/18380374/223044279-7b620ff1-d88a-4146-97e6-531bbf269761.png) ![image](https://user-images.githubusercontent.com/18380374/223044390-42911e3f-1f6b-439f-8441-4f3ebf99ea13.png) ![image](https://user-images.githubusercontent.com/18380374/223044437-5cad5391-0f95-4c8b-b0a3-32e263e2854f.png) --- templates/org/menu.tmpl | 2 +- templates/projects/list.tmpl | 4 ++-- templates/repo/issue/new_form.tmpl | 12 ++++++------ templates/repo/projects/list.tmpl | 2 +- templates/shared/issuelist.tmpl | 4 ++-- templates/user/overview/header.tmpl | 2 +- templates/user/profile.tmpl | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 7ca47cd32c56e..25f459c09c56a 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -4,7 +4,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 8d9594e2b4773..489189ec45a1c 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- {{svg "octicon-project" 16 "gt-mr-3"}} + {{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{JsPrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} @@ -38,7 +38,7 @@
{{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project-symlink"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index ac5aaa4801889..4ce4ffb8e3a41 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -176,8 +176,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}}
    {{range .OpenProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -188,8 +188,8 @@ {{.locale.Tr "repo.issues.new.closed_projects"}}
    • {{range .ClosedProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -201,8 +201,8 @@ {{.locale.Tr "repo.issues.new.no_projects"}}
    {{if .Project}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Project.Title}} {{end}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index fc4770e5d8d42..929a1b4c6fb80 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -40,7 +40,7 @@
    {{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 6f3fd0f9167d0..16bb3c1ec7fea 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -87,8 +87,8 @@ {{end}} {{if .Project}} - - {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Title}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 14 "gt-mr-2"}}{{else}}{{svg "octicon-project" 14 "gt-mr-2"}}{{end}}{{.Project.Title}} {{end}} {{if .Ref}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 2449f5fc323e8..ce9ecb46adbc8 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -23,7 +23,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if (not .UnitPackagesGlobalDisabled)}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fcaec60eaec4d..5b445bdb00780 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -107,7 +107,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}}