Skip to content

Commit 49933c7

Browse files
authored
Create menus for organization pages (#17802)
* Create menus for organization pages * Fix frontend lint * Fix frontend lint
1 parent 71ed96b commit 49933c7

File tree

5 files changed

+39
-24
lines changed

5 files changed

+39
-24
lines changed

routers/web/org/home.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ func Home(ctx *context.Context) {
142142
ctx.Data["Members"] = members
143143
ctx.Data["Teams"] = ctx.Org.Teams
144144
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
145+
ctx.Data["PageIsViewRepositories"] = true
145146

146147
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
147148
pager.SetDefaultParams(ctx)

templates/org/header.tmpl

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,10 @@
99
{{if .Visibility.IsLimited}}<div class="ui medium orange horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
1010
{{if .Visibility.IsPrivate}}<div class="ui medium red horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
1111
</span>
12-
<div class="ui right">
13-
<div class="ui menu">
14-
<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
15-
{{svg "octicon-organization"}}&nbsp;{{$.i18n.Tr "org.people"}}
16-
<div class="floating ui black label">{{.NumMembers}}</div>
17-
</a>
18-
<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
19-
{{svg "octicon-people"}}&nbsp;{{$.i18n.Tr "org.teams"}}
20-
<div class="floating ui black label">{{.NumTeams}}</div>
21-
</a>
22-
</div>
23-
</div>
2412
</div>
2513
</div>
2614
</div>
2715
</div>
28-
<div class="ui divider"></div>
2916
{{end}}
17+
18+
{{template "org/menu" .}}

templates/org/home.tmpl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
{{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
1010
{{if .Org.Visibility.IsPrivate}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
1111
</span>
12-
{{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16 "mb-3"}}</a>{{end}}
1312
</div>
1413
{{if $.RenderedDescription}}<p class="render-content markup">{{$.RenderedDescription|Str2html}}</p>{{end}}
1514
<div class="text grey meta">
@@ -19,20 +18,11 @@
1918
</div>
2019
</div>
2120

22-
<div class="ui divider"></div>
21+
{{template "org/menu" .}}
2322

2423
<div class="ui container">
2524
<div class="ui mobile reversed stackable grid">
2625
<div class="ui eleven wide column">
27-
{{if .CanCreateOrgRepo}}
28-
<div class="text right">
29-
{{if not .DisableNewPullMirrors}}
30-
<a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.i18n.Tr "new_migrate"}}</a>
31-
{{end}}
32-
<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.i18n.Tr "new_repo"}}</a>
33-
</div>
34-
<div class="ui divider"></div>
35-
{{end}}
3626
{{template "explore/repo_search" .}}
3727
{{template "explore/repo_list" .}}
3828
{{template "base/paginate" .}}

templates/org/menu.tmpl

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<div class="ui tabs container">
2+
<div class="ui secondary stackable pointing menu">
3+
<a class="{{if .PageIsViewRepositories}}active{{end}} item" href="{{$.Org.HomeLink}}">
4+
{{svg "octicon-repo"}} {{.i18n.Tr "user.repositories"}}
5+
</a>
6+
{{if .IsOrganizationMember}}
7+
<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
8+
{{svg "octicon-organization"}}&nbsp;{{$.i18n.Tr "org.people"}}
9+
{{if .NumMembers}}
10+
<div class="ui primary label">{{.NumMembers}}</div>
11+
{{end}}
12+
</a>
13+
<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
14+
{{svg "octicon-people"}}&nbsp;{{$.i18n.Tr "org.teams"}}
15+
{{if .NumTeams}}
16+
<div class="ui black label">{{.NumTeams}}</div>
17+
{{end}}
18+
</a>
19+
{{end}}
20+
21+
{{if .IsOrganizationOwner}}
22+
<div class="right menu">
23+
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings">
24+
{{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}}
25+
</a>
26+
</div>
27+
{{end}}
28+
</div>
29+
</div>

web_src/less/_organization.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
}
1717
}
1818

19+
.ui.secondary.stackable.pointing.menu {
20+
flex-wrap: wrap;
21+
margin-top: 5px;
22+
margin-bottom: 10px;
23+
}
24+
1925
&.new.org {
2026
#create-page-form();
2127

0 commit comments

Comments
 (0)