Skip to content

Commit 3f547c7

Browse files
yp05327yp05327
authored
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 #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)
1 parent 471b6d2 commit 3f547c7

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎templates/org/menu.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
55
</a>
66
<a class="{{if .PageIsViewProjects}}active {{end}}item" href="{{$.Org.HomeLink}}/-/projects">
7-
{{svg "octicon-project"}} {{.locale.Tr "user.projects"}}
7+
{{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}}
88
</a>
99
{{if .IsPackageEnabled}}
1010
<a class="item" href="{{$.Org.HomeLink}}/-/packages">

‎templates/projects/list.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{template "base/alert" .}}
1313
<div class="ui compact tiny menu">
1414
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=open">
15-
{{svg "octicon-project" 16 "gt-mr-3"}}
15+
{{svg "octicon-project-symlink" 16 "gt-mr-3"}}
1616
{{JsPrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
1717
</a>
1818
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{$.Link}}?state=closed">
@@ -38,7 +38,7 @@
3838
<div class="milestone list">
3939
{{range .Projects}}
4040
<li class="item">
41-
{{svg "octicon-project"}} <a href="{{$.Link}}/{{.ID}}">{{.Title}}</a>
41+
{{svg "octicon-project-symlink"}} <a href="{{.Link}}">{{.Title}}</a>
4242
<div class="meta">
4343
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
4444
{{if .IsClosed}}

‎templates/repo/issue/new_form.tmpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@
176176
{{.locale.Tr "repo.issues.new.open_projects"}}
177177
</div>
178178
{{range .OpenProjects}}
179-
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">
180-
{{svg "octicon-project" 18 "gt-mr-3"}}
179+
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
180+
{{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}}
181181
{{.Title}}
182182
</a>
183183
{{end}}
@@ -188,8 +188,8 @@
188188
{{.locale.Tr "repo.issues.new.closed_projects"}}
189189
</div>
190190
{{range .ClosedProjects}}
191-
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{$.RepoLink}}/projects/{{.ID}}">
192-
{{svg "octicon-project" 18 "gt-mr-3"}}
191+
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link}}">
192+
{{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}}
193193
{{.Title}}
194194
</a>
195195
{{end}}
@@ -201,8 +201,8 @@
201201
<span class="no-select item {{if .Project}}gt-hidden{{end}}">{{.locale.Tr "repo.issues.new.no_projects"}}</span>
202202
<div class="selected">
203203
{{if .Project}}
204-
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/projects/{{.Project.ID}}">
205-
{{svg "octicon-project" 18 "gt-mr-3"}}
204+
<a class="item muted sidebar-item-link" href="{{.Project.Link}}">
205+
{{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}}
206206
{{.Project.Title}}
207207
</a>
208208
{{end}}

‎templates/repo/projects/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="milestone list">
4141
{{range .Projects}}
4242
<li class="item">
43-
{{svg "octicon-project"}} <a href="{{$.RepoLink}}/projects/{{.ID}}">{{.Title}}</a>
43+
{{svg "octicon-project"}} <a href="{{.Link}}">{{.Title}}</a>
4444
<div class="meta">
4545
{{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}}
4646
{{if .IsClosed}}

‎templates/shared/issuelist.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
</a>
8888
{{end}}
8989
{{if .Project}}
90-
<a class="project" {{if $.RepoLink}}href="{{$.RepoLink}}/projects/{{.Project.ID}}"{{else}}href="{{.Repo.Link}}/projects/{{.Project.ID}}"{{end}}>
91-
{{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Title}}
90+
<a class="project" href="{{.Project.Link}}">
91+
{{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 14 "gt-mr-2"}}{{else}}{{svg "octicon-project" 14 "gt-mr-2"}}{{end}}{{.Project.Title}}
9292
</a>
9393
{{end}}
9494
{{if .Ref}}

‎templates/user/overview/header.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
2424
</a>
2525
<a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item">
26-
{{svg "octicon-project"}} {{.locale.Tr "user.projects"}}
26+
{{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}}
2727
</a>
2828
{{if (not .UnitPackagesGlobalDisabled)}}
2929
<a href="{{.ContextUser.HomeLink}}/-/packages" class="{{if .IsPackagesPage}}active {{end}}item">

‎templates/user/profile.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
108108
</a>
109109
<a href="{{.Owner.HomeLink}}/-/projects" class="{{if eq .TabName "projects"}}active {{end}}item">
110-
{{svg "octicon-project"}} {{.locale.Tr "user.projects"}}
110+
{{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}}
111111
</a>
112112
{{if .IsPackageEnabled}}
113113
<a class='{{if eq .TabName "packages"}}active {{end}}item' href="{{.Owner.HomeLink}}/-/packages">

0 commit comments

Comments
 (0)