From 519293d5ba9673f318f0f898ba552fc4c2d78646 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 2 Jul 2023 13:24:45 +0530 Subject: [PATCH 01/29] Adjusting profile layout for package, project and code page. Big Profile avatar is implemented. Org profile avatar is separated out from profile avater file. Org layout for code, project, packages and package_versions pages is simplified. --- routers/web/org/projects.go | 4 + routers/web/shared/user/header.go | 90 +++++++++++++ routers/web/user/code.go | 6 +- routers/web/user/package.go | 5 +- templates/org/projects/list.tmpl | 23 +++- templates/package/shared/list.tmpl | 104 ++++++++------- templates/package/shared/versionlist.tmpl | 72 +++++------ templates/projects/list.tmpl | 2 +- templates/shared/user/org_profile_avatar.tmpl | 16 +++ templates/shared/user/profile_big_avatar.tmpl | 116 +++++++++++++++++ templates/user/code.tmpl | 76 ++++++++--- templates/user/overview/header.tmpl | 22 +--- templates/user/overview/package_versions.tmpl | 23 +++- templates/user/overview/packages.tmpl | 27 +++- templates/user/profile.tmpl | 119 +----------------- 15 files changed, 453 insertions(+), 252 deletions(-) create mode 100644 templates/shared/user/org_profile_avatar.tmpl create mode 100644 templates/shared/user/profile_big_avatar.tmpl diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index e525f2c43f3ac..18537b38c2579 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -41,6 +41,10 @@ func MustEnableProjects(ctx *context.Context) { // Projects renders the home page of projects func Projects(ctx *context.Context) { + shared_user.PrepareContextForProfileBigAvatar(ctx) + if ctx.ContextUser.IsOrganization() { + ctx.Data["pageStyleClasses"] = "container" + } ctx.Data["Title"] = ctx.Tr("repo.project_board") sortType := ctx.FormTrim("sort") diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 9594e6975a8ef..e88ea61c21d89 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -4,12 +4,102 @@ package user import ( + "fmt" + + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" ) +// PrepareContextForProfileBigAvatar set the context for big avatar view on repo +func PrepareContextForProfileBigAvatar(ctx *context.Context) { + // check view permissions + if !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { + ctx.NotFound("user", fmt.Errorf(ctx.ContextUser.Name)) + return + } + + // advertise feed via meta tag + ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() + + // Show OpenID URIs + openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID) + if err != nil { + ctx.ServerError("GetUserOpenIDs", err) + return + } + + var isFollowing bool + if ctx.Doer != nil { + isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) + } + + ctx.Data["ContextUser"] = ctx.ContextUser + ctx.Data["OpenIDs"] = openIDs + ctx.Data["IsFollowing"] = isFollowing + + if len(ctx.ContextUser.Description) != 0 { + content, err := markdown.RenderString(&markup.RenderContext{ + URLPrefix: ctx.Repo.RepoLink, + Metas: map[string]string{"mode": "document"}, + GitRepo: ctx.Repo.GitRepo, + Ctx: ctx, + }, ctx.ContextUser.Description) + if err != nil { + ctx.ServerError("RenderString", err) + return + } + ctx.Data["RenderedDescription"] = content + } + showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) + orgs, err := organization.FindOrgs(organization.FindOrgOptions{ + UserID: ctx.ContextUser.ID, + IncludePrivate: showPrivate, + }) + if err != nil { + ctx.ServerError("FindOrgs", err) + return + } + ctx.Data["Orgs"] = orgs + ctx.Data["HasOrgsVisible"] = organization.HasOrgsVisible(orgs, ctx.Doer) + + badges, _, err := user_model.GetUserBadges(ctx, ctx.ContextUser) + if err != nil { + ctx.ServerError("GetUserBadges", err) + return + } + ctx.Data["Badges"] = badges + + pagingNum := setting.UI.User.RepoPagingNum + page := ctx.FormInt("page") + _, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ + PageSize: pagingNum, + Page: page, + }) + if err != nil { + ctx.ServerError("GetUserFollowers", err) + return + } + ctx.Data["NumFollowers"] = numFollowers + _, numFollowing, err := user_model.GetUserFollowing(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ + PageSize: pagingNum, + Page: page, + }) + if err != nil { + ctx.ServerError("GetUserFollowing", err) + return + } + ctx.Data["NumFollowing"] = numFollowing + ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate + ctx.Data["EnableFeed"] = setting.Other.EnableFeed +} + func RenderUserHeader(ctx *context.Context) { ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 15524de7d651e..96def1e998cbd 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -4,6 +4,7 @@ package user import ( + shared_user "code.gitea.io/gitea/routers/web/shared/user" "net/http" repo_model "code.gitea.io/gitea/models/repo" @@ -19,11 +20,14 @@ const ( // CodeSearch render user/organization code search page func CodeSearch(ctx *context.Context) { + shared_user.PrepareContextForProfileBigAvatar(ctx) + if ctx.ContextUser.IsOrganization() { + ctx.Data["pageStyleClasses"] = "container" + } if !setting.Indexer.RepoIndexerEnabled { ctx.Redirect(ctx.ContextUser.HomeLink()) return } - ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 20141914b655b..882f7d44e6f7e 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -36,6 +36,10 @@ const ( // ListPackages displays a list of all packages of the context user func ListPackages(ctx *context.Context) { + shared_user.PrepareContextForProfileBigAvatar(ctx) + if ctx.ContextUser.IsOrganization() { + ctx.Data["pageStyleClasses"] = "container" + } page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -104,7 +108,6 @@ func ListPackages(ctx *context.Context) { org := org_model.OrgFromUser(ctx.ContextUser) ctx.Data["Org"] = org ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink() - if ctx.Doer != nil { ctx.Data["IsOrganizationMember"], _ = org_model.IsOrganizationMember(ctx, org.ID, ctx.Doer.ID) ctx.Data["IsOrganizationOwner"], _ = org_model.IsOrganizationOwner(ctx, org.ID, ctx.Doer.ID) diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 1f113b28c84c9..1f1cdd4ce41b5 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,6 +1,25 @@ {{template "base/head" .}} -
+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}} {{template "projects/list" .}} -
+
+{{else}} +
+
+
+
+ {{template "shared/user/profile_big_avatar" .}} +
+
+
+ {{template "user/overview/header" .}} +
+ {{template "projects/list" .}} +
+
+
+
+{{end}} {{template "base/footer" .}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 3d14eda3efa19..58b1d9db63777 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,55 +1,63 @@ -
- {{template "base/alert" .}} -
-
- {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - -
-
-
- {{range .PackageDescriptors}} -
  • -
    -
    - {{.Package.Name}} - {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} -
    -
    - {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} - {{$hasRepositoryAccess := false}} - {{if .Repository}} - {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} - {{end}} - {{if $hasRepositoryAccess}} - {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} - {{else}} - {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} +
    +
    + {{template "base/alert" .}} +
    +
    + +
    + + {{svg "octicon-x" 14 "remove icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    {{.locale.Tr "packages.filter.type"}}
    +
    + {{range $type := .AvailableTypes}} +
    + {{$type.Name}} +
    {{end}}
    -
    • - {{else}} - {{if not .HasPackages}} -
    - {{svg "octicon-package" 48}} -

    {{.locale.Tr "packages.empty"}}

    - {{if and .Repository .CanWritePackages}} - {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} -

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    - {{end}} -

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    -
    + +
    + +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Package.Name}} + {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} +
    +
    + {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} + {{$hasRepositoryAccess := false}} + {{if .Repository}} + {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} + {{end}} + {{if $hasRepositoryAccess}} + {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} + {{else}} + {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} + {{end}} +
    +
    +
    • {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    + {{if not .HasPackages}} +
    + {{svg "octicon-package" 48}} +

    {{.locale.Tr "packages.empty"}}

    + {{if and .Repository .CanWritePackages}} + {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} +

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    + {{end}} +

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    +
    + {{else}} +

    {{.locale.Tr "packages.filter.no_result"}}

    + {{end}} {{end}} - {{end}} - {{template "base/paginate" .}} + {{template "base/paginate" .}} +
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 23cd0bfcc0ded..601769625e28f 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,39 +1,41 @@ -
    -

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    -
    -
    - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - {{if eq .PackageDescriptor.Package.Type "container"}} - +
    +
    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    + +
    + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + + {{if eq .PackageDescriptor.Package.Type "container"}} + + {{end}} + +
    + +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Version.LowerVersion}} +
    +
    + {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} +
    +
    +
    • + {{else}} +

    {{.locale.Tr "packages.filter.no_result"}}

    {{end}} - + {{template "base/paginate" .}}
    - -
    - {{range .PackageDescriptors}} -
  • -
    -
    - {{.Version.LowerVersion}} -
    -
    - {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} -
    -
    -
    • - {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    - {{end}} - {{template "base/paginate" .}}
    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 9725c1e63b337..4f09aa931272a 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,5 +1,5 @@
    -
    +
    {{if .CanWriteProjects}}
    diff --git a/templates/shared/user/org_profile_avatar.tmpl b/templates/shared/user/org_profile_avatar.tmpl new file mode 100644 index 0000000000000..a56763e288966 --- /dev/null +++ b/templates/shared/user/org_profile_avatar.tmpl @@ -0,0 +1,16 @@ +{{with .ContextUser}} +
    +
    +
    +
    + {{avatar $.Context . 100}} + {{.DisplayName}} + + {{if .Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .Visibility.IsPrivate}}
    {{$.locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} +     +
    +
    +
    +
    +{{end}} diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl new file mode 100644 index 0000000000000..408877e481e86 --- /dev/null +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -0,0 +1,116 @@ +
    +
    + {{if eq .SignedUserID .ContextUser.ID}} + + {{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}} + {{avatar $.Context .ContextUser 256}} + + {{else}} + + {{avatar $.Context .ContextUser 256}} + + {{end}} +
    +
    + {{if .ContextUser.FullName}}{{.ContextUser.FullName}}{{end}} + {{.ContextUser.Name}} + {{if .EnableFeed}} + {{svg "octicon-rss" 18}} + {{end}} +
    + {{svg "octicon-person" 18 "gt-mr-2"}}{{.NumFollowers}} {{.locale.Tr "user.followers"}} · {{.NumFollowing}} {{.locale.Tr "user.following"}} +
    +
    +
    +
      + {{if .ContextUser.Location}} +
    • {{svg "octicon-location"}} {{.ContextUser.Location}}
      • + {{end}} + {{if (eq .SignedUserID .ContextUser.ID)}} +
    • + {{svg "octicon-mail"}} + {{.ContextUser.Email}} + + {{if .ShowUserEmail}} + + {{svg "octicon-unlock"}} + + {{else}} + + {{svg "octicon-lock"}} + + {{end}} + +
      • + {{else}} + {{if .ShowUserEmail}} +
    • + {{svg "octicon-mail"}} + {{.ContextUser.Email}} +
      • + {{end}} + {{end}} + {{if .ContextUser.Website}} +
    • + {{svg "octicon-link"}} + {{.ContextUser.Website}} +
      • + {{end}} + {{if $.RenderedDescription}} +
    • +
      {{$.RenderedDescription|Str2html}}
      +
      • + {{end}} + {{range .OpenIDs}} + {{if .Show}} +
    • + {{svg "fontawesome-openid"}} + {{.URI}} +
      • + {{end}} + {{end}} +
    • {{svg "octicon-clock"}} {{.locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix) | Safe}}
      • + {{if and .Orgs .HasOrgsVisible}} +
    • +
        + {{range .Orgs}} + {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.HasMemberWithUserID $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}} +
      • + + {{avatar $.Context .}} + +
        • + {{end}} + {{end}} +
      +
      • + {{end}} + {{if .Badges}} +
    • +
        + {{range .Badges}} +
      • + {{.Description}} +
        • + {{end}} +
      +
      • + {{end}} + {{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}} + + {{end}} +
    +
    +
    diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index cc02ef8314d3b..787f9479b0d6b 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -1,25 +1,61 @@ {{template "base/head" .}} -
    - {{template "user/overview/header" .}} -
    - {{template "code/searchform" .}} -
    -
    - {{if .CodeIndexerUnavailable}} -
    -

    {{$.locale.Tr "explore.code_search_unavailable"}}

    +{{if .ContextUser.IsOrganization}} +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} +
    + {{template "code/searchform" .}} +
    +
    + {{if .CodeIndexerUnavailable}} +
    +

    {{$.locale.Tr "explore.code_search_unavailable"}}

    +
    + {{else if .SearchResults}} +

    + {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

    + {{template "code/searchresults" .}} + {{else if .Keyword}} +
    {{$.locale.Tr "explore.code_no_results"}}
    + {{end}} +
    + {{template "base/paginate" .}} +
    +
    +{{else}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    +
    + {{template "code/searchform" .}} +
    +
    + {{if .CodeIndexerUnavailable}} +
    +

    {{$.locale.Tr "explore.code_search_unavailable"}}

    +
    + {{else if .SearchResults}} +

    + {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

    + {{template "code/searchresults" .}} + {{else if .Keyword}} +
    {{$.locale.Tr "explore.code_no_results"}}
    + {{end}} +
    + {{template "base/paginate" .}} +
    - {{else if .SearchResults}} -

    - {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

    - {{template "code/searchresults" .}} - {{else if .Keyword}} -
    {{$.locale.Tr "explore.code_no_results"}}
    - {{end}} +
    - - {{template "base/paginate" .}}
    -
    +{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 6016aca447d97..c2c02b186ed2d 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,24 +1,4 @@ - -{{if or (.IsPackagesPage) (.PageIsViewProjects)}} - {{with .ContextUser}} -
    -
    -
    -
    - {{avatar $.Context . 100}} - {{.DisplayName}} - - {{if .Visibility.IsLimited}}
    {{$.locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .Visibility.IsPrivate}}
    {{$.locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} -     -
    -
    -
    -
    - {{end}} -{{end}} - -
    +
    {{if .ProfileReadme}} diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 0bab740f5c268..b6a8045ee23c7 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,6 +1,25 @@ {{template "base/head" .}} -
    +{{if .ContextUser.IsOrganization}} +
    + {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}} {{template "package/shared/versionlist" .}} -
    +
    +{{else}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "package/shared/versionlist" .}} +
    +
    +
    +
    +{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl index 8f8597c42d17b..4402805445fce 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -1,6 +1,25 @@ {{template "base/head" .}} -
    - {{template "user/overview/header" .}} - {{template "package/shared/list" .}} -
    +{{if .ContextUser.IsOrganization}} +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/list" .}} +
    +{{else}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "package/shared/list" .}} +
    +
    +
    +
    +{{end}} {{template "base/footer" .}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 7c37de2bc90fa..30bd23dd883e9 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -3,125 +3,10 @@
    -
    -
    - {{if eq .SignedUserID .ContextUser.ID}} - - {{/* the size doesn't take affect (and no need to take affect), image size(width) should be controlled by the parent container since this is not a flex layout*/}} - {{avatar $.Context .ContextUser 256}} - - {{else}} - - {{avatar $.Context .ContextUser 256}} - - {{end}} -
    -
    - {{if .ContextUser.FullName}}{{.ContextUser.FullName}}{{end}} - {{.ContextUser.Name}} - {{if .EnableFeed}} - {{svg "octicon-rss" 18}} - {{end}} -
    - {{svg "octicon-person" 18 "gt-mr-2"}}{{.NumFollowers}} {{.locale.Tr "user.followers"}} · {{.NumFollowing}} {{.locale.Tr "user.following"}} -
    -
    -
    -
      - {{if .ContextUser.Location}} -
    • {{svg "octicon-location"}} {{.ContextUser.Location}}
      • - {{end}} - {{if (eq .SignedUserID .ContextUser.ID)}} -
    • - {{svg "octicon-mail"}} - {{.ContextUser.Email}} - - {{if .ShowUserEmail}} - - {{svg "octicon-unlock"}} - - {{else}} - - {{svg "octicon-lock"}} - - {{end}} - -
      • - {{else}} - {{if .ShowUserEmail}} -
    • - {{svg "octicon-mail"}} - {{.ContextUser.Email}} -
      • - {{end}} - {{end}} - {{if .ContextUser.Website}} -
    • - {{svg "octicon-link"}} - {{.ContextUser.Website}} -
      • - {{end}} - {{if $.RenderedDescription}} -
    • -
      {{$.RenderedDescription|Str2html}}
      -
      • - {{end}} - {{range .OpenIDs}} - {{if .Show}} -
    • - {{svg "fontawesome-openid"}} - {{.URI}} -
      • - {{end}} - {{end}} -
    • {{svg "octicon-clock"}} {{.locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix) | Safe}}
      • - {{if and .Orgs .HasOrgsVisible}} -
    • -
        - {{range .Orgs}} - {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.HasMemberWithUserID $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}} -
      • - - {{avatar $.Context .}} - -
        • - {{end}} - {{end}} -
      -
      • - {{end}} - {{if .Badges}} -
    • -
        - {{range .Badges}} -
      • - {{.Description}} -
        • - {{end}} -
      -
      • - {{end}} - {{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}} - - {{end}} -
    -
    -
    + {{template "shared/user/profile_big_avatar" .}}
    -
    +
    {{template "user/overview/header" .}}
    From aaa5f71f1693b56c78e61b9d22145b15c93ab2af Mon Sep 17 00:00:00 2001 From: puni9869 Date: Sun, 2 Jul 2023 13:40:52 +0530 Subject: [PATCH 02/29] Templates and go file formatting --- routers/web/user/code.go | 2 +- routers/web/user/package.go | 4 +--- templates/org/projects/list.tmpl | 10 +++++----- templates/user/overview/package_versions.tmpl | 10 +++++----- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 96def1e998cbd..cb661740ba09e 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -4,7 +4,6 @@ package user import ( - shared_user "code.gitea.io/gitea/routers/web/shared/user" "net/http" repo_model "code.gitea.io/gitea/models/repo" @@ -12,6 +11,7 @@ import ( "code.gitea.io/gitea/modules/context" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" + shared_user "code.gitea.io/gitea/routers/web/shared/user" ) const ( diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 882f7d44e6f7e..462b6052c3498 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -37,9 +37,6 @@ const ( // ListPackages displays a list of all packages of the context user func ListPackages(ctx *context.Context) { shared_user.PrepareContextForProfileBigAvatar(ctx) - if ctx.ContextUser.IsOrganization() { - ctx.Data["pageStyleClasses"] = "container" - } page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -105,6 +102,7 @@ func ListPackages(ctx *context.Context) { // TODO: context/org -> HandleOrgAssignment() can not be used if ctx.ContextUser.IsOrganization() { + ctx.Data["pageStyleClasses"] = "container" org := org_model.OrgFromUser(ctx.ContextUser) ctx.Data["Org"] = org ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink() diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 1f1cdd4ce41b5..a23d713b17d42 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,10 +1,10 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "projects/list" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "projects/list" .}} +
    {{else}}
    diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index b6a8045ee23c7..baea5ced20b21 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,10 +1,10 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/versionlist" .}} +
    {{else}}
    From eae7940f6c02bb0aa274d19b32a24972c806f040 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 2 Jul 2023 21:24:49 +0800 Subject: [PATCH 03/29] fix merge --- templates/user/code.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index 787f9479b0d6b..15be9f606da83 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -5,7 +5,7 @@ {{template "user/overview/header" .}}
    {{template "code/searchform" .}} -
    +
    {{if .CodeIndexerUnavailable}}
    @@ -36,7 +36,7 @@
    {{template "code/searchform" .}} -
    +
    {{if .CodeIndexerUnavailable}}
    From b0bd1ea660d7ae394253fb0be18561ccb4ffe3b0 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 2 Jul 2023 21:27:09 +0800 Subject: [PATCH 04/29] fix merge --- templates/package/shared/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 58b1d9db63777..e2c716de17993 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -3,7 +3,7 @@ {{template "base/alert" .}}
    - + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}}
    {{svg "octicon-x" 14 "remove icon"}} From 8eb033e9cd9de3038f0f2b4e41e375fde916248f Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 3 Jul 2023 00:03:50 +0530 Subject: [PATCH 05/29] Fixing page-content style --- templates/package/shared/list.tmpl | 4 ++-- templates/package/shared/versionlist.tmpl | 4 ++-- templates/projects/list.tmpl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index e2c716de17993..b8abf6898c6ac 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    {{template "base/alert" .}}
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 601769625e28f..d382245a958d4 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,5 +1,5 @@ -
    -
    +
    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 4f09aa931272a..1d8e4a86d9434 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,5 +1,5 @@ -
    -
    +
    +
    {{if .CanWriteProjects}}
    From 907a7105909f3c9450dac23a28d60da5d69233fb Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 3 Jul 2023 00:12:18 +0530 Subject: [PATCH 06/29] Removing page-content to gt-mt-4 --- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 4 ++-- templates/projects/list.tmpl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index b8abf6898c6ac..5b2099836eaba 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,4 +1,4 @@ -
    +
    {{template "base/alert" .}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index d382245a958d4..fefc1341ef2d1 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,5 +1,5 @@ -
    -
    +
    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 1d8e4a86d9434..557f8ce2fb6df 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,4 +1,4 @@ -
    +
    {{if .CanWriteProjects}}
    From c3f23d114592d8f9bfcab7e0e3e01181ce14d04c Mon Sep 17 00:00:00 2001 From: puni9869 Date: Mon, 3 Jul 2023 11:19:41 +0530 Subject: [PATCH 07/29] Fix :: Suggestions Removing page-content --- templates/package/shared/list.tmpl | 4 ++-- templates/package/shared/versionlist.tmpl | 2 +- templates/projects/list.tmpl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 5b2099836eaba..3db9c5bdbf8e4 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,5 +1,5 @@
    -
    +
    {{template "base/alert" .}}
    @@ -44,7 +44,7 @@ {{else}} {{if not .HasPackages}} -
    +
    {{svg "octicon-package" 48}}

    {{.locale.Tr "packages.empty"}}

    {{if and .Repository .CanWritePackages}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index fefc1341ef2d1..4839b8c36b481 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,5 +1,5 @@
    -
    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 557f8ce2fb6df..20ce920ae4f0b 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,7 +1,7 @@
    -
    +
    {{if .CanWriteProjects}} -
    +
    {{.locale.Tr "repo.projects.new"}}
    From 110e50b7cd3108b2889b201d71bc8197ca59b228 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 00:31:43 +0530 Subject: [PATCH 08/29] Adding style in package version list --- routers/web/user/package.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 02cc53a1c7ce5..4bff6b7f97997 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -161,9 +161,10 @@ func RedirectToLastVersion(ctx *context.Context) { // ViewPackageVersion displays a single package version func ViewPackageVersion(ctx *context.Context) { pd := ctx.Package.Descriptor - shared_user.RenderUserHeader(ctx) - + if ctx.ContextUser.IsOrganization() { + ctx.Data["pageStyleClasses"] = "container" + } ctx.Data["Title"] = pd.Package.Name ctx.Data["IsPackagesPage"] = true ctx.Data["PackageDescriptor"] = pd @@ -269,7 +270,7 @@ func ListPackageVersions(ctx *context.Context) { } return } - + ctx.Data["pageStyleClasses"] = "container" page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -357,7 +358,6 @@ func ListPackageVersions(ctx *context.Context) { // PackageSettings displays the package settings page func PackageSettings(ctx *context.Context) { pd := ctx.Package.Descriptor - shared_user.RenderUserHeader(ctx) ctx.Data["Title"] = pd.Package.Name @@ -377,7 +377,7 @@ func PackageSettings(ctx *context.Context) { // PackageSettingsPost updates the package settings func PackageSettingsPost(ctx *context.Context) { pd := ctx.Package.Descriptor - + ctx.Data["pageStyleClasses"] = "container" form := web.GetForm(ctx).(*forms.PackageSettingForm) switch form.Action { case "link": From 617544c4a013c20ef103f69d314281dcaff9946e Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 10:11:16 +0530 Subject: [PATCH 09/29] fix style in package/repo --- routers/web/repo/packages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 6ad2f71b5c2de..003c9cbb4dea6 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -74,6 +74,6 @@ func Packages(ctx *context.Context) { pager.AddParam(ctx, "q", "Query") pager.AddParam(ctx, "type", "PackageType") ctx.Data["Page"] = pager - + ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplPackagesList) } From aeb49f9aeed0cd551442c238658a4cc1cbb3cda3 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 10:24:39 +0530 Subject: [PATCH 10/29] Adding style in packages in repo package --- routers/web/user/package.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 4bff6b7f97997..22cbb4ce2eb98 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -162,9 +162,7 @@ func RedirectToLastVersion(ctx *context.Context) { func ViewPackageVersion(ctx *context.Context) { pd := ctx.Package.Descriptor shared_user.RenderUserHeader(ctx) - if ctx.ContextUser.IsOrganization() { - ctx.Data["pageStyleClasses"] = "container" - } + ctx.Data["pageStyleClasses"] = "container" ctx.Data["Title"] = pd.Package.Name ctx.Data["IsPackagesPage"] = true ctx.Data["PackageDescriptor"] = pd From 0e9e8befc4bbff1a2f4bcb93205b385b36110c08 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 10:34:13 +0530 Subject: [PATCH 11/29] Formatting templates --- templates/user/overview/package_versions.tmpl | 36 +++++++++--------- templates/user/overview/packages.tmpl | 38 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index baea5ced20b21..0f15cd2a1112f 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/versionlist" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} -
    - {{template "package/shared/versionlist" .}} -
    -
    +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "package/shared/versionlist" .}}
    +
    +
    {{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl index 4402805445fce..c3a6aad736712 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/list" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/list" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} -
    - {{template "package/shared/list" .}} -
    -
    +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}}
    -
    + {{template "package/shared/list" .}} +
    +
    +
    +
    {{end}} {{template "base/footer" .}} From 52cfeecf69e0c5dcf4a2f6d45f9b32e14fe3e8be Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 10:42:59 +0530 Subject: [PATCH 12/29] Adding style --- routers/web/user/package.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 22cbb4ce2eb98..5464d5d83c978 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -368,6 +368,7 @@ func PackageSettings(ctx *context.Context) { }) ctx.Data["Repos"] = repos ctx.Data["CanWritePackages"] = ctx.Package.AccessMode >= perm.AccessModeWrite || ctx.IsUserSiteAdmin() + ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplPackagesSettings) } From 5b18ff6b622c7e7e60f0017f064f1e3a06c62d9e Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 10:45:56 +0530 Subject: [PATCH 13/29] Formatting templates --- templates/org/projects/list.tmpl | 36 +++++++++---------- templates/user/overview/package_versions.tmpl | 32 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index a23d713b17d42..2bc3a22f36d57 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "projects/list" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "projects/list" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} -
    - {{template "projects/list" .}} -
    -
    +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}}
    + {{template "projects/list" .}} +
    +
    +
    {{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 0f15cd2a1112f..0a8ab29d7e2d7 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/versionlist" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} -
    - {{template "package/shared/versionlist" .}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}}
    + {{template "package/shared/versionlist" .}}
    +
    {{end}} {{template "base/footer" .}} From 55121d6842cec31111f632f4b72cb502dcbb09dd Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 12:09:50 +0530 Subject: [PATCH 14/29] Adding context to the profile version list package page --- routers/web/user/package.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 5464d5d83c978..8519a0a34fd46 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -259,6 +259,7 @@ func ViewPackageVersion(ctx *context.Context) { // ListPackageVersions lists all versions of a package func ListPackageVersions(ctx *context.Context) { + shared_user.PrepareContextForProfileBigAvatar(ctx) p, err := packages_model.GetPackageByName(ctx, ctx.Package.Owner.ID, packages_model.Type(ctx.Params("type")), ctx.Params("name")) if err != nil { if err == packages_model.ErrPackageNotExist { From 7ed829988365e87c8bb730c0d37466fd3cadbc01 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 12:17:49 +0530 Subject: [PATCH 15/29] Fixing linter issues in templates --- templates/org/projects/list.tmpl | 36 +++++++++--------- templates/user/overview/package_versions.tmpl | 32 ++++++++-------- templates/user/overview/packages.tmpl | 38 +++++++++---------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 2bc3a22f36d57..c441fa0540b44 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "projects/list" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "projects/list" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "projects/list" .}} +
    +
    - {{template "projects/list" .}} -
    -
    -
    {{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 0a8ab29d7e2d7..8cfcf7358b6e7 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/versionlist" .}} +
    {{else}}
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "package/shared/versionlist" .}} +
    - {{template "package/shared/versionlist" .}} -
    -
    {{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl index c3a6aad736712..4402805445fce 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    - {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}} - {{template "package/shared/list" .}} -
    +
    + {{template "shared/user/org_profile_avatar" .}} + {{template "user/overview/header" .}} + {{template "package/shared/list" .}} +
    {{else}} -
    -
    -
    -
    - {{template "shared/user/profile_big_avatar" .}} -
    -
    -
    - {{template "user/overview/header" .}} +
    +
    +
    +
    + {{template "shared/user/profile_big_avatar" .}} +
    +
    +
    + {{template "user/overview/header" .}} +
    + {{template "package/shared/list" .}} +
    +
    - {{template "package/shared/list" .}} -
    -
    -
    -
    +
    {{end}} {{template "base/footer" .}} From 1113af05df41a60e388ef586a890d98ede23909c Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 4 Jul 2023 23:53:26 +0530 Subject: [PATCH 16/29] Resolving conflicts --- templates/package/shared/list.tmpl | 33 ----------------------- templates/package/shared/versionlist.tmpl | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 800cb9026d296..3db9c5bdbf8e4 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -14,39 +14,6 @@
    {{$type.Name}}
    -
    - {{template "base/alert" .}} - -
    - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - -
    - -
    - {{range .PackageDescriptors}} -
  • -
    -
    - {{.Package.Name}} - {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} -
    -
    - {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} - {{$hasRepositoryAccess := false}} - {{if .Repository}} - {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} - {{end}} - {{if $hasRepositoryAccess}} - {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} - {{else}} - {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} {{end}}
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index ed5887f81c03a..4839b8c36b481 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -37,5 +37,5 @@ {{end}} {{template "base/paginate" .}}
    • - +
    From e0289adfcfc0370923a08cdd96dc543d83958d80 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 5 Jul 2023 08:33:27 +0530 Subject: [PATCH 17/29] Fixing kanban board header --- routers/web/org/projects.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index d777df4933b85..b5c30fcf80616 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -383,7 +383,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["IssuesMap"] = issuesMap ctx.Data["Boards"] = boards shared_user.RenderUserHeader(ctx) - + ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsView) } From 44c2edddb06723115d2970367f38e171da69872c Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 5 Jul 2023 08:47:20 +0530 Subject: [PATCH 18/29] Fixing in edit project org projects --- routers/web/org/projects.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index b5c30fcf80616..2e92ecee6d14c 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -138,6 +138,7 @@ func RenderNewProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects" shared_user.RenderUserHeader(ctx) + ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -258,7 +259,7 @@ func RenderEditProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["card_type"] = p.CardType ctx.Data["CancelLink"] = fmt.Sprintf("%s/-/projects/%d", ctx.ContextUser.HomeLink(), p.ID) - + ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsNew) } From ee1413d554693fc71bdb2253f7652298345ef588 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 5 Jul 2023 09:20:40 +0530 Subject: [PATCH 19/29] Adding org header avatar --- templates/org/projects/new.tmpl | 1 + templates/org/projects/view.tmpl | 1 + templates/package/settings.tmpl | 1 + templates/package/view.tmpl | 1 + 4 files changed, 4 insertions(+) diff --git a/templates/org/projects/new.tmpl b/templates/org/projects/new.tmpl index 7011eb56d754c..f6abdf72eaa0c 100644 --- a/templates/org/projects/new.tmpl +++ b/templates/org/projects/new.tmpl @@ -1,5 +1,6 @@ {{template "base/head" .}}
    + {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}} {{template "projects/new" .}}
    diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl index c2d8f015f105e..1225779991a25 100644 --- a/templates/org/projects/view.tmpl +++ b/templates/org/projects/view.tmpl @@ -1,5 +1,6 @@ {{template "base/head" .}}
    + {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}} {{template "projects/view" .}}
    diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index 205d875c3eebb..dae000f2ab6df 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -1,5 +1,6 @@ {{template "base/head" .}}
    + {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}}
    {{template "base/alert" .}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 6064db1b4c03e..c11214e14ac33 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -1,5 +1,6 @@ {{template "base/head" .}}
    + {{template "shared/user/org_profile_avatar" .}} {{template "user/overview/header" .}}
    From 6e3c78240217c8f14e9ed1b98d98993d32e96a0f Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 12:07:54 +0800 Subject: [PATCH 20/29] fix merge --- templates/package/shared/list.tmpl | 104 ++++++++++------------ templates/package/shared/versionlist.tmpl | 72 ++++++++------- 2 files changed, 83 insertions(+), 93 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 3db9c5bdbf8e4..3f54c25ea6d55 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,63 +1,55 @@ -
    -
    - {{template "base/alert" .}} -
    -
    - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} -
    - - {{svg "octicon-x" 14 "remove icon"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    {{.locale.Tr "packages.filter.type"}}
    -
    - {{range $type := .AvailableTypes}} -
    - {{$type.Name}} -
    +
    + {{template "base/alert" .}} + +
    + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + + +
    + +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Package.Name}} + {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} +
    +
    + {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} + {{$hasRepositoryAccess := false}} + {{if .Repository}} + {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} + {{end}} + {{if $hasRepositoryAccess}} + {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} + {{else}} + {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} {{end}}
    - -
    • - -
    - {{range .PackageDescriptors}} -
  • -
    -
    - {{.Package.Name}} - {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} -
    -
    - {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} - {{$hasRepositoryAccess := false}} - {{if .Repository}} - {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} - {{end}} - {{if $hasRepositoryAccess}} - {{$.locale.Tr "packages.published_by_in" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) .Repository.Link (.Repository.FullName | Escape) | Safe}} - {{else}} - {{$.locale.Tr "packages.published_by" $timeStr .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} - {{end}} -
    -
    -
    • + + {{else}} + {{if not .HasPackages}} +
    + {{svg "octicon-package" 48}} +

    {{.locale.Tr "packages.empty"}}

    + {{if and .Repository .CanWritePackages}} + {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} +

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    + {{end}} +

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    +
    {{else}} - {{if not .HasPackages}} -
    - {{svg "octicon-package" 48}} -

    {{.locale.Tr "packages.empty"}}

    - {{if and .Repository .CanWritePackages}} - {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} -

    {{.locale.Tr "packages.empty.repo" $packagesUrl | Safe}}

    - {{end}} -

    {{.locale.Tr "packages.empty.documentation" "https://docs.gitea.io/en-us/usage/packages/overview/" | Safe}}

    -
    - {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    - {{end}} +

    {{.locale.Tr "packages.filter.no_result"}}

    {{end}} - {{template "base/paginate" .}} -
    + {{end}} + {{template "base/paginate" .}}
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 4839b8c36b481..2e9338a5ea1ba 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,41 +1,39 @@ -
    -
    -

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    -
    -
    - {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} - - {{if eq .PackageDescriptor.Package.Type "container"}} - - {{end}} - -
    -
    -
    - {{range .PackageDescriptors}} -
  • -
    -
    - {{.Version.LowerVersion}} -
    -
    - {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} -
    -
    -
    • - {{else}} -

    {{.locale.Tr "packages.filter.no_result"}}

    +
    +

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    +
    +
    + {{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} + + {{if eq .PackageDescriptor.Package.Type "container"}} + {{end}} - {{template "base/paginate" .}} +
    +
    +
    + {{range .PackageDescriptors}} +
  • +
    +
    + {{.Version.LowerVersion}} +
    +
    + {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}} +
    +
    +
    • + {{else}} +

    {{.locale.Tr "packages.filter.no_result"}}

    + {{end}} + {{template "base/paginate" .}}
    From ab9b005ceab0e499e46d00afc0868c2b490f1c93 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 13:03:25 +0800 Subject: [PATCH 21/29] fix container layout --- routers/web/org/projects.go | 6 ------ routers/web/repo/packages.go | 1 - routers/web/user/code.go | 3 --- routers/web/user/package.go | 5 ----- templates/org/menu.tmpl | 2 +- templates/org/projects/list.tmpl | 2 ++ templates/org/projects/new.tmpl | 2 ++ templates/org/projects/view.tmpl | 2 ++ templates/package/settings.tmpl | 2 +- templates/package/shared/list.tmpl | 2 -- templates/package/shared/versionlist.tmpl | 2 -- templates/package/view.tmpl | 2 +- templates/projects/list.tmpl | 10 ++-------- templates/projects/new.tmpl | 4 ---- templates/repo/packages.tmpl | 2 ++ templates/repo/projects/new.tmpl | 2 ++ templates/user/code.tmpl | 2 +- templates/user/overview/header.tmpl | 2 -- templates/user/overview/package_versions.tmpl | 2 ++ templates/user/overview/packages.tmpl | 2 ++ web_src/css/helpers.css | 1 + 21 files changed, 21 insertions(+), 37 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 2e92ecee6d14c..c3854d1a28b28 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -42,9 +42,6 @@ func MustEnableProjects(ctx *context.Context) { // Projects renders the home page of projects func Projects(ctx *context.Context) { shared_user.PrepareContextForProfileBigAvatar(ctx) - if ctx.ContextUser.IsOrganization() { - ctx.Data["pageStyleClasses"] = "container" - } ctx.Data["Title"] = ctx.Tr("repo.project_board") sortType := ctx.FormTrim("sort") @@ -138,7 +135,6 @@ func RenderNewProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["CancelLink"] = ctx.ContextUser.HomeLink() + "/-/projects" shared_user.RenderUserHeader(ctx) - ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -259,7 +255,6 @@ func RenderEditProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["card_type"] = p.CardType ctx.Data["CancelLink"] = fmt.Sprintf("%s/-/projects/%d", ctx.ContextUser.HomeLink(), p.ID) - ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -384,7 +379,6 @@ func ViewProject(ctx *context.Context) { ctx.Data["IssuesMap"] = issuesMap ctx.Data["Boards"] = boards shared_user.RenderUserHeader(ctx) - ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplProjectsView) } diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 003c9cbb4dea6..07e5e4b262015 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -74,6 +74,5 @@ func Packages(ctx *context.Context) { pager.AddParam(ctx, "q", "Query") pager.AddParam(ctx, "type", "PackageType") ctx.Data["Page"] = pager - ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplPackagesList) } diff --git a/routers/web/user/code.go b/routers/web/user/code.go index cb661740ba09e..2c66d720d8d7c 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -21,9 +21,6 @@ const ( // CodeSearch render user/organization code search page func CodeSearch(ctx *context.Context) { shared_user.PrepareContextForProfileBigAvatar(ctx) - if ctx.ContextUser.IsOrganization() { - ctx.Data["pageStyleClasses"] = "container" - } if !setting.Indexer.RepoIndexerEnabled { ctx.Redirect(ctx.ContextUser.HomeLink()) return diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 8519a0a34fd46..210d2123249bd 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -103,7 +103,6 @@ func ListPackages(ctx *context.Context) { // TODO: context/org -> HandleOrgAssignment() can not be used if ctx.ContextUser.IsOrganization() { - ctx.Data["pageStyleClasses"] = "container" org := org_model.OrgFromUser(ctx.ContextUser) ctx.Data["Org"] = org ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink() @@ -162,7 +161,6 @@ func RedirectToLastVersion(ctx *context.Context) { func ViewPackageVersion(ctx *context.Context) { pd := ctx.Package.Descriptor shared_user.RenderUserHeader(ctx) - ctx.Data["pageStyleClasses"] = "container" ctx.Data["Title"] = pd.Package.Name ctx.Data["IsPackagesPage"] = true ctx.Data["PackageDescriptor"] = pd @@ -269,7 +267,6 @@ func ListPackageVersions(ctx *context.Context) { } return } - ctx.Data["pageStyleClasses"] = "container" page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -369,7 +366,6 @@ func PackageSettings(ctx *context.Context) { }) ctx.Data["Repos"] = repos ctx.Data["CanWritePackages"] = ctx.Package.AccessMode >= perm.AccessModeWrite || ctx.IsUserSiteAdmin() - ctx.Data["pageStyleClasses"] = "container" ctx.HTML(http.StatusOK, tplPackagesSettings) } @@ -377,7 +373,6 @@ func PackageSettings(ctx *context.Context) { // PackageSettingsPost updates the package settings func PackageSettingsPost(ctx *context.Context) { pd := ctx.Package.Descriptor - ctx.Data["pageStyleClasses"] = "container" form := web.GetForm(ctx).(*forms.PackageSettingForm) switch form.Action { case "link": diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 1bb19a0673db9..7074095b8d6c9 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,4 +1,4 @@ -
    +
    {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index c441fa0540b44..689091e5e0d8a 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -2,8 +2,10 @@ {{if .ContextUser.IsOrganization}}
    {{template "shared/user/org_profile_avatar" .}} +
    {{template "user/overview/header" .}} {{template "projects/list" .}} +
    {{else}}
    diff --git a/templates/org/projects/new.tmpl b/templates/org/projects/new.tmpl index f6abdf72eaa0c..fc52130f68409 100644 --- a/templates/org/projects/new.tmpl +++ b/templates/org/projects/new.tmpl @@ -1,7 +1,9 @@ {{template "base/head" .}}
    {{template "shared/user/org_profile_avatar" .}} +
    {{template "user/overview/header" .}} {{template "projects/new" .}} +
    {{template "base/footer" .}} diff --git a/templates/org/projects/view.tmpl b/templates/org/projects/view.tmpl index 1225779991a25..ef8ec2422524f 100644 --- a/templates/org/projects/view.tmpl +++ b/templates/org/projects/view.tmpl @@ -1,7 +1,9 @@ {{template "base/head" .}}
    {{template "shared/user/org_profile_avatar" .}} +
    {{template "user/overview/header" .}} {{template "projects/view" .}} +
    {{template "base/footer" .}} diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index dae000f2ab6df..abcdd7ec1c8d8 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
    {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}}
    + {{template "user/overview/header" .}} {{template "base/alert" .}}

    {{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}}) / {{.locale.Tr "repo.settings"}}

    diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 3f54c25ea6d55..1acafff41aeef 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,4 +1,3 @@ -
    {{template "base/alert" .}}
    @@ -52,4 +51,3 @@ {{end}} {{template "base/paginate" .}}
    -
    diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 2e9338a5ea1ba..be5c2a16de017 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -1,4 +1,3 @@ -

    {{.PackageDescriptor.Package.Name}} / {{.locale.Tr "packages.versions"}}

    @@ -36,4 +35,3 @@ {{end}} {{template "base/paginate" .}}
    -
    diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index c11214e14ac33..fe4214cbd238e 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
    {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}}
    + {{template "user/overview/header" .}}

    {{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})

    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 20ce920ae4f0b..ebce0ea48f048 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,10 +1,6 @@ -
    -
    {{if .CanWriteProjects}} -
    -
    - {{.locale.Tr "repo.projects.new"}} -
    +
    + {{.locale.Tr "repo.projects.new"}}
    {{end}} @@ -75,8 +71,6 @@ {{template "base/paginate" .}}
    -
    -
    {{if $.CanWriteProjects}}
    diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index bc3b19e915086..e110e880cf0e9 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -1,4 +1,3 @@ -

    {{if .PageIsEditProjects}} {{.locale.Tr "repo.projects.edit"}} @@ -55,7 +54,6 @@

    -
    @@ -65,6 +63,4 @@ {{if .PageIsEditProjects}}{{.locale.Tr "repo.projects.modify"}}{{else}}{{.locale.Tr "repo.projects.create"}}{{end}}
    -
    -
    diff --git a/templates/repo/packages.tmpl b/templates/repo/packages.tmpl index 47fa338a44030..14e32c125baf6 100644 --- a/templates/repo/packages.tmpl +++ b/templates/repo/packages.tmpl @@ -1,6 +1,8 @@ {{template "base/head" .}}
    {{template "repo/header" .}} +
    {{template "package/shared/list" .}} +
    {{template "base/footer" .}} diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index 531cae8d116bd..e70f3bca87da8 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -1,6 +1,8 @@ {{template "base/head" .}}
    {{template "repo/header" .}} +
    {{template "projects/new" .}} +
    {{template "base/footer" .}} diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index 15be9f606da83..0253011edc1f1 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -2,8 +2,8 @@ {{if .ContextUser.IsOrganization}}
    {{template "shared/user/org_profile_avatar" .}} - {{template "user/overview/header" .}}
    + {{template "user/overview/header" .}} {{template "code/searchform" .}}
    diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index c2c02b186ed2d..e662dde0e0209 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,4 +1,3 @@ -
    {{if .ProfileReadme}} @@ -69,4 +68,3 @@ {{end}}
    -
    diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 8cfcf7358b6e7..3757e922e3cee 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -2,8 +2,10 @@ {{if .ContextUser.IsOrganization}}
    {{template "shared/user/org_profile_avatar" .}} +
    {{template "user/overview/header" .}} {{template "package/shared/versionlist" .}} +
    {{else}}
    diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl index 4402805445fce..4fd17696d18e9 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -2,8 +2,10 @@ {{if .ContextUser.IsOrganization}}
    {{template "shared/user/org_profile_avatar" .}} +
    {{template "user/overview/header" .}} {{template "package/shared/list" .}} +
    {{else}}
    diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 68d4a1b021656..a24d35e97938d 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -11,6 +11,7 @@ Gitea's private styles use `g-` prefix. .gt-ab { align-items: baseline !important; } .gt-tc { text-align: center !important; } .gt-tl { text-align: left !important; } +.gt-tr { text-align: right !important; } /* TODO: rename these to "gt-text-right", etc. there are only a few */ .gt-jc { justify-content: center !important; } .gt-js { justify-content: flex-start !important; } .gt-je { justify-content: flex-end !important; } From 7ec582b3c9e19d8cf4e550dcaf0eded70dd7510d Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 16:11:54 +0800 Subject: [PATCH 22/29] revert unnecessary new lines --- routers/web/org/projects.go | 2 ++ routers/web/repo/packages.go | 1 + routers/web/user/code.go | 1 + routers/web/user/package.go | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index c3854d1a28b28..21cb23000d2e9 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -255,6 +255,7 @@ func RenderEditProject(ctx *context.Context) { ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.Data["card_type"] = p.CardType ctx.Data["CancelLink"] = fmt.Sprintf("%s/-/projects/%d", ctx.ContextUser.HomeLink(), p.ID) + ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -379,6 +380,7 @@ func ViewProject(ctx *context.Context) { ctx.Data["IssuesMap"] = issuesMap ctx.Data["Boards"] = boards shared_user.RenderUserHeader(ctx) + ctx.HTML(http.StatusOK, tplProjectsView) } diff --git a/routers/web/repo/packages.go b/routers/web/repo/packages.go index 07e5e4b262015..6ad2f71b5c2de 100644 --- a/routers/web/repo/packages.go +++ b/routers/web/repo/packages.go @@ -74,5 +74,6 @@ func Packages(ctx *context.Context) { pager.AddParam(ctx, "q", "Query") pager.AddParam(ctx, "type", "PackageType") ctx.Data["Page"] = pager + ctx.HTML(http.StatusOK, tplPackagesList) } diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 2c66d720d8d7c..728970a98318f 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -25,6 +25,7 @@ func CodeSearch(ctx *context.Context) { ctx.Redirect(ctx.ContextUser.HomeLink()) return } + ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 210d2123249bd..eb4a8efb8360a 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -106,6 +106,7 @@ func ListPackages(ctx *context.Context) { org := org_model.OrgFromUser(ctx.ContextUser) ctx.Data["Org"] = org ctx.Data["OrgLink"] = ctx.ContextUser.OrganisationLink() + if ctx.Doer != nil { ctx.Data["IsOrganizationMember"], _ = org_model.IsOrganizationMember(ctx, org.ID, ctx.Doer.ID) ctx.Data["IsOrganizationOwner"], _ = org_model.IsOrganizationOwner(ctx, org.ID, ctx.Doer.ID) @@ -160,7 +161,9 @@ func RedirectToLastVersion(ctx *context.Context) { // ViewPackageVersion displays a single package version func ViewPackageVersion(ctx *context.Context) { pd := ctx.Package.Descriptor + shared_user.RenderUserHeader(ctx) + ctx.Data["Title"] = pd.Package.Name ctx.Data["IsPackagesPage"] = true ctx.Data["PackageDescriptor"] = pd @@ -354,6 +357,7 @@ func ListPackageVersions(ctx *context.Context) { // PackageSettings displays the package settings page func PackageSettings(ctx *context.Context) { pd := ctx.Package.Descriptor + shared_user.RenderUserHeader(ctx) ctx.Data["Title"] = pd.Package.Name @@ -373,6 +377,7 @@ func PackageSettings(ctx *context.Context) { // PackageSettingsPost updates the package settings func PackageSettingsPost(ctx *context.Context) { pd := ctx.Package.Descriptor + form := web.GetForm(ctx).(*forms.PackageSettingForm) switch form.Action { case "link": From 3c5652d115b0de52660161d2d54de478fc131612 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 18:36:56 +0800 Subject: [PATCH 23/29] rewrite --- models/user/user.go | 2 +- modules/context/org.go | 1 - routers/web/shared/user/header.go | 21 +--- routers/web/user/code.go | 1 - routers/web/user/home.go | 2 +- routers/web/user/profile.go | 162 +++++++++------------------- templates/org/menu.tmpl | 2 +- templates/user/overview/header.tmpl | 2 +- 8 files changed, 60 insertions(+), 133 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 6f9c2f5b35a8f..4b19eda67b61c 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -336,7 +336,7 @@ func GetUserFollowers(ctx context.Context, u, viewer *User, listOptions db.ListO // GetUserFollowing returns range of user's following. func GetUserFollowing(ctx context.Context, u, viewer *User, listOptions db.ListOptions) ([]*User, int64, error) { - sess := db.GetEngine(db.DefaultContext). + sess := db.GetEngine(ctx). Select("`user`.*"). Join("LEFT", "follow", "`user`.id=follow.follow_id"). Where("follow.user_id=?", u.ID). diff --git a/modules/context/org.go b/modules/context/org.go index 355ba0ebd01f5..835c761372fa9 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -161,7 +161,6 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { } ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember - ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["IsPublicMember"] = func(uid int64) bool { diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index e88ea61c21d89..6879955b73e9e 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -4,8 +4,6 @@ package user import ( - "fmt" - "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" @@ -19,14 +17,9 @@ import ( // PrepareContextForProfileBigAvatar set the context for big avatar view on repo func PrepareContextForProfileBigAvatar(ctx *context.Context) { - // check view permissions - if !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { - ctx.NotFound("user", fmt.Errorf(ctx.ContextUser.Name)) - return - } - - // advertise feed via meta tag + ctx.Data["ContextUser"] = ctx.ContextUser ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() + ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) // Show OpenID URIs openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID) @@ -34,15 +27,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { ctx.ServerError("GetUserOpenIDs", err) return } - - var isFollowing bool - if ctx.Doer != nil { - isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) - } - - ctx.Data["ContextUser"] = ctx.ContextUser ctx.Data["OpenIDs"] = openIDs - ctx.Data["IsFollowing"] = isFollowing if len(ctx.ContextUser.Description) != 0 { content, err := markdown.RenderString(&markup.RenderContext{ @@ -57,6 +42,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { } ctx.Data["RenderedDescription"] = content } + showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) orgs, err := organization.FindOrgs(organization.FindOrgOptions{ UserID: ctx.ContextUser.ID, @@ -101,7 +87,6 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { } func RenderUserHeader(ctx *context.Context) { - ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["ContextUser"] = ctx.ContextUser diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 728970a98318f..6d069be1bd12f 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -26,7 +26,6 @@ func CodeSearch(ctx *context.Context) { return } - ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 1b0f651b07da9..6a89c507a9fd6 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -857,7 +857,7 @@ func UsernameSubRoute(ctx *context.Context) { context_service.UserAssignmentWeb()(ctx) if !ctx.Written() { ctx.Data["EnableFeed"] = setting.Other.EnableFeed - Profile(ctx) + OwnerProfile(ctx) } } } diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 6f9f84d60dbdf..f999c0a4126e6 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -5,28 +5,28 @@ package user import ( + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" + shared_user "code.gitea.io/gitea/routers/web/shared/user" "fmt" "net/http" "strings" activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/web/feed" "code.gitea.io/gitea/routers/web/org" ) -// Profile render user's profile page -func Profile(ctx *context.Context) { +// OwnerProfile render profile page for a user or a organization (aka, repo owner) +func OwnerProfile(ctx *context.Context) { if strings.Contains(ctx.Req.Header.Get("Accept"), "application/rss+xml") { feed.ShowUserFeedRSS(ctx) return @@ -38,36 +38,26 @@ func Profile(ctx *context.Context) { if ctx.ContextUser.IsOrganization() { org.Home(ctx) - return + } else { + userProfile(ctx) } +} +func userProfile(ctx *context.Context) { // check view permissions if !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { ctx.NotFound("user", fmt.Errorf(ctx.ContextUser.Name)) return } - // advertise feed via meta tag - ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() - - // Show OpenID URIs - openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID) - if err != nil { - ctx.ServerError("GetUserOpenIDs", err) - return - } - - var isFollowing bool - if ctx.Doer != nil { - isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) - } - ctx.Data["Title"] = ctx.ContextUser.DisplayName() ctx.Data["PageIsUserProfile"] = true - ctx.Data["ContextUser"] = ctx.ContextUser - ctx.Data["OpenIDs"] = openIDs - ctx.Data["IsFollowing"] = isFollowing + ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled + ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled + shared_user.PrepareContextForProfileBigAvatar(ctx) + + // prepare heatmap data if setting.Service.EnableUserHeatmap { data, err := activities_model.GetUserHeatmapDataByUser(ctx.ContextUser, ctx.Doer) if err != nil { @@ -78,74 +68,39 @@ func Profile(ctx *context.Context) { ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data) } - if len(ctx.ContextUser.Description) != 0 { - content, err := markdown.RenderString(&markup.RenderContext{ - URLPrefix: ctx.Repo.RepoLink, - Metas: map[string]string{"mode": "document"}, - GitRepo: ctx.Repo.GitRepo, - Ctx: ctx, - }, ctx.ContextUser.Description) - if err != nil { - ctx.ServerError("RenderString", err) - return - } - ctx.Data["RenderedDescription"] = content - } - - repo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile") - if err == nil && !repo.IsEmpty { - gitRepo, err := git.OpenRepository(ctx, repo.RepoPath()) - if err != nil { - ctx.ServerError("OpenRepository", err) - return - } - defer gitRepo.Close() - commit, err := gitRepo.GetBranchCommit(repo.DefaultBranch) - if err != nil { - ctx.ServerError("GetBranchCommit", err) - return - } - blob, err := commit.GetBlobByPath("README.md") - if err == nil { - bytes, err := blob.GetBlobContent(setting.UI.MaxDisplayFileSize) - if err != nil { - ctx.ServerError("GetBlobContent", err) - return + // try to find a profile readme + var profileReadmeBlob *git.Blob + var profileGitRepo *git.Repository + profileDbRepo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile") + if err == nil && !profileDbRepo.IsEmpty { + if profileGitRepo, err = git.OpenRepository(ctx, profileDbRepo.RepoPath()); err != nil { + log.Error("failed to OpenRepository: %v", err) + } else { + defer profileGitRepo.Close() + + if commit, err := profileGitRepo.GetBranchCommit(profileDbRepo.DefaultBranch); err != nil { + log.Error("failed to GetBranchCommit: %v", err) + } else { + profileReadmeBlob, _ = commit.GetBlobByPath("README.md") } - profileContent, err := markdown.RenderString(&markup.RenderContext{ - Ctx: ctx, - GitRepo: gitRepo, - }, bytes) - if err != nil { - ctx.ServerError("RenderString", err) - return - } - ctx.Data["ProfileReadme"] = profileContent } } showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) + prepareUserProfileTabData(ctx, showPrivate, profileGitRepo, profileReadmeBlob) + ctx.HTML(http.StatusOK, tplProfile) +} - orgs, err := organization.FindOrgs(organization.FindOrgOptions{ - UserID: ctx.ContextUser.ID, - IncludePrivate: showPrivate, - }) - if err != nil { - ctx.ServerError("FindOrgs", err) - return - } - - ctx.Data["Orgs"] = orgs - ctx.Data["HasOrgsVisible"] = organization.HasOrgsVisible(orgs, ctx.Doer) - - badges, _, err := user_model.GetUserBadges(ctx, ctx.ContextUser) - if err != nil { - ctx.ServerError("GetUserBadges", err) - return - } - ctx.Data["Badges"] = badges - +func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGitRepo *git.Repository, profileReadme *git.Blob) { + // if there is a profile readme, default to "overview" page, otherwise, default to "repositories" page tab := ctx.FormString("tab") + if tab == "" { + if profileReadme != nil { + tab = "overview" + } else { + tab = "repositories" + } + } ctx.Data["TabName"] = tab page := ctx.FormInt("page") @@ -154,12 +109,7 @@ func Profile(ctx *context.Context) { } pagingNum := setting.UI.User.RepoPagingNum - if tab == "activity" { - pagingNum = setting.UI.FeedPagingNum - } - topicOnly := ctx.FormBool("topic") - var ( repos []*repo_model.Repository count int64 @@ -228,6 +178,7 @@ func Profile(ctx *context.Context) { total = int(count) case "activity": date := ctx.FormString("date") + pagingNum = setting.UI.FeedPagingNum items, count, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{ RequestedUser: ctx.ContextUser, Actor: ctx.Doer, @@ -271,16 +222,6 @@ func Profile(ctx *context.Context) { } total = int(count) - case "projects": - ctx.Data["OpenProjects"], _, err = project_model.FindProjects(ctx, project_model.SearchOptions{ - Page: -1, - IsClosed: util.OptionalBoolFalse, - Type: project_model.TypeIndividual, - }) - if err != nil { - ctx.ServerError("GetProjects", err) - return - } case "watching": repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ ListOptions: db.ListOptions{ @@ -303,7 +244,17 @@ func Profile(ctx *context.Context) { } total = int(count) - default: + case "overview": + if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { + log.Error("failed to GetBlobContent: %v", err) + } else { + if profileContent, err := markdown.RenderString(&markup.RenderContext{Ctx: ctx, GitRepo: profileGitRepo}, bytes); err != nil { + log.Error("failed to RenderString: %v", err) + } else { + ctx.Data["ProfileReadme"] = profileContent + } + } + default: // default to "repositories" repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ ListOptions: db.ListOptions{ PageSize: pagingNum, @@ -339,13 +290,6 @@ func Profile(ctx *context.Context) { pager.AddParam(ctx, "date", "Date") } ctx.Data["Page"] = pager - ctx.Data["IsProjectEnabled"] = true - ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled - ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - - ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate - - ctx.HTML(http.StatusOK, tplProfile) } // Action response for follow/unfollow user request diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 7074095b8d6c9..6492e5e668eb1 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -6,7 +6,7 @@
    {{.ContextUser.NumRepos}}
    {{end}}     - {{if and .IsProjectEnabled .CanReadProjects}} + {{if .CanReadProjects}} {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index e662dde0e0209..236a14ce0df5d 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -10,7 +10,7 @@
    {{.ContextUser.NumRepos}}
    {{end}} - {{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}} + {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} From fd85288e579b3e860324f8ef5556a99bf9f22ca9 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 18:57:46 +0800 Subject: [PATCH 24/29] rewrite --- routers/web/shared/user/header.go | 60 +++++++++++++++++------------ routers/web/user/profile.go | 20 ++-------- templates/user/overview/header.tmpl | 10 ++--- templates/user/profile.tmpl | 6 +-- 4 files changed, 46 insertions(+), 50 deletions(-) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 6879955b73e9e..1cd29b0f76b86 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -10,16 +10,26 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" ) -// PrepareContextForProfileBigAvatar set the context for big avatar view on repo -func PrepareContextForProfileBigAvatar(ctx *context.Context) { +func prepareContextForCommonProfile(ctx *context.Context) { + ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled + ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["ContextUser"] = ctx.ContextUser + ctx.Data["EnableFeed"] = setting.Other.EnableFeed ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() +} + +// PrepareContextForProfileBigAvatar set the context for big avatar view on repo +func PrepareContextForProfileBigAvatar(ctx *context.Context) { + prepareContextForCommonProfile(ctx) + ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) + ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate // Show OpenID URIs openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID) @@ -82,32 +92,32 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { return } ctx.Data["NumFollowing"] = numFollowing - ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate - ctx.Data["EnableFeed"] = setting.Other.EnableFeed } -func RenderUserHeader(ctx *context.Context) { - ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled - ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - ctx.Data["ContextUser"] = ctx.ContextUser - tab := ctx.FormString("tab") - ctx.Data["TabName"] = tab - repo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile") - if err == nil && !repo.IsEmpty { - gitRepo, err := git.OpenRepository(ctx, repo.RepoPath()) - if err != nil { - ctx.ServerError("OpenRepository", err) - return +func FindUserProfileReadme(ctx *context.Context) (profileGitRepo *git.Repository, profileReadmeBlob *git.Blob, profileClose func()) { + profileDbRepo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile") + if err == nil && !profileDbRepo.IsEmpty { + if profileGitRepo, err = git.OpenRepository(ctx, profileDbRepo.RepoPath()); err != nil { + log.Error("FindUserProfileReadme failed to OpenRepository: %v", err) + } else { + if commit, err := profileGitRepo.GetBranchCommit(profileDbRepo.DefaultBranch); err != nil { + log.Error("FindUserProfileReadme failed to GetBranchCommit: %v", err) + } else { + profileReadmeBlob, _ = commit.GetBlobByPath("README.md") + } } - defer gitRepo.Close() - commit, err := gitRepo.GetBranchCommit(repo.DefaultBranch) - if err != nil { - ctx.ServerError("GetBranchCommit", err) - return - } - blob, err := commit.GetBlobByPath("README.md") - if err == nil && blob != nil { - ctx.Data["ProfileReadme"] = true + } + return profileGitRepo, profileReadmeBlob, func() { + if profileGitRepo != nil { + _ = profileGitRepo.Close() } } } + +func RenderUserHeader(ctx *context.Context) { + prepareContextForCommonProfile(ctx) + + _, profileReadmeBlob, profileClose := FindUserProfileReadme(ctx) + defer profileClose() + ctx.Data["HasProfileReadme"] = profileReadmeBlob != nil +} diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index f999c0a4126e6..c0cf18478ddfc 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -68,23 +68,8 @@ func userProfile(ctx *context.Context) { ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data) } - // try to find a profile readme - var profileReadmeBlob *git.Blob - var profileGitRepo *git.Repository - profileDbRepo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile") - if err == nil && !profileDbRepo.IsEmpty { - if profileGitRepo, err = git.OpenRepository(ctx, profileDbRepo.RepoPath()); err != nil { - log.Error("failed to OpenRepository: %v", err) - } else { - defer profileGitRepo.Close() - - if commit, err := profileGitRepo.GetBranchCommit(profileDbRepo.DefaultBranch); err != nil { - log.Error("failed to GetBranchCommit: %v", err) - } else { - profileReadmeBlob, _ = commit.GetBlobByPath("README.md") - } - } - } + profileGitRepo, profileReadmeBlob, profileClose := shared_user.FindUserProfileReadme(ctx) + defer profileClose() showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) prepareUserProfileTabData(ctx, showPrivate, profileGitRepo, profileReadmeBlob) @@ -245,6 +230,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi total = int(count) case "overview": + ctx.Data["HasProfileReadme"] = true if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { log.Error("failed to GetBlobContent: %v", err) } else { diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 236a14ce0df5d..5fbfa54db70df 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,10 +1,10 @@
    - {{if .ProfileReadme}} - - {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} - + {{if .HasProfileReadme}} + + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} + {{end}} - + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{if .ContextUser.NumRepos}}
    {{.ContextUser.NumRepos}}
    diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 30bd23dd883e9..396d9ebcd4701 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -30,12 +30,12 @@ {{template "repo/user_cards" .}} {{else if eq .TabName "followers"}} {{template "repo/user_cards" .}} - {{else if or (eq .TabName "repositories") (not .ProfileReadme)}} + {{else if eq .TabName "overview"}} +
    {{.ProfileReadme | Str2html}}
    + {{else}} {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}} - {{else if .ProfileReadme}} -
    {{$.ProfileReadme|Str2html}}
    {{end}}
    From b29bbfa8701b3abfd0944096abe4b280307da97c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 19:03:28 +0800 Subject: [PATCH 25/29] rewrite --- routers/web/shared/user/header.go | 23 +++++------------------ routers/web/user/profile.go | 12 ++++++------ 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 1cd29b0f76b86..d3d6c2668b113 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -72,26 +72,13 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { } ctx.Data["Badges"] = badges - pagingNum := setting.UI.User.RepoPagingNum - page := ctx.FormInt("page") - _, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ - PageSize: pagingNum, - Page: page, - }) - if err != nil { - ctx.ServerError("GetUserFollowers", err) - return + // in case the numbers are already provided by other functions, no need to query again (which is slow) + if _, ok := ctx.Data["NumFollowers"]; !ok { + _, ctx.Data["NumFollowers"], _ = user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{PageSize: 1, Page: 1}) } - ctx.Data["NumFollowers"] = numFollowers - _, numFollowing, err := user_model.GetUserFollowing(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ - PageSize: pagingNum, - Page: page, - }) - if err != nil { - ctx.ServerError("GetUserFollowing", err) - return + if _, ok := ctx.Data["NumFollowing"]; !ok { + _, ctx.Data["NumFollowing"], _ = user_model.GetUserFollowing(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{PageSize: 1, Page: 1}) } - ctx.Data["NumFollowing"] = numFollowing } func FindUserProfileReadme(ctx *context.Context) (profileGitRepo *git.Repository, profileReadmeBlob *git.Blob, profileClose func()) { diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index c0cf18478ddfc..313cba86135fd 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -5,10 +5,6 @@ package user import ( - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/markup" - "code.gitea.io/gitea/modules/markup/markdown" - shared_user "code.gitea.io/gitea/routers/web/shared/user" "fmt" "net/http" "strings" @@ -19,10 +15,14 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/routers/web/feed" "code.gitea.io/gitea/routers/web/org" + shared_user "code.gitea.io/gitea/routers/web/shared/user" ) // OwnerProfile render profile page for a user or a organization (aka, repo owner) @@ -55,8 +55,6 @@ func userProfile(ctx *context.Context) { ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - shared_user.PrepareContextForProfileBigAvatar(ctx) - // prepare heatmap data if setting.Service.EnableUserHeatmap { data, err := activities_model.GetUserHeatmapDataByUser(ctx.ContextUser, ctx.Doer) @@ -73,6 +71,8 @@ func userProfile(ctx *context.Context) { showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) prepareUserProfileTabData(ctx, showPrivate, profileGitRepo, profileReadmeBlob) + // call PrepareContextForProfileBigAvatar later to avoid re-querying the NumFollowers & NumFollowing + shared_user.PrepareContextForProfileBigAvatar(ctx) ctx.HTML(http.StatusOK, tplProfile) } From 6c93f713315e661af3c28666d8705a0c2fe8ff9b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 19:16:27 +0800 Subject: [PATCH 26/29] rewrite --- templates/code/searchcombo.tmpl | 17 +++++++++++ templates/explore/code.tmpl | 19 +------------ templates/user/code.tmpl | 44 +++-------------------------- templates/user/overview/header.tmpl | 1 - 4 files changed, 22 insertions(+), 59 deletions(-) create mode 100644 templates/code/searchcombo.tmpl diff --git a/templates/code/searchcombo.tmpl b/templates/code/searchcombo.tmpl new file mode 100644 index 0000000000000..e495b3b454cd2 --- /dev/null +++ b/templates/code/searchcombo.tmpl @@ -0,0 +1,17 @@ +{{template "code/searchform" .}} +
    +
    + {{if .CodeIndexerUnavailable}} +
    +

    {{$.locale.Tr "explore.code_search_unavailable"}}

    +
    + {{else if .SearchResults}} +

    + {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

    + {{template "code/searchresults" .}} + {{else if .Keyword}} +
    {{$.locale.Tr "explore.code_no_results"}}
    + {{end}} +
    +{{template "base/paginate" .}} diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index c537cca05e8d1..229857588726b 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -2,24 +2,7 @@
    {{template "explore/navbar" .}}
    - {{template "code/searchform" .}} -
    -
    - {{if .CodeIndexerUnavailable}} -
    -

    {{$.locale.Tr "explore.code_search_unavailable"}}

    -
    - {{else if .SearchResults}} -

    - {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

    - {{template "code/searchresults" .}} - {{else if .Keyword}} -
    {{$.locale.Tr "explore.code_no_results"}}
    - {{end}} -
    - - {{template "base/paginate" .}} + {{template "code/searchcombo" .}}
    {{template "base/footer" .}} diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index 0253011edc1f1..da9a3c3a246ea 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -1,26 +1,10 @@ {{template "base/head" .}} {{if .ContextUser.IsOrganization}} -
    +
    {{template "shared/user/org_profile_avatar" .}}
    {{template "user/overview/header" .}} - {{template "code/searchform" .}} -
    -
    - {{if .CodeIndexerUnavailable}} -
    -

    {{$.locale.Tr "explore.code_search_unavailable"}}

    -
    - {{else if .SearchResults}} -

    - {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

    - {{template "code/searchresults" .}} - {{else if .Keyword}} -
    {{$.locale.Tr "explore.code_no_results"}}
    - {{end}} -
    - {{template "base/paginate" .}} + {{template "code/searchcombo" .}}
    {{else}} @@ -31,28 +15,8 @@ {{template "shared/user/profile_big_avatar" .}}
    -
    - {{template "user/overview/header" .}} -
    -
    - {{template "code/searchform" .}} -
    -
    - {{if .CodeIndexerUnavailable}} -
    -

    {{$.locale.Tr "explore.code_search_unavailable"}}

    -
    - {{else if .SearchResults}} -

    - {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

    - {{template "code/searchresults" .}} - {{else if .Keyword}} -
    {{$.locale.Tr "explore.code_no_results"}}
    - {{end}} -
    - {{template "base/paginate" .}} -
    + {{template "user/overview/header" .}} + {{template "code/searchcombo" .}}
    diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 5fbfa54db70df..ed828b18187fa 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -66,5 +66,4 @@ {{end}} {{end}} -
    From f355415ea6e862c08f0bb916d64ac33ca49a9553 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 19:29:33 +0800 Subject: [PATCH 27/29] fix --- routers/web/shared/user/header.go | 4 +++- routers/web/user/code.go | 3 ++- routers/web/user/package.go | 1 + routers/web/user/profile.go | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index d3d6c2668b113..516c853b02e3e 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -16,6 +16,8 @@ import ( "code.gitea.io/gitea/modules/setting" ) +// prepareContextForCommonProfile store some common data into context data for user's profile related pages (including the nav menu) +// It is designed to be fast and safe to be called multiple times in one request func prepareContextForCommonProfile(ctx *context.Context) { ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled @@ -24,7 +26,7 @@ func prepareContextForCommonProfile(ctx *context.Context) { ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() } -// PrepareContextForProfileBigAvatar set the context for big avatar view on repo +// PrepareContextForProfileBigAvatar set the context for big avatar view on the profile page func PrepareContextForProfileBigAvatar(ctx *context.Context) { prepareContextForCommonProfile(ctx) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 6d069be1bd12f..033f65c9c06c2 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -20,11 +20,12 @@ const ( // CodeSearch render user/organization code search page func CodeSearch(ctx *context.Context) { - shared_user.PrepareContextForProfileBigAvatar(ctx) if !setting.Indexer.RepoIndexerEnabled { ctx.Redirect(ctx.ContextUser.HomeLink()) return } + shared_user.PrepareContextForProfileBigAvatar(ctx) + shared_user.RenderUserHeader(ctx) ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled diff --git a/routers/web/user/package.go b/routers/web/user/package.go index eb4a8efb8360a..2e2c2a6e1f9db 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -270,6 +270,7 @@ func ListPackageVersions(ctx *context.Context) { } return } + page := ctx.FormInt("page") if page <= 1 { page = 1 diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 313cba86135fd..fe397ad681c64 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -87,6 +87,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi } } ctx.Data["TabName"] = tab + ctx.Data["HasProfileReadme"] = profileReadme != nil page := ctx.FormInt("page") if page <= 0 { @@ -230,7 +231,6 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi total = int(count) case "overview": - ctx.Data["HasProfileReadme"] = true if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { log.Error("failed to GetBlobContent: %v", err) } else { From da7bf218005f10b2d4245b17f4c61b650bee0566 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 5 Jul 2023 20:02:52 +0800 Subject: [PATCH 28/29] remove unused code --- routers/web/user/profile.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index fe397ad681c64..442fd0433a72c 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -52,8 +52,6 @@ func userProfile(ctx *context.Context) { ctx.Data["Title"] = ctx.ContextUser.DisplayName() ctx.Data["PageIsUserProfile"] = true - ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled - ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled // prepare heatmap data if setting.Service.EnableUserHeatmap { From b6706699567b178488b32160820b20fb858b63b6 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Jul 2023 20:31:24 +0200 Subject: [PATCH 29/29] dedent templates/user/overview/header.tmpl --- templates/user/overview/header.tmpl | 116 ++++++++++++++-------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index ed828b18187fa..0491020959f4e 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,69 +1,69 @@ -
    - {{if .HasProfileReadme}} - - {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} - +
    + {{if .HasProfileReadme}} + + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} + + {{end}} + + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} + {{if .ContextUser.NumRepos}} +
    {{.ContextUser.NumRepos}}
    {{end}} -     - {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{if .ContextUser.NumRepos}} -
    {{.ContextUser.NumRepos}}
    - {{end}} +     + {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} + + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + + {{end}} + {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} + + {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} - {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} - - {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + {{end}} + {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} + + {{svg "octicon-code"}} {{.locale.Tr "user.code"}} - {{end}} - {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} - - {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} + {{end}} + + {{if .ContextUser.IsOrganization}} + {{if .IsOrganizationMember}} + + {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} + {{if .NumMembers}} +
    {{.NumMembers}}
    + {{end}}     - {{end}} - {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} - - {{svg "octicon-code"}} {{.locale.Tr "user.code"}} + + {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} + {{if .NumTeams}} +
    {{.NumTeams}}
    + {{end}}     {{end}} - {{if .ContextUser.IsOrganization}} - {{if .IsOrganizationMember}} - - {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} - {{if .NumMembers}} -
    {{.NumMembers}}
    - {{end}} -     - - {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} - {{if .NumTeams}} -
    {{.NumTeams}}
    - {{end}} + {{if .IsOrganizationOwner}} +
    + + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - {{end}} - - {{if .IsOrganizationOwner}} -
    - - {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - -
    - {{end}} +
    + {{end}} + {{else}} + + {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + + {{if not .DisableStars}} + + {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} + {{if .ContextUser.NumStars}} +
    {{.ContextUser.NumStars}}
    + {{end}} +     {{else}} - - {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + + {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} - {{if not .DisableStars}} - - {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} - {{if .ContextUser.NumStars}} -
    {{.ContextUser.NumStars}}
    - {{end}} -     - {{else}} - - {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} - - {{end}} {{end}} -
    + {{end}} +