Skip to content

Commit 383a3e4

Browse files
GamerGirlandCoGamerGirlandCo
committed
update org home page to show group navigation menu on the right
1 parent abbff0e commit 383a3e4

File tree

1 file changed

+55
-45
lines changed

1 file changed

+55
-45
lines changed

‎templates/org/home.tmpl‎

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<div class="ui mobile reversed stackable grid">
77
<div class="ui {{if .ShowMemberAndTeamTab}}eleven wide{{end}} column">
88
{{if .ProfileReadmeContent}}
9-
<div id="readme_profile" class="render-content markup" data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
9+
<div id="readme_profile" class="render-content markup"
10+
data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
1011
{{end}}
1112
{{template "shared/repo/search" .}}
1213
{{template "shared/repo/list" .}}
@@ -16,15 +17,21 @@
1617
{{if .ShowMemberAndTeamTab}}
1718
<div class="ui five wide column">
1819
{{if .CanCreateOrgRepo}}
19-
<div class="tw-flex tw-flex-wrap tw-justify-center tw-gap-x-1 tw-gap-y-2 tw-mb-4">
20-
<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
21-
{{if not .DisableNewPullMirrors}}
22-
<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
23-
{{end}}
24-
</div>
25-
<div class="divider"></div>
20+
<div class="tw-flex tw-flex-wrap tw-justify-center tw-gap-x-1 tw-gap-y-2 tw-mb-4">
21+
<a class="ui primary button tw-grow"
22+
href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
23+
{{if not .DisableNewPullMirrors}}
24+
<a class="ui primary button tw-grow"
25+
href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
26+
{{end}}
27+
</div>
28+
<div class="divider"></div>
2629
{{end}}
27-
30+
<div class="ui five wide column">
31+
<div class="tw-mb-4">
32+
{{template "group/sidebar/menu" .}}
33+
</div>
34+
</div>
2835
{{if and .ShowMemberAndTeamTab .ShowOrgProfileReadmeSelector}}
2936
<div class="tw-my-4">
3037
<div id="org-home-view-as-dropdown" class="ui dropdown jump">
@@ -36,7 +43,7 @@
3643
{{svg "octicon-check" 14 (Iif (not .IsViewingOrgAsMember) "" "tw-invisible")}} {{ctx.Locale.Tr "settings.visibility.public"}}
3744
</a>
3845
<a href="?view_as=member" class="item {{if .IsViewingOrgAsMember}}selected{{end}}">
39-
{{svg "octicon-check" 14 (Iif .IsViewingOrgAsMember "" "tw-invisible")}} {{ctx.Locale.Tr "org.members.member"}}
46+
{{svg "octicon-check" 14 (Iif .IsViewingOrgAsMember "" "tw-invisible")}} {{ctx.Locale.Tr "org.members.member"}}
4047
</a>
4148
</div>
4249
</div>
@@ -47,47 +54,50 @@
4754
{{end}}
4855

4956
{{if .NumMembers}}
50-
<h4 class="ui top attached header tw-flex">
51-
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
52-
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
53-
</h4>
54-
<div class="ui attached segment members">
55-
{{$isMember := .IsOrganizationMember}}
56-
{{range .Members}}
57-
{{if or $isMember (call $.IsPublicMember .ID)}}
58-
<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
59-
{{end}}
60-
{{end}}
61-
</div>
57+
<h4 class="ui top attached header tw-flex">
58+
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
59+
<a class="text grey tw-flex tw-items-center"
60+
href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
61+
</h4>
62+
<div class="ui attached segment members">
63+
{{$isMember := .IsOrganizationMember}}
64+
{{range .Members}}
65+
{{if or $isMember (call $.IsPublicMember .ID)}}
66+
<a href="{{.HomeLink}}"
67+
title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
68+
{{end}}
69+
{{end}}
70+
</div>
6271
{{end}}
6372
{{if .IsOrganizationMember}}
64-
<div class="ui top attached header tw-flex">
65-
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
66-
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
67-
</div>
68-
<div class="ui attached table segment teams">
69-
{{range .Teams}}
70-
<div class="item">
71-
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
72-
<p class="text grey">
73-
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a> ·
74-
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
75-
</p>
76-
</div>
77-
{{end}}
73+
<div class="ui top attached header tw-flex">
74+
<strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
75+
<a class="text grey tw-flex tw-items-center"
76+
href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
77+
</div>
78+
<div class="ui attached table segment teams">
79+
{{range .Teams}}
80+
<div class="item">
81+
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
82+
<p class="text grey">
83+
<a class="muted"
84+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}
85+
</a> ·
86+
<a class="muted"
87+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}
88+
</a>
89+
</p>
7890
</div>
79-
{{if .IsOrganizationOwner}}
80-
<div class="ui bottom attached segment">
81-
<a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
82-
</div>
8391
{{end}}
84-
{{end}}
85-
</div>
86-
{{else}}
87-
<div class="ui five wide column">
88-
{{template "group/sidebar/menu" .}}
8992
</div>
93+
{{if .IsOrganizationOwner}}
94+
<div class="ui bottom attached segment">
95+
<a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
96+
</div>
97+
{{end}}
98+
{{end}}
9099
{{end}}
100+
</div>
91101
</div>
92102
</div>
93103
</div>

0 commit comments

Comments
 (0)