diff options
author | puni9869 <80308335+puni9869@users.noreply.github.com> | 2023-07-07 00:29:24 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-06 18:59:24 +0000 |
commit | 2af30f715e64dbb0a3900168e3768ffb36c06392 (patch) | |
tree | 9167af942ea3d4ee7e32e756637ae48d6d10041e /templates/user | |
parent | f0bde0e4f902970d447e3aae628f2dcf6f79e539 (diff) | |
download | gitea-2af30f715e64dbb0a3900168e3768ffb36c06392.tar.gz gitea-2af30f715e64dbb0a3900168e3768ffb36c06392.zip |
Fix inconsistent user profile layout across tabs (#25625)
Fix ::User Profile Page Project Tab Have Inconsistent Layout and Style
Added the big_avator for consistency in the all header_items tabs.
Fixes: #24871
> ### Description
> in the user profile page the `Packages` and `Projects` tab have small
icons for user but other tabs have bigger profile picture with user
info:
>
> ### Screenshots
> ### **For Packages And Projects:**
>

>
> ### **For Other Tabs:**
>

>
## Before

## After changes
Project View
<img width="1394" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/95d181d7-8e61-496d-9899-7b825c91ad56">
Packages View
<img width="1378" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/7f5fd60f-6b18-4fa8-8c56-7b0d45d1a610">
## Org view for projects page
<img width="1385" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/6400dc89-a5ae-4f0a-831b-5b6efa020d89">
## Org view for packages page
<img width="1387" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/4e1e9ffe-1e4b-4334-8657-de11b5fd31d0">
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/user')
-rw-r--r-- | templates/user/code.tmpl | 40 | ||||
-rw-r--r-- | templates/user/overview/header.tmpl | 135 | ||||
-rw-r--r-- | templates/user/overview/package_versions.tmpl | 27 | ||||
-rw-r--r-- | templates/user/overview/packages.tmpl | 29 | ||||
-rw-r--r-- | templates/user/profile.tmpl | 125 |
5 files changed, 130 insertions, 226 deletions
diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index cc02ef8314..da9a3c3a24 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -1,25 +1,25 @@ {{template "base/head" .}} -<div role="main" aria-label="{{.Title}}" class="page-content repository code-search"> - {{template "user/overview/header" .}} - <div class="ui container"> - {{template "code/searchform" .}} - <div class="divider"></div> - <div class="ui user list"> - {{if .CodeIndexerUnavailable}} - <div class="ui error message"> - <p>{{$.locale.Tr "explore.code_search_unavailable"}}</p> +{{if .ContextUser.IsOrganization}} + <div role="main" aria-label="{{.Title}}" class="page-content repository"> + {{template "shared/user/org_profile_avatar" .}} + <div class="ui container"> + {{template "user/overview/header" .}} + {{template "code/searchcombo" .}} + </div> + </div> +{{else}} + <div role="main" aria-label="{{.Title}}" class="page-content user profile"> + <div class="ui container"> + <div class="ui stackable grid"> + <div class="ui four wide column"> + {{template "shared/user/profile_big_avatar" .}} + </div> + <div class="ui twelve wide column"> + {{template "user/overview/header" .}} + {{template "code/searchcombo" .}} </div> - {{else if .SearchResults}} - <h3> - {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} - </h3> - {{template "code/searchresults" .}} - {{else if .Keyword}} - <div>{{$.locale.Tr "explore.code_no_results"}}</div> - {{end}} + </div> </div> - - {{template "base/paginate" .}} </div> -</div> +{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 6016aca447..0491020959 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,92 +1,69 @@ -<!-- TODO: make template org and user can share --> -{{if or (.IsPackagesPage) (.PageIsViewProjects)}} - {{with .ContextUser}} - <div class="ui container"> - <div class="ui vertically grid head"> - <div class="column"> - <div class="ui header"> - {{avatar $.Context . 100}} - <span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span> - <span class="org-visibility"> - {{if .Visibility.IsLimited}}<div class="ui medium basic horizontal label">{{$.locale.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}} - {{if .Visibility.IsPrivate}}<div class="ui medium basic horizontal label">{{$.locale.Tr "org.settings.visibility.private_shortname"}}</div>{{end}} - </span> - </div> - </div> - </div> - </div> +<div class="ui secondary stackable pointing menu"> + {{if .HasProfileReadme}} + <a class='{{if eq .TabName "overview"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=overview"> + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} + </a> {{end}} -{{end}} - -<div class="ui tabs container"> - <div class="ui secondary stackable pointing menu"> - {{if .ProfileReadme}} - <a class='{{if or (eq .TabName "overview") (and (eq .TabName "") (not .IsPackagesPage) (not .PageIsViewProjects))}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=overview"> - {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} - </a> + <a class="{{if eq .TabName "repositories"}}active {{end}} item" href="{{.ContextUser.HomeLink}}?tab=repositories"> + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} + {{if .ContextUser.NumRepos}} + <div class="ui small label">{{.ContextUser.NumRepos}}</div> {{end}} - <a class="{{if or (eq .TabName "repositories") (and (eq .TabName "") (not .IsPackagesPage) (not .PageIsViewProjects) (not .ProfileReadme))}}active {{end}} item" href="{{.ContextUser.HomeLink}}?tab=repositories"> - {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{if .ContextUser.NumRepos}} - <div class="ui small label">{{.ContextUser.NumRepos}}</div> - {{end}} + </a> + {{if or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects)}} + <a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item"> + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + </a> + {{end}} + {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} + <a href="{{.ContextUser.HomeLink}}/-/packages" class="{{if .IsPackagesPage}}active {{end}}item"> + {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} </a> - {{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}} - <a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item"> - {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + {{end}} + {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} + <a href="{{.ContextUser.HomeLink}}/-/code" class="{{if .IsCodePage}}active {{end}}item"> + {{svg "octicon-code"}} {{.locale.Tr "user.code"}} </a> - {{end}} - {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} - <a href="{{.ContextUser.HomeLink}}/-/packages" class="{{if .IsPackagesPage}}active {{end}}item"> - {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} + {{end}} + + {{if .ContextUser.IsOrganization}} + {{if .IsOrganizationMember}} + <a class="item" href="{{$.OrgLink}}/members"> + {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} + {{if .NumMembers}} + <div class="ui small label">{{.NumMembers}}</div> + {{end}} </a> - {{end}} - {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} - <a href="{{.ContextUser.HomeLink}}/-/code" class="{{if .IsCodePage}}active {{end}}item"> - {{svg "octicon-code"}} {{.locale.Tr "user.code"}} + <a class="item" href="{{$.OrgLink}}/teams"> + {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} + {{if .NumTeams}} + <div class="ui small label">{{.NumTeams}}</div> + {{end}} </a> {{end}} - {{if .ContextUser.IsOrganization}} - {{if .IsOrganizationMember}} - <a class="item" href="{{$.OrgLink}}/members"> - {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} - {{if .NumMembers}} - <div class="ui small label">{{.NumMembers}}</div> - {{end}} - </a> - <a class="item" href="{{$.OrgLink}}/teams"> - {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} - {{if .NumTeams}} - <div class="ui small label">{{.NumTeams}}</div> - {{end}} + {{if .IsOrganizationOwner}} + <div class="right menu"> + <a class="item" href="{{.OrgLink}}/settings"> + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} </a> - {{end}} - - {{if .IsOrganizationOwner}} - <div class="right menu"> - <a class="item" href="{{.OrgLink}}/settings"> - {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - </a> - </div> - {{end}} + </div> + {{end}} + {{else}} + <a class='{{if eq .TabName "activity"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=activity"> + {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + </a> + {{if not .DisableStars}} + <a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=stars"> + {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} + {{if .ContextUser.NumStars}} + <div class="ui small label">{{.ContextUser.NumStars}}</div> + {{end}} + </a> {{else}} - <a class='{{if eq .TabName "activity"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=activity"> - {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + <a class='{{if eq .TabName "watching"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=watching"> + {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} </a> - {{if not .DisableStars}} - <a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=stars"> - {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} - {{if .ContextUser.NumStars}} - <div class="ui small label">{{.ContextUser.NumStars}}</div> - {{end}} - </a> - {{else}} - <a class='{{if eq .TabName "watching"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=watching"> - {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} - </a> - {{end}} {{end}} - - </div> + {{end}} </div> diff --git a/templates/user/overview/package_versions.tmpl b/templates/user/overview/package_versions.tmpl index 0bab740f5c..3757e922e3 100644 --- a/templates/user/overview/package_versions.tmpl +++ b/templates/user/overview/package_versions.tmpl @@ -1,6 +1,27 @@ {{template "base/head" .}} -<div role="main" aria-label="{{.Title}}" class="page-content repository packages"> - {{template "user/overview/header" .}} - {{template "package/shared/versionlist" .}} +{{if .ContextUser.IsOrganization}} + <div role="main" aria-label="{{.Title}}" class="page-content repository packages"> + {{template "shared/user/org_profile_avatar" .}} + <div class="ui container"> + {{template "user/overview/header" .}} + {{template "package/shared/versionlist" .}} + </div> + </div> +{{else}} +<div role="main" aria-label="{{.Title}}" class="page-content user profile packages"> + <div class="ui container"> + <div class="ui stackable grid"> + <div class="ui four wide column"> + {{template "shared/user/profile_big_avatar" .}} + </div> + <div class="ui twelve wide column"> + <div class="gt-mb-4"> + {{template "user/overview/header" .}} + </div> + {{template "package/shared/versionlist" .}} + </div> + </div> + </div> </div> +{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/packages.tmpl b/templates/user/overview/packages.tmpl index 8f8597c42d..4fd17696d1 100644 --- a/templates/user/overview/packages.tmpl +++ b/templates/user/overview/packages.tmpl @@ -1,6 +1,27 @@ {{template "base/head" .}} -<div role="main" aria-label="{{.Title}}" class="page-content repository packages"> - {{template "user/overview/header" .}} - {{template "package/shared/list" .}} -</div> +{{if .ContextUser.IsOrganization}} + <div role="main" aria-label="{{.Title}}" class="page-content repository packages"> + {{template "shared/user/org_profile_avatar" .}} + <div class="ui container"> + {{template "user/overview/header" .}} + {{template "package/shared/list" .}} + </div> + </div> +{{else}} + <div role="main" aria-label="{{.Title}}" class="page-content user profile packages"> + <div class="ui container"> + <div class="ui stackable grid"> + <div class="ui four wide column"> + {{template "shared/user/profile_big_avatar" .}} + </div> + <div class="ui twelve wide column"> + <div class="gt-mb-4"> + {{template "user/overview/header" .}} + </div> + {{template "package/shared/list" .}} + </div> + </div> + </div> + </div> +{{end}} {{template "base/footer" .}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 7c37de2bc9..396d9ebcd4 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -3,125 +3,10 @@ <div class="ui container"> <div class="ui stackable grid"> <div class="ui four wide column"> - <div class="ui card"> - <div id="profile-avatar" class="content gt-df"> - {{if eq .SignedUserID .ContextUser.ID}} - <a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{.locale.Tr "user.change_avatar"}}"> - {{/* 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}} - </a> - {{else}} - <span class="image"> - {{avatar $.Context .ContextUser 256}} - </span> - {{end}} - </div> - <div class="content gt-word-break profile-avatar-name"> - {{if .ContextUser.FullName}}<span class="header text center">{{.ContextUser.FullName}}</span>{{end}} - <span class="username text center">{{.ContextUser.Name}}</span> - {{if .EnableFeed}} - <a href="{{.ContextUser.HomeLink}}.rss"><i class="ui text grey gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a> - {{end}} - <div class="gt-mt-3"> - <a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-person" 18 "gt-mr-2"}}{{.NumFollowers}} {{.locale.Tr "user.followers"}}</a> ยท <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{.NumFollowing}} {{.locale.Tr "user.following"}}</a> - </div> - </div> - <div class="extra content gt-word-break"> - <ul> - {{if .ContextUser.Location}} - <li>{{svg "octicon-location"}} {{.ContextUser.Location}}</li> - {{end}} - {{if (eq .SignedUserID .ContextUser.ID)}} - <li> - {{svg "octicon-mail"}} - <a href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a> - <a href="{{AppSubUrl}}/user/settings#privacy-user-settings"> - {{if .ShowUserEmail}} - <i class="ui right" data-tooltip-content="{{.locale.Tr "user.email_visibility.limited"}}"> - {{svg "octicon-unlock"}} - </i> - {{else}} - <i class="ui right" data-tooltip-content="{{.locale.Tr "user.email_visibility.private"}}"> - {{svg "octicon-lock"}} - </i> - {{end}} - </a> - </li> - {{else}} - {{if .ShowUserEmail}} - <li> - {{svg "octicon-mail"}} - <a href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a> - </li> - {{end}} - {{end}} - {{if .ContextUser.Website}} - <li> - {{svg "octicon-link"}} - <a target="_blank" rel="noopener noreferrer me" href="{{.ContextUser.Website}}">{{.ContextUser.Website}}</a> - </li> - {{end}} - {{if $.RenderedDescription}} - <li> - <div class="render-content markup">{{$.RenderedDescription|Str2html}}</div> - </li> - {{end}} - {{range .OpenIDs}} - {{if .Show}} - <li> - {{svg "fontawesome-openid"}} - <a target="_blank" rel="noopener noreferrer" href="{{.URI}}">{{.URI}}</a> - </li> - {{end}} - {{end}} - <li>{{svg "octicon-clock"}} {{.locale.Tr "user.joined_on" (DateTime "short" .ContextUser.CreatedUnix) | Safe}}</li> - {{if and .Orgs .HasOrgsVisible}} - <li> - <ul class="user-orgs"> - {{range .Orgs}} - {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.HasMemberWithUserID $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}} - <li> - <a href="{{.HomeLink}}" data-tooltip-content="{{.Name}}"> - {{avatar $.Context .}} - </a> - </li> - {{end}} - {{end}} - </ul> - </li> - {{end}} - {{if .Badges}} - <li> - <ul class="user-badges"> - {{range .Badges}} - <li> - <img width="64" height="64" src="{{.ImageURL}}" alt="{{.Description}}" data-tooltip-content="{{.Description}}"> - </li> - {{end}} - </ul> - </li> - {{end}} - {{if and .IsSigned (ne .SignedUserID .ContextUser.ID)}} - <li class="follow"> - {{if $.IsFollowing}} - <form method="post" action="{{.Link}}?action=unfollow&redirect_to={{$.Link}}"> - {{$.CsrfTokenHtml}} - <button type="submit" class="ui basic red button">{{svg "octicon-person"}} {{.locale.Tr "user.unfollow"}}</button> - </form> - {{else}} - <form method="post" action="{{.Link}}?action=follow&redirect_to={{$.Link}}"> - {{$.CsrfTokenHtml}} - <button type="submit" class="ui basic green button">{{svg "octicon-person"}} {{.locale.Tr "user.follow"}}</button> - </form> - {{end}} - </li> - {{end}} - </ul> - </div> - </div> + {{template "shared/user/profile_big_avatar" .}} </div> <div class="ui twelve wide column"> - <div class="gt-mb-4 gt-df"> + <div class="gt-mb-4"> {{template "user/overview/header" .}} </div> @@ -145,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"}} + <div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div> + {{else}} {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}} - {{else if .ProfileReadme}} - <div id="readme_profile" class="render-content markup"> {{$.ProfileReadme|Str2html}} </div> {{end}} </div> </div> |