Lunny Xiao 6 months ago committed by GitHub
parent
commit
ddd1e6ca83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      routers/web/explore/repo.go
  2. 5
      routers/web/repo/view.go
  3. 1
      routers/web/user/profile.go
  4. 2
      templates/admin/user/view.tmpl
  5. 4
      templates/explore/repos.tmpl
  6. 4
      templates/org/home.tmpl
  7. 14
      templates/repo/forks.tmpl
  8. 8
      templates/shared/repo/list.tmpl
  9. 0
      templates/shared/repo/search.tmpl
  10. 4
      templates/user/notification/notification_subscriptions.tmpl
  11. 8
      templates/user/profile.tmpl
  12. 2
      tests/integration/repo_fork_test.go

1
routers/web/explore/repo.go

@ -151,6 +151,7 @@ func Repos(ctx *context.Context) { @@ -151,6 +151,7 @@ func Repos(ctx *context.Context) {
ctx.Data["CodePageIsDisabled"] = setting.Service.Explore.DisableCodePage
ctx.Data["Title"] = ctx.Tr("explore")
ctx.Data["PageIsExplore"] = true
ctx.Data["ShowRepoOwnerOnList"] = true
ctx.Data["PageIsExploreRepositories"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled

5
routers/web/repo/view.go

@ -394,9 +394,10 @@ func Forks(ctx *context.Context) { @@ -394,9 +394,10 @@ func Forks(ctx *context.Context) {
}
pager := context.NewPagination(int(total), pageSize, page, 5)
ctx.Data["ShowRepoOwnerAvatar"] = true
ctx.Data["ShowRepoOwnerOnList"] = true
ctx.Data["Page"] = pager
ctx.Data["Forks"] = forks
ctx.Data["Repos"] = forks
ctx.HTML(http.StatusOK, tplForks)
}

1
routers/web/user/profile.go

@ -197,6 +197,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R @@ -197,6 +197,7 @@ func prepareUserProfileTabData(ctx *context.Context, profileDbRepo *repo_model.R
total = int(count)
case "stars":
ctx.Data["PageIsProfileStarList"] = true
ctx.Data["ShowRepoOwnerOnList"] = true
repos, count, err = repo_model.SearchRepository(ctx, repo_model.SearchRepoOptions{
ListOptions: db.ListOptions{
PageSize: pagingNum,

2
templates/admin/user/view.tmpl

@ -26,7 +26,7 @@ @@ -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}})

4
templates/explore/repos.tmpl

@ -2,8 +2,8 @@ @@ -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>

4
templates/org/home.tmpl

@ -8,8 +8,8 @@ @@ -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>

14
templates/repo/forks.tmpl

@ -1,20 +1,12 @@ @@ -1,20 +1,12 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository forks">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui container fork-list">
<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
templates/explore/repo_list.tmpl → templates/shared/repo/list.tmpl

@ -2,12 +2,16 @@ @@ -2,12 +2,16 @@
{{range .Repos}}
<div class="flex-item">
<div class="flex-item-leading">
{{template "repo/icon" .}}
{{if $.ShowRepoOwnerAvatar}}
{{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 $.ShowRepoOwnerOnList .Owner}}
<a class="text primary name" href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>/
{{end}}
<a class="text primary name" href="{{.Link}}">{{.Name}}</a>

0
templates/shared/repo_search.tmpl → templates/shared/repo/search.tmpl

4
templates/user/notification/notification_subscriptions.tmpl

@ -69,8 +69,8 @@ @@ -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>

8
templates/user/profile.tmpl

@ -17,8 +17,8 @@ @@ -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"}}
@ -30,8 +30,8 @@ @@ -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>

2
tests/integration/repo_fork_test.go

@ -84,7 +84,7 @@ func TestRepoForkToOrg(t *testing.T) { @@ -84,7 +84,7 @@ func TestRepoForkToOrg(t *testing.T) {
func TestForkListLimitedAndPrivateRepos(t *testing.T) {
defer tests.PrepareTestEnv(t)()
forkItemSelector := ".repo-fork-item"
forkItemSelector := ".fork-list .flex-item"
user1Sess := loginUser(t, "user1")
user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "user1"})

Loading…
Cancel
Save