Skip to content

Commit 53ad94f

Browse files
GamerGirlandCoGamerGirlandCo
committed
format templates
1 parent 4680b09 commit 53ad94f

File tree

5 files changed

+85
-91
lines changed

5 files changed

+85
-91
lines changed

‎templates/group/header.tmpl‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<div class="flex-item-title tw-text-18">
66
<a class="muted tw-font-normal" href="{{.Group.Owner.HomeLink}}">{{.Group.Owner.Name}}</a>
77
{{- range .Breadcrumbs -}}
8-
/<a class="muted{{if eq .ID $.Group.ID}} tw-font-bold active{{else}} tw-font-normal{{end}}"
9-
href="{{.GroupLink}}">{{.Name}}</a>
8+
/<a class="muted{{if eq .ID $.Group.ID}} tw-font-bold active{{else}} tw-font-normal{{end}}"
9+
href="{{.GroupLink}}">{{.Name}}</a>
1010
{{- end -}}
1111
</div>
1212
</div>
@@ -33,15 +33,14 @@
3333
</span>
3434
<span class="tw-flex tw-items-center tw-gap-1 tw-ml-auto tw-text-16 tw-whitespace-nowrap">
3535
{{if .EnableFeed}}
36-
<a class="ui basic label button tw-mr-0" href="{{.Group.GroupLink}}.rss"
37-
data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
36+
<a class="ui basic label button tw-mr-0" href="{{.Group.GroupLink}}.rss" data-tooltip-content="{{ctx.Locale.Tr "rss_feed"}}">
3837
{{svg "octicon-rss" 24}}
3938
</a>
4039
{{end}}
4140
</span>
4241
</div>
4342
{{if .RenderedDescription}}
44-
<div class="render-content markup tw-break-anywhere">{{.RenderedDescription}}</div>
43+
<div class="render-content markup tw-break-anywhere">{{.RenderedDescription}}</div>
4544
{{end}}
4645
</div>
4746
</div>

‎templates/group/settings/options.tmpl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<label for="group_name">
1010
{{ctx.Locale.Tr "group.group_name_holder"}}
1111
</label>
12-
<input id="group_name" name="name" value="{{.Group.Name}}" data-group-name="{{.Group.Name}}" autofocus required
13-
maxlength="40">
12+
<input id="group_name" name="name" value="{{.Group.Name}}" data-group-name="{{.Group.Name}}" autofocus required maxlength="40">
1413
</div>
1514
<div class="divider"></div>
1615
<div class="field" id="visibility_box">
1716
<label for="visibility">{{ctx.Locale.Tr "group.settings.visibility"}}</label>
1817
<div class="field">
1918
<div class="ui radio checkbox">
20-
<input class="enable-system-radio" name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}>
19+
<input class="enable-system-radio" name="visibility" type="radio" value="0"
20+
{{if eq .CurrentVisibility 0}}checked{{end}}>
2121
<label>{{ctx.Locale.Tr "group.settings.visibility.public"}}</label>
2222
</div>
2323
</div>
@@ -49,7 +49,8 @@
4949

5050
<div class="field">
5151
<button class="ui primary button">{{ctx.Locale.Tr "settings.update_avatar"}}</button>
52-
<button class="ui red button link-action" data-url="{{.Link}}/avatar/delete">{{ctx.Locale.Tr "settings.delete_current_avatar"}}</button>
52+
<button class="ui red button link-action"
53+
data-url="{{.Link}}/avatar/delete">{{ctx.Locale.Tr "settings.delete_current_avatar"}}</button>
5354
</div>
5455
</form>
5556
</div>

‎templates/group/sidebar/sidebar_item.tmpl‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
{{$item := (call (index $.root "AsGroupItem") .item)}}
22
{{$parent := $item.Parent}}
33
<li class="expandable-menu-item item tw-px-0" {{if $item.IsGroup}} data-is-group="true"{{end}}
4-
data-sort-id="{{if $item.IsGroup}}group{{else}}repo{{end}}-{{$item.ID}}-{{$item.Sort}}"
4+
data-sort-id="{{if $item.IsGroup}}group{{else}}repo{{end}}-{{$item.ID}}-{{$item.Sort}}"
55
data-id="{{$item.ID}}">
66
<label class="tw-gap-2{{if $item.HasChildren $.root.Doer}} has-children{{end}}">
77
{{$active := (and $item.IsGroup (call $.root.GroupIsCurrent $item.ID))}}
88
{{$childContains := (call $.root.GroupHasChild $item)}}
99
<input type="checkbox"
10-
class="toggle tw-h-0 tw-w-0 tw-overflow-hidden tw-opacity-0 tw-absolute"{{if or $active $childContains}} checked{{end}}>
10+
class="toggle tw-h-0 tw-w-0 tw-overflow-hidden tw-opacity-0 tw-absolute"{{if or $active $childContains}}
11+
checked{{end}}>
1112
{{svg "octicon-chevron-right" 16 "collapse-icon"}}
1213
<a href="{{$item.Link}}" class="{{if $active}}active tw-font-bold{{end}}">
1314
{{$item.Title}}
1415
</a>
1516
</label>
16-
<div class="menu-expandable-content">
17-
<div class="menu-expandable-content-inner">
18-
<ul class="tw-list-none tw-ps-5"{{if .root.IsOrganizationMember}} data-url="{{ctx.RootData.Org.HomeLink}}/groups"{{end}}>
19-
{{- range $i, $childItem := $item.Children $.root.Doer -}}
20-
{{- template "group/sidebar/sidebar_item" dict "item" $childItem "root" $.root -}}
21-
{{- end -}}
22-
</ul>
23-
</div>
17+
<div class="menu-expandable-content">
18+
<div class="menu-expandable-content-inner">
19+
<ul class="tw-list-none tw-ps-5"{{if .root.IsOrganizationMember}}
20+
data-url="{{ctx.RootData.Org.HomeLink}}/groups"{{end}}>
21+
{{- range $i, $childItem := $item.Children $.root.Doer -}}
22+
{{- template "group/sidebar/sidebar_item" dict "item" $childItem "root" $.root -}}
23+
{{- end -}}
24+
</ul>
2425
</div>
26+
</div>
2527
</li>

‎templates/group/team/teams.tmpl‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -8,72 +8,71 @@
88
<div class="eleven wide column">
99
<div class="ui two column stackable grid">
1010
{{if or .IsGroupAdmin .IsGroupOwner}}
11-
12-
<div class="one column row">
13-
<div class="column">
14-
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgGroupLink}}/teams/add"
15-
method="post">
16-
{{.CsrfTokenHtml}}
17-
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
18-
<div id="search-team-box" data-search-url="{{$.OrgLink}}/-/search_team_candidates"
19-
class="ui search tw-mr-2 tw-flex-grow">
20-
<div class="ui input fluid">
21-
<input class="prompt" name="tname" placeholder="{{ctx.Locale.Tr "search.team_kind"}}"
22-
autocomplete="off" required>
23-
</div>
11+
<div class="one column row">
12+
<div class="column">
13+
<form class="ui form ignore-dirty tw-flex tw-flex-wrap tw-gap-2" action="{{$.OrgGroupLink}}/teams/add"
14+
method="post">
15+
{{.CsrfTokenHtml}}
16+
<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
17+
<div id="search-team-box" data-search-url="{{$.OrgLink}}/-/search_team_candidates"
18+
class="ui search tw-mr-2 tw-flex-grow">
19+
<div class="ui input fluid">
20+
<input class="prompt" name="tname" placeholder="{{ctx.Locale.Tr "search.team_kind"}}"
21+
autocomplete="off" required>
2422
</div>
25-
<button class="ui primary button">{{ctx.Locale.Tr "group.teams.add"}}</button>
26-
</form>
27-
</div>
23+
</div>
24+
<button class="ui primary button">{{ctx.Locale.Tr "group.teams.add"}}</button>
25+
</form>
2826
</div>
27+
</div>
2928
{{end}}
3029
{{range .Teams}}
31-
<div class="column">
32-
<div class="ui top attached header">
33-
<a class="text black"
34-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
35-
<div class="ui right">
36-
<a class="ui primary tiny button"
37-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
30+
<div class="column">
31+
<div class="ui top attached header">
32+
<a class="text black"
33+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
34+
<div class="ui right">
35+
<a class="ui primary tiny button"
36+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
3837

39-
{{if .IsMember ctx $.SignedUser.ID}}
40-
<form>
41-
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
42-
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave"
43-
data-datauid="{{$.SignedUser.ID}}"
44-
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
45-
</form>
46-
{{else if $.IsOrganizationOwner}}
47-
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
48-
{{$.CsrfTokenHtml}}
49-
<button type="submit" class="ui primary tiny button" name="uid"
50-
value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
51-
</form>
52-
{{end}}
38+
{{if .IsMember ctx $.SignedUser.ID}}
39+
<form>
40+
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
41+
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave"
42+
data-datauid="{{$.SignedUser.ID}}"
43+
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
44+
</form>
45+
{{else if $.IsOrganizationOwner}}
46+
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
47+
{{$.CsrfTokenHtml}}
48+
<button type="submit" class="ui primary tiny button" name="uid"
49+
value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
50+
</form>
51+
{{end}}
5352

54-
{{if and (or $.IsGroupAdmin $.IsGroupOwner) (not .IsOwnerTeam)}}
55-
<form>
56-
<button class="ui red tiny button delete-button" data-modal-id="remove-team"
57-
data-url="{{$.OrgGroupLink}}/teams/{{.LowerName | PathEscape}}/remove"
58-
data-datauid="{{$.SignedUser.ID}}"
59-
data-name="{{.Name}}">{{ctx.Locale.Tr "group.teams.remove"}}</button>
60-
</form>
61-
{{end}}
62-
</div>
63-
</div>
64-
<div class="ui attached segment members">
65-
{{range .Members}}
66-
{{template "shared/user/avatarlink" dict "user" .}}
53+
{{if and (or $.IsGroupAdmin $.IsGroupOwner) (not .IsOwnerTeam)}}
54+
<form>
55+
<button class="ui red tiny button delete-button" data-modal-id="remove-team"
56+
data-url="{{$.OrgGroupLink}}/teams/{{.LowerName | PathEscape}}/remove"
57+
data-datauid="{{$.SignedUser.ID}}"
58+
data-name="{{.Name}}">{{ctx.Locale.Tr "group.teams.remove"}}</button>
59+
</form>
6760
{{end}}
6861
</div>
69-
<div class="ui bottom attached header">
70-
<p class="team-meta"><a class="muted"
71-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}}</a>
72-
· <a class="muted"
73-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories">{{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</a>
74-
</p>
75-
</div>
7662
</div>
63+
<div class="ui attached segment members">
64+
{{range .Members}}
65+
{{template "shared/user/avatarlink" dict "user" .}}
66+
{{end}}
67+
</div>
68+
<div class="ui bottom attached header">
69+
<p class="team-meta"><a class="muted"
70+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}}</a>
71+
· <a class="muted"
72+
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories">{{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</a>
73+
</p>
74+
</div>
75+
</div>
7776
{{end}}
7877
</div>
7978
</div>

‎templates/org/home.tmpl‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
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"
10-
data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
9+
<div id="readme_profile" class="render-content markup" data-profile-view-as-member="{{.IsViewingOrgAsMember}}">{{.ProfileReadmeContent}}</div>
1110
{{end}}
1211
{{template "shared/repo/search" .}}
1312
{{template "shared/repo/list" .}}
@@ -18,11 +17,9 @@
1817
<div class="ui five wide column">
1918
{{if .CanCreateOrgRepo}}
2019
<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>
20+
<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
2321
{{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>
22+
<a class="ui primary button tw-grow" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
2623
{{end}}
2724
</div>
2825
<div class="divider"></div>
@@ -56,8 +53,7 @@
5653
{{if .NumMembers}}
5754
<h4 class="ui top attached header tw-flex">
5855
<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>
56+
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
6157
</h4>
6258
<div class="ui attached segment members">
6359
{{$isMember := .IsOrganizationMember}}
@@ -72,19 +68,16 @@
7268
{{if .IsOrganizationMember}}
7369
<div class="ui top attached header tw-flex">
7470
<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>
71+
<a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
7772
</div>
7873
<div class="ui attached table segment teams">
7974
{{range .Teams}}
8075
<div class="item">
8176
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
8277
<p class="text grey">
83-
<a class="muted"
84-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}
78+
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}
8579
</a> ·
86-
<a class="muted"
87-
href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}
80+
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}
8881
</a>
8982
</p>
9083
</div>
@@ -96,7 +89,7 @@
9689
</div>
9790
{{end}}
9891
{{end}}
99-
{{end}}
92+
{{end}}
10093
</div>
10194
</div>
10295
</div>

0 commit comments

Comments
 (0)