diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 5dc825302d..9a529427e1 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -103,6 +103,7 @@ func home(ctx *context.Context, viewRepositories bool) { ctx.Data["Teams"] = ctx.Org.Teams ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0 + ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember prepareResult, err := shared_user.RenderUserOrgHeader(ctx) if err != nil { diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index be5416af86..3c09a9cfab 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -4,7 +4,7 @@
-
+
{{/* Profile README Section */}} {{if .ProfileReadmeContent}}
{{.ProfileReadmeContent}}
@@ -124,63 +124,6 @@ {{end}}
- {{/* Public Members Section */}} -
-

- {{svg "octicon-people" 16}} {{ctx.Locale.Tr "org.public_members"}} - {{if .HasMorePublicMembers}} - {{ctx.Locale.Tr "org.view_all_members" .TotalPublicMembers}} - {{end}} -

- {{if .PublicMembers}} -
- {{range .PublicMembers}} - - {{ctx.AvatarUtils.Avatar .User 48}} - {{.User.Name}} - {{if .Role}}{{.Role}}{{end}} - - {{end}} -
- {{else}} -
-
- {{svg "octicon-person" 32}} -
- {{ctx.Locale.Tr "org.no_public_members"}} -
-
-
- {{end}} -
- - {{/* Organization Stats */}} - {{if .OrgStats}} -
-

- {{svg "octicon-graph" 16}} {{ctx.Locale.Tr "org.activity"}} -

-
-
-
{{.OrgStats.TotalRepos}}
-
{{ctx.Locale.Tr "org.repositories"}}
-
-
-
{{.OrgStats.TotalMembers}}
-
{{ctx.Locale.Tr "org.members"}}
-
-
-
{{.OrgStats.TotalTeams}}
-
{{ctx.Locale.Tr "org.teams"}}
-
-
-
{{.OrgStats.TotalStars}}
-
{{ctx.Locale.Tr "repo.stars"}}
-
-
-
- {{end}} - {{/* Profile README Empty State */}} {{if and (not .ProfileReadmeContent) .IsOrganizationOwner}}
@@ -212,7 +155,6 @@ {{end}}
- {{if .ShowMemberAndTeamTab}}
{{if .CanCreateOrgRepo}}
@@ -224,7 +166,7 @@
{{end}} - {{if and .ShowMemberAndTeamTab .ShowOrgProfileReadmeSelector}} + {{if .ShowOrgProfileReadmeSelector}}
-
+
{{if .IsViewingOrgAsMember}}{{ctx.Locale.Tr "org.view_as_member_hint"}}{{else}}{{ctx.Locale.Tr "org.view_as_public_hint"}}{{end}}
{{end}} - {{if .NumMembers}} -

+ {{/* Organization Stats - Sidebar Card */}} + {{if .OrgStats}} +
+ {{svg "octicon-graph" 16}} {{ctx.Locale.Tr "org.activity"}} +
+
+
+
+
{{.OrgStats.TotalRepos}}
+
{{ctx.Locale.Tr "org.repositories"}}
+
+
+
{{.OrgStats.TotalMembers}}
+
{{ctx.Locale.Tr "org.members"}}
+
+
+
{{.OrgStats.TotalTeams}}
+
{{ctx.Locale.Tr "org.teams"}}
+
+
+
{{.OrgStats.TotalStars}}
+
{{ctx.Locale.Tr "repo.stars"}}
+
+
+
+ {{end}} + + {{/* Members/Public Members Section */}} + {{if .IsOrganizationMember}} + {{/* Internal view - show all members */}} + {{if .NumMembers}} +

{{ctx.Locale.Tr "org.members"}} {{.NumMembers}} {{svg "octicon-chevron-right"}}

- {{$isMember := .IsOrganizationMember}} {{range .Members}} - {{if or $isMember (call $.IsPublicMember .ID)}} - {{ctx.AvatarUtils.Avatar . 48}} - {{end}} + {{ctx.AvatarUtils.Avatar . 48}} {{end}}
- {{end}} - {{if .IsOrganizationMember}} -
+ {{end}} + + {{/* Teams - only for members */}} +
{{ctx.Locale.Tr "org.teams"}} {{.Org.NumTeams}} {{svg "octicon-chevron-right"}}
@@ -280,9 +250,30 @@ {{ctx.Locale.Tr "org.create_new_team"}}
{{end}} + {{else}} + {{/* Public view - show public members only */}} + {{if .PublicMembers}} +

+ {{ctx.Locale.Tr "org.public_members"}} + {{if .HasMorePublicMembers}} + {{.TotalPublicMembers}} {{svg "octicon-chevron-right"}} + {{end}} +

+
+ {{range .PublicMembers}} + {{ctx.AvatarUtils.Avatar .User 48}} + {{end}} +
+ {{else}} +

+ {{ctx.Locale.Tr "org.public_members"}} +

+
+

{{ctx.Locale.Tr "org.no_public_members"}}

+
+ {{end}} {{end}}
- {{end}}