diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index e525f2c43f3ac..708dea05e9c16 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -41,6 +41,7 @@ func MustEnableProjects(ctx *context.Context) { // Projects renders the home page of projects func Projects(ctx *context.Context) { + shared_user.RenderProfileBigAvatar(ctx) 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..d76a24120259c 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" ) +// RenderProfileBigAvatar set the context for big avatar view on repo +func RenderProfileBigAvatar(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..fe91932a60a5d 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -11,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" + "code.gitea.io/gitea/routers/web/shared/user" ) const ( @@ -19,17 +20,16 @@ const ( // CodeSearch render user/organization code search page func CodeSearch(ctx *context.Context) { + user.RenderProfileBigAvatar(ctx) 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 ctx.Data["Title"] = ctx.Tr("explore.code") ctx.Data["ContextUser"] = ctx.ContextUser - language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") @@ -109,6 +109,5 @@ func CodeSearch(ctx *context.Context) { pager.SetDefaultParams(ctx) pager.AddParam(ctx, "l", "Language") ctx.Data["Page"] = pager - ctx.HTML(http.StatusOK, tplUserCode) } diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 20141914b655b..3bcdd00b582c9 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -36,6 +36,7 @@ const ( // ListPackages displays a list of all packages of the context user func ListPackages(ctx *context.Context) { + shared_user.RenderProfileBigAvatar(ctx) page := ctx.FormInt("page") if page <= 1 { page = 1 diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 1f113b28c84c9..dcf11f345d88f 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,6 +1,23 @@ {{template "base/head" .}} -
- {{template "user/overview/header" .}} - {{template "projects/list" .}} -
+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/profile_big_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..9d76d2e46cbd8 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,7 +1,21 @@ -
+
{{template "base/alert" .}} -
+
+ +
+ + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{.locale.Tr "packages.filter.type"}}
+
+
{{.locale.Tr "packages.filter.type.all"}}
+ {{range $type := .AvailableTypes}} +
+ {{$type.Name}} +
+ {{end}} +
+
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 9725c1e63b337..64c6bafe28147 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,5 +1,5 @@
-
+
{{if .CanWriteProjects}}
diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl new file mode 100644 index 0000000000000..e2ac20f2bb98a --- /dev/null +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -0,0 +1,135 @@ +{{if .ContextUser.IsOrganization}} + {{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}} +{{else}} +
+
+ {{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)}} + + {{else}} +
    + {{$.CsrfTokenHtml}} + +
    + {{end}} + + {{end}} +
+
+
+{{end}} diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index cc02ef8314d3b..065fdb921434c 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -1,4 +1,57 @@ {{template "base/head" .}} +{{if .ContextUser.IsOrganization}} +
+ {{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}} +
+
+
+
+ {{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" .}}
@@ -9,17 +62,8 @@

{{$.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" .}}
-
+{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 6016aca447d97..fe1dfb506751e 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..d7a68933fca39 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,6 +1,23 @@ {{template "base/head" .}} -
- {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} -
+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/profile_big_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..18bf32e0f6674 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -1,6 +1,24 @@ {{template "base/head" .}} -
- {{template "user/overview/header" .}} - {{template "package/shared/list" .}} -
+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/profile_big_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" .}}
diff --git a/web_src/css/user.css b/web_src/css/user.css index 54a966e7cb471..2077a934f08dc 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -64,6 +64,16 @@ margin-top: 25px; } +.user.profile.packages .empty.list { + padding-top: 70px; + padding-bottom: 100px; +} + +.user.profile.packages .search-input, +.user.profile .code-search { + margin-top: 15px; +} + .user.profile .ui.repository.list .repo-title .labels { word-break: normal; flex-shrink: 0;