Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing badges in user profile for /projects and /packages #24232

Merged
merged 8 commits into from
Apr 23, 2023
Merged

Add missing badges in user profile for /projects and /packages #24232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f0a0f3d
Add missing badges in user profile for /projects and /packages
jakob30061 Apr 21, 2023
de6a4bf
Merge branch 'main' into add-missing-badges-for-routes
silverwind Apr 22, 2023
15b36fa
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 22, 2023
f6753fe
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 22, 2023
df8eef2
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 22, 2023
0175277
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 22, 2023
cf0a6e7
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 22, 2023
09474d8
Merge branch 'main' into add-missing-badges-for-routes
GiteaBot Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions routers/web/org/members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func Members(ctx *context.Context) {
}
ctx.Data["Page"] = pager
ctx.Data["Members"] = members
ctx.Data["ContextUser"] = ctx.ContextUser
ctx.Data["MembersIsPublicMember"] = membersIsPublic
ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(members, org.ID)
ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus()
Expand Down
1 change: 1 addition & 0 deletions routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func Teams(ctx *context.Context) {
}
}
ctx.Data["Teams"] = ctx.Org.Teams
ctx.Data["ContextUser"] = ctx.ContextUser

ctx.HTML(http.StatusOK, tplTeams)
}
Expand Down
9 changes: 6 additions & 3 deletions templates/user/overview/header.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<div class="ui secondary stackable pointing menu">
<a class="item" href="{{.ContextUser.HomeLink}}">
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
{{if .ContextUser.NumRepos}}
<div class="ui small label">{{.ContextUser.NumRepos}}</div>
{{end}}
</a>
{{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}}
<a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if .PageIsViewProjects}}active {{end}}item">
Expand All @@ -42,13 +45,13 @@
<a class="item" href="{{$.OrgLink}}/members">
{{svg "octicon-person"}}&nbsp;{{$.locale.Tr "org.members"}}
{{if .NumMembers}}
<div class="ui primary label">{{.NumMembers}}</div>
<div class="ui small label">{{.NumMembers}}</div>
{{end}}
</a>
<a class="item" href="{{$.OrgLink}}/teams">
{{svg "octicon-people"}}&nbsp;{{$.locale.Tr "org.teams"}}
{{if .NumTeams}}
<div class="ui primary label">{{.NumTeams}}</div>
<div class="ui small label">{{.NumTeams}}</div>
{{end}}
</a>
{{end}}
Expand All @@ -68,7 +71,7 @@
<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 primary label">{{.ContextUser.NumStars}}</div>
<div class="ui small label">{{.ContextUser.NumStars}}</div>
{{end}}
</a>
{{else}}
Expand Down