diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 15a615c706fe6..0153c3c05ccc9 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -73,6 +73,8 @@ func Members(ctx *context.Context) { ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(ctx, members, org.ID) ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus(ctx) + shared_user.RenderUserHeader(ctx) + ctx.HTML(http.StatusOK, tplMembers) } diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 9e65c8ba9cd95..a354ab554b8c6 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -65,6 +65,7 @@ func Teams(ctx *context.Context) { return } + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeams) } @@ -280,6 +281,7 @@ func NewTeam(ctx *context.Context) { ctx.ServerError("LoadHeaderCount", err) return } + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamNew) } @@ -345,6 +347,7 @@ func NewTeamPost(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Units"] = unit_model.Units ctx.Data["Team"] = t + shared_user.RenderUserHeader(ctx) if ctx.HasError() { ctx.HTML(http.StatusOK, tplTeamNew) @@ -395,6 +398,7 @@ func TeamMembers(ctx *context.Context) { ctx.Data["Invites"] = invites ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamMembers) } @@ -414,6 +418,7 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamRepositories) } diff --git a/templates/explore/repo_grid.tmpl b/templates/explore/repo_grid.tmpl new file mode 100644 index 0000000000000..5baa93531bca8 --- /dev/null +++ b/templates/explore/repo_grid.tmpl @@ -0,0 +1,79 @@ +
+ {{range .Repos}} +
+
+
+
+ {{if $.IsPrivate}} + {{svg "octicon-lock" 16}} + {{else if $.IsMirror}} + {{svg "octicon-mirror" 16}} + {{else if $.IsFork}} + {{svg "octicon-repo-forked" 16}} + {{else}} + {{svg "octicon-repo" 16}} + {{end}} + + {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + + + {{if .IsArchived}} + {{ctx.Locale.Tr "repo.desc.archived"}} + {{end}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private_template"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.internal"}} + {{end}} + {{end}} + {{end}} + + {{if .IsFork}} + {{svg "octicon-repo-forked"}} + {{else if .IsMirror}} + {{svg "octicon-mirror"}} + {{end}} +
+
+ {{$description := .DescriptionHTML $.Context}} + {{if $description}} +
{{$description}}
+ {{end}} + {{if .Topics}} +
+ {{range $i, $e := .Topics}} + {{if and (lt $i 5) (ne $e "")}}{{.}}{{end}} + {{end}} +
+ {{end}} +
+
+
+ {{if .PrimaryLanguage}} + + {{.PrimaryLanguage.Language}} + + {{end}} + {{if not $.DisableStars}} + {{svg "octicon-star" 16}}{{.NumStars}} + {{end}} + {{svg "octicon-git-branch" 16}}{{.NumForks}} +
+
+
+ {{else}} +
+ {{ctx.Locale.Tr "explore.repo_no_results"}} +
+ {{end}} +
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index fc65d4691cbe7..b236e8bd050fe 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -40,12 +40,17 @@
- {{if .ProfileReadme}} -
{{.ProfileReadme | Str2html}}
+ {{if eq .TabName "repositories"}} + {{template "explore/repo_search" .}} + {{template "explore/repo_list" .}} + {{template "base/paginate" .}} + {{else}} + {{if .ProfileReadme}} +
{{$.ProfileReadme|Str2html}}
+
+ {{end}} + {{template "explore/repo_grid" .}} {{end}} - {{template "explore/repo_search" .}} - {{template "explore/repo_list" .}} - {{template "base/paginate" .}}
{{if .ShowMemberAndTeamTab}} diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 8a97711ce2876..6a7b31255a994 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,6 +1,9 @@
- + + {{svg "octicon-info"}} {{ctx.Locale.Tr "user.overview"}} + + {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} {{if .RepoCount}}
{{.RepoCount}}
diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index c0cbe2561c558..91f12ca2d82de 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,9 +1,7 @@
- {{if and .HasProfileReadme .ContextUser.IsIndividual}} {{svg "octicon-info"}} {{ctx.Locale.Tr "user.overview"}} - {{end}} {{svg "octicon-repo"}} {{ctx.Locale.Tr "user.repositories"}} {{if .RepoCount}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 426b5f042a583..c66d3d8578ad7 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -29,7 +29,14 @@ {{else if eq .TabName "followers"}} {{template "repo/user_cards" .}} {{else if eq .TabName "overview"}} -
{{.ProfileReadme | Str2html}}
+ {{if .HasProfileReadme}} +
{{.ProfileReadme | Str2html}}
+
+ {{end}} + {{template "explore/repo_grid" .}} +
+ {{template "user/heatmap" .}} + {{template "user/dashboard/feeds" .}} {{else}} {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} diff --git a/web_src/css/index.css b/web_src/css/index.css index f893531b781cb..0283e08e4d5a9 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -14,6 +14,7 @@ @import "./modules/flexcontainer.css"; @import "./shared/flex-list.css"; +@import "./shared/grid-list.css"; @import "./shared/milestone.css"; @import "./shared/repoorg.css"; @import "./shared/settings.css"; diff --git a/web_src/css/shared/grid-list.css b/web_src/css/shared/grid-list.css new file mode 100644 index 0000000000000..fdc848df8b64e --- /dev/null +++ b/web_src/css/shared/grid-list.css @@ -0,0 +1,63 @@ +.grid-list { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(18rem, 1fr)); + gap: 1rem; +} + +.grid-item { + border-radius: 0.5rem; + padding: 1em; + display: grid; + gap: 8px; + align-items: flex-start; + border: 1px solid var(--color-secondary); + grid-template-rows: 1fr min-content; +} + +.grid-item .grid-item-main { + display: grid; + gap: 4px; +} + +.grid-item .grid-item-header { + display: flex; + gap: 0.25rem; + justify-content: space-between; + flex-wrap: wrap; +} + +.grid-item .grid-item-title { + display: inline-flex; + flex-wrap: wrap; + align-items: center; + gap: .25rem; + max-width: 100%; + color: var(--color-text); + font-size: 16px; + font-weight: var(--font-weight-semibold); + word-break: break-word; + min-width: 0; +} + +.grid-item .grid-item-body { + font-size: 13px; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.25rem; + color: var(--color-text-light-2); + word-break: break-word; +} + +.grid-item .grid-item-footer { + grid-column: 1 / -1; +} + +.grid-item .grid-item-trailing { + display: flex; + gap: 0.5rem; + align-items: center; + flex-grow: 0; + flex-wrap: wrap; + justify-content: end; +}