Skip to content

Commit 8213af5

Browse files
CL-JeremyCL-Jeremy
committed
Initial organization rework
1 parent cb1db8c commit 8213af5

File tree

6 files changed

+86
-97
lines changed

6 files changed

+86
-97
lines changed

‎templates/org/header.tmpl

+39-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,46 @@
11
{{with .Org}}
2-
<div class="ui container">
3-
<div class="ui vertically grid head">
4-
<div class="column">
5-
<div class="ui header">
6-
{{avatar . 100}}
7-
<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
8-
<span class="org-visibility">
9-
{{if .Visibility.IsLimited}}<div class="ui medium orange horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
10-
{{if .Visibility.IsPrivate}}<div class="ui medium red horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
11-
</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>
2+
<div class="header-wrapper">
3+
<div class="ui container">
4+
<div class="org-header fw">
5+
{{avatar . 100 "org-avatar"}}
6+
<div id="org-info">
7+
<div class="ui header">
8+
{{if $.PageIsUserProfile}}
9+
{{.DisplayName}}
10+
<div class="labels dif fw ac vm">
11+
{{template "org/visibility_label" dict "root" $ "org" . "size" "large"}}
12+
{{if $.IsOrganizationOwner}}
13+
<a class="ui compact small basic icon button poping up ml-2" href="{{$.OrgLink}}/settings" data-content="{{$.i18n.Tr "org.settings"}}" data-position="right center" data-variation="small">
14+
{{svg "octicon-tools"}}
15+
</a>
16+
{{end}}
17+
</div>
18+
{{else}}
19+
<a href="{{.HomeLink}}">{{.DisplayName}}</a><div class="di mx-2">/</div><span class="text thin dib mr-2">{{$.i18n.Tr "org.settings"}}</span>
20+
{{end}}
2321
</div>
22+
{{if $.PageIsUserProfile}}
23+
{{if $.RenderedDescription}}<div class="render-content markdown desc">{{$.RenderedDescription|Str2html}}</div>{{end}}
24+
<div class="text grey meta">
25+
{{if .Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Location}}</span></div>{{end}}
26+
{{if .Website}}<div class="item">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer" href="{{.Website}}">{{.Website}}</a></div>{{end}}
27+
</div>
28+
{{end}}
2429
</div>
30+
31+
{{if not $.PageIsUserProfile}}
32+
<div class="ui menu">
33+
<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
34+
{{svg "octicon-organization"}}&nbsp;{{$.i18n.Tr "org.people"}}
35+
<div class="floating ui black label">{{.NumMembers}}</div>
36+
</a>
37+
<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
38+
{{svg "octicon-people"}}&nbsp;{{$.i18n.Tr "org.teams"}}
39+
<div class="floating ui black label">{{.NumTeams}}</div>
40+
</a>
41+
</div>
42+
{{end}}
2543
</div>
2644
</div>
2745
</div>
28-
<div class="ui divider"></div>
2946
{{end}}

‎templates/org/home.tmpl

+11-33
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,16 @@
11
{{template "base/head" .}}
22
<div class="page-content organization profile">
3-
<div class="ui container df">
4-
{{avatar .Org 140 "org-avatar"}}
5-
<div id="org-info">
6-
<div class="ui header">
7-
{{.Org.DisplayName}}
8-
<span class="org-visibility">
9-
{{if .Org.Visibility.IsLimited}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
10-
{{if .Org.Visibility.IsPrivate}}<div class="ui large basic horizontal label">{{.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
11-
</span>
12-
{{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear"}}</a>{{end}}
13-
</div>
14-
{{if $.RenderedDescription}}<p class="render-content markdown">{{$.RenderedDescription|Str2html}}</p>{{end}}
15-
<div class="text grey meta">
16-
{{if .Org.Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Org.Location}}</span></div>{{end}}
17-
{{if .Org.Website}}<div class="item">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
18-
</div>
19-
</div>
20-
</div>
21-
22-
<div class="ui divider"></div>
3+
{{template "org/header" .}}
4+
<div class="ui divider mt-0"></div>
235

246
<div class="ui container">
257
<div class="ui mobile reversed stackable grid">
268
<div class="ui eleven wide column">
279
{{if .CanCreateOrgRepo}}
2810
<div class="text right">
29-
{{if not .DisabledMirrors}}
30-
<a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.i18n.Tr "new_migrate"}}</a>
31-
{{end}}
11+
{{if not .DisabledMirrors}}
12+
<a class="ui green button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{.i18n.Tr "new_migrate"}}</a>
13+
{{end}}
3214
<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{.i18n.Tr "new_repo"}}</a>
3315
</div>
3416
<div class="ui divider"></div>
@@ -39,12 +21,10 @@
3921
</div>
4022

4123
<div class="ui five wide column">
42-
<h4 class="ui top attached header">
43-
<strong>{{.i18n.Tr "org.people"}}</strong>
24+
<h4 class="ui top attached header df ac">
25+
<strong class="f1">{{.i18n.Tr "org.people"}}</strong>
4426
{{if .IsOrganizationMember}}
45-
<div class="ui right">
46-
<a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right"}}</a>
47-
</div>
27+
<a class="text grey df ac" href="{{.OrgLink}}/members"><span class="mr-2">{{.Org.NumMembers}}</span>{{svg "octicon-chevron-right"}}</a>
4828
{{end}}
4929
</h4>
5030
<div class="ui attached segment members">
@@ -59,11 +39,9 @@
5939
</div>
6040

6141
{{if .IsOrganizationMember}}
62-
<div class="ui top attached header">
63-
<strong>{{.i18n.Tr "org.teams"}}</strong>
64-
<div class="ui right">
65-
<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
66-
</div>
42+
<div class="ui top attached header df ac">
43+
<strong class="f1">{{.i18n.Tr "org.teams"}}</strong>
44+
<a class="text grey df ac" href="{{.OrgLink}}/teams"><span class="mr-2">{{.Org.NumTeams}}</span>{{svg "octicon-chevron-right"}}</a>
6745
</div>
6846
<div class="ui attached table segment teams">
6947
{{range .Teams}}

‎templates/org/visibility_label.tmpl

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{with .org}}
2+
{{if not .Visibility.IsPublic}}
3+
<div class="ui {{if $.size}}{{$.size}} {{end}}basic horizontal label">
4+
{{if .Visibility.IsLimited}}
5+
{{$.root.i18n.Tr "org.settings.visibility.limited_shortname"}}
6+
{{else if .Visibility.IsPrivate}}
7+
{{$.root.i18n.Tr "org.settings.visibility.private_shortname"}}
8+
{{end}}
9+
</div>
10+
{{end}}
11+
{{end}}

‎templates/user/dashboard/navbar.tmpl

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<div class="dashboard-navbar">
2-
<div class="ui secondary stackable menu">
2+
<div class="ui secondary stackable menu fw">
33
<div class="item">
44
<div class="ui floating dropdown link jump">
55
<span class="text truncated-item-container">
66
{{avatar .ContextUser}}
77
<span class="truncated-item-name">{{.ContextUser.ShortName 40}}</span>
88
{{if .ContextUser.IsOrganization}}
99
<span class="org-visibility">
10-
{{if .ContextUser.Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
11-
{{if .ContextUser.Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
10+
{{template "org/visibility_label" dict "root" $ "org" .ContextUser "size" "tiny"}}
1211
</span>
1312
{{end}}
1413
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -27,8 +26,7 @@
2726
{{avatar .}}
2827
<span class="truncated-item-name">{{.ShortName 40}}</span>
2928
<span class="org-visibility">
30-
{{if .Visibility.IsLimited}}<div class="ui orange tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.limited_shortname"}}</div>{{end}}
31-
{{if .Visibility.IsPrivate}}<div class="ui red tiny horizontal label">{{$.i18n.Tr "org.settings.visibility.private_shortname"}}</div>{{end}}
29+
{{template "org/visibility_label" dict "root" $ "org" . "size" "tiny"}}
3230
</span>
3331
</a>
3432
{{end}}
@@ -45,7 +43,7 @@
4543
{{if .ContextUser.IsOrganization}}
4644
<div class="right stackable menu">
4745
<div class="item">
48-
<div class="ui floating dropdown link jump">
46+
<div class="ui left floating dropdown link jump">
4947
<span class="text">
5048
{{svg "octicon-people" 18}}
5149
{{if .Team}}

‎web_src/less/_base.less

+1
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,7 @@ table th[data-sortt-desc] {
20252025

20262026
.truncated-item-container {
20272027
display: flex !important;
2028+
align-items: center;
20282029
}
20292030

20302031
.truncated-item-name {

‎web_src/less/_organization.less

+20-36
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
.organization {
2-
.head {
3-
.ui.header {
4-
.text {
5-
vertical-align: middle;
6-
font-size: 1.6rem;
7-
margin-left: 15px;
8-
}
9-
.org-visibility .label {
10-
margin-left: 5px;
11-
margin-top: 5px;
12-
}
13-
.ui.right {
14-
margin-top: 5px;
15-
}
16-
}
17-
}
18-
192
&.new.org {
203
#create-page-form();
214

@@ -33,28 +16,35 @@
3316
}
3417
}
3518

36-
&.profile {
19+
.header-wrapper {
20+
background-color: var(--color-navbar);
21+
padding-bottom: 15px;
22+
}
23+
24+
.org-header {
25+
display: flex;
26+
align-items: flex-start;
27+
3728
.org-avatar {
3829
width: 100px;
3930
height: 100px;
4031
margin-right: 15px;
4132
}
4233

4334
#org-info {
44-
overflow-wrap: anywhere;
35+
align-self: center;
36+
flex-grow: 1;
37+
word-wrap: break-word;
4538

4639
.ui.header {
47-
font-size: 36px;
48-
margin-bottom: 0;
49-
.org-visibility .label {
50-
margin-left: 5px;
51-
margin-top: 2px;
52-
}
40+
font-size: 24px;
41+
line-height: 40px;
42+
margin-bottom: .5rem;
5343
}
5444

5545
.desc {
5646
font-size: 16px;
57-
margin-bottom: 10px;
47+
margin-bottom: 16px;
5848
}
5949

6050
.meta {
@@ -68,17 +58,11 @@
6858
}
6959
}
7060
}
61+
}
7162

72-
.ui.top.header {
73-
.ui.right {
74-
margin-top: 0;
75-
}
76-
}
77-
78-
.teams {
79-
.item {
80-
padding: 10px 15px;
81-
}
63+
.teams {
64+
.item {
65+
padding: 10px 15px;
8266
}
8367
}
8468

0 commit comments

Comments
 (0)