Skip to content

Forks repository list page follow other repositories page #34784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 21, 2025
Merged

Forks repository list page follow other repositories page #34784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5c2d31
Forks repository list page follow other repositories page
lunny Jun 19, 2025
3573152
Fork list uses owner's avatar
lunny Jun 19, 2025
82653ed
Fix test
lunny Jun 20, 2025
cae834a
Fix test
lunny Jun 20, 2025
aa2e222
Merge branch 'main' into lunny/fork_list
lunny Jun 20, 2025
19c0691
improvements
lunny Jun 21, 2025
5c80b9a
Merge branch 'main' into lunny/fork_list
lunny Jun 21, 2025
37fb679
improvements
lunny Jun 21, 2025
9a80143
Merge branch 'main' into lunny/fork_list
GiteaBot Jun 21, 2025
88677c2
Merge branch 'main' into lunny/fork_list
GiteaBot Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions routers/web/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,9 @@ func Forks(ctx *context.Context) {
}

pager := context.NewPagination(int(total), pageSize, page, 5)
ctx.Data["IsForksPage"] = true
ctx.Data["Page"] = pager

ctx.Data["Forks"] = forks
ctx.Data["Repos"] = forks

ctx.HTML(http.StatusOK, tplForks)
}
2 changes: 1 addition & 1 deletion templates/admin/user/view.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{{ctx.Locale.Tr "admin.repositories"}} ({{ctx.Locale.Tr "admin.total" .ReposTotal}})
</h4>
<div class="ui attached segment">
{{template "explore/repo_list" .}}
{{template "shared/repo/list" .}}
</div>
<h4 class="ui top attached header">
{{ctx.Locale.Tr "settings.organization"}} ({{ctx.Locale.Tr "admin.total" .OrgsTotal}})
Expand Down
4 changes: 2 additions & 2 deletions templates/explore/repos.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<div role="main" aria-label="{{.Title}}" class="page-content explore repositories">
{{template "explore/navbar" .}}
<div class="ui container">
{{template "shared/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions templates/org/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
{{if .ProfileReadmeContent}}
<div id="readme_profile" class="render-content markup" data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
{{end}}
{{template "shared/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
</div>

Expand Down
12 changes: 2 additions & 10 deletions templates/repo/forks.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,8 @@
<h2 class="ui dividing header">
{{ctx.Locale.Tr "repo.forks"}}
</h2>
<div class="flex-list">
{{range .Forks}}
<div class="flex-item tw-border-0 repo-fork-item">
<span>{{ctx.AvatarUtils.Avatar .Owner}}</span>
<span><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{.Link}}">{{.Name}}</a></span>
</div>
{{end}}
</div>
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
</div>

{{template "base/paginate" .}}
</div>
{{template "base/footer" .}}
8 changes: 6 additions & 2 deletions templates/explore/repo_list.tmpl → templates/shared/repo/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
{{range .Repos}}
<div class="flex-item">
<div class="flex-item-leading">
{{template "repo/icon" .}}
{{if $.IsForksPage}}
{{ctx.AvatarUtils.Avatar .Owner 24}}
{{else}}
{{template "repo/icon" .}}
{{end}}
</div>
<div class="flex-item-main">
<div class="flex-item-header">
<div class="flex-item-title">
{{if and (or $.PageIsExplore $.PageIsProfileStarList) .Owner}}
{{if and (or $.IsForksPage $.PageIsExplore $.PageIsProfileStarList) .Owner}}
<a class="text primary name" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/
{{end}}
<a class="text primary name" href="{{.Link}}">{{.Name}}</a>
Expand Down
0 templates/shared/repo_search.tmpl → templates/shared/repo/search.tmpl
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions templates/user/notification/notification_subscriptions.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
{{template "shared/issuelist" dict "." . "listType" "dashboard"}}
{{end}}
{{else}}
{{template "shared/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
{{end}}
</div>
Expand Down
8 changes: 4 additions & 4 deletions templates/user/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
{{template "user/dashboard/feeds" .}}
{{else if eq .TabName "stars"}}
<div class="stars">
{{template "shared/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
</div>
{{else if eq .TabName "following"}}
Expand All @@ -30,8 +30,8 @@
{{else if eq .TabName "organizations"}}
{{template "repo/user_cards" .}}
{{else}}
{{template "shared/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "shared/repo/search" .}}
{{template "shared/repo/list" .}}
{{template "base/paginate" .}}
{{end}}
</div>
Expand Down
Loading