Skip to content

Commit 6403812

Browse files
CL-JeremyCL-Jeremy
committed
More organization rework, migrate to new-menu
1 parent 8213af5 commit 6403812

15 files changed

+320
-314
lines changed

‎templates/org/header.tmpl

+25-22
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
{{with .Org}}
22
<div class="header-wrapper">
33
<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">
4+
<div class="org-header fw sb">
5+
<div class="org-info-wrap df ab">
6+
{{avatar . 100 "org-avatar"}}
7+
<div id="org-info">
8+
<div class="ui header">
9+
{{if $.PageIsUserProfile}}{{.DisplayName}}{{else}}<a href="{{.HomeLink}}">{{.DisplayName}}</a>{{end}}
10+
{{- /* begin blocked block */ -}}
11+
{{- if (or $.PageIsUserProfile (or $.PageIsOrgMembers $.PageIsOrgTeams)) -}}
12+
<div class="labels dif fw ac vm ml-3">
13+
{{template "org/visibility_label" dict "root" $ "org" . "size" "large"}}
14+
{{if $.IsOrganizationOwner}}
15+
<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">
16+
{{svg "octicon-tools"}}
17+
</a>
18+
{{end}}
19+
</div>
20+
{{- else -}}
21+
{{- /* end blocked block */ -}}
22+
<div class="text grey thin di mx-2">/</div><span class="text grey thin dib mr-2">{{$.i18n.Tr "org.settings"}}</span>
23+
{{end}}
24+
</div>
825
{{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}}
26+
{{if $.RenderedDescription}}<div class="render-content markdown desc">{{$.RenderedDescription|Str2html}}</div>{{end}}
27+
<div class="text grey meta">
28+
{{if .Location}}<div class="item">{{svg "octicon-location"}} <span>{{.Location}}</span></div>{{end}}
29+
{{if .Website}}<div class="item word-break">{{svg "octicon-link"}} <a target="_blank" rel="noopener noreferrer" href="{{.Website}}">{{.Website}}</a></div>{{end}}
1730
</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>
2031
{{end}}
2132
</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}}
2933
</div>
30-
3134
{{if not $.PageIsUserProfile}}
3235
<div class="ui menu">
3336
<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">

‎templates/org/member/members.tmpl

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{template "base/head" .}}
22
<div class="page-content organization members">
33
{{template "org/header" .}}
4+
<div class="ui divider mt-0"></div>
45
<div class="ui container">
56
{{template "base/alert" .}}
67

‎templates/org/settings/delete.tmpl

+19-23
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
{{template "base/head" .}}
22
<div class="page-content organization settings delete">
33
{{template "org/header" .}}
4+
{{template "org/settings/navbar" .}}
45
<div class="ui container">
5-
<div class="ui grid">
6-
{{template "org/settings/navbar" .}}
7-
<div class="twelve wide column content">
8-
{{template "base/alert" .}}
9-
<h4 class="ui top attached error header">
10-
{{.i18n.Tr "org.settings.delete_account"}}
11-
</h4>
12-
<div class="ui attached error segment">
13-
<div class="ui red message">
14-
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
15-
</div>
16-
<form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post">
17-
{{.CsrfTokenHtml}}
18-
<input class="fake" type="password">
19-
<div class="inline required field {{if .Err_Password}}error{{end}}">
20-
<label for="password">{{.i18n.Tr "password"}}</label>
21-
<input id="password" name="password" type="password" autocomplete="off" autofocus required>
22-
</div>
23-
<div class="ui red button delete-button" data-type="form" data-form="#delete-form">
24-
{{.i18n.Tr "org.settings.confirm_delete_account"}}
25-
</div>
26-
</form>
27-
</div>
6+
{{template "base/alert" .}}
7+
<h4 class="ui top attached error header">
8+
{{.i18n.Tr "org.settings.delete_account"}}
9+
</h4>
10+
<div class="ui attached error segment">
11+
<div class="ui red message">
12+
<p class="text left">{{svg "octicon-alert"}} {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
2813
</div>
14+
<form class="ui form ignore-dirty" id="delete-form" action="{{.Link}}" method="post">
15+
{{.CsrfTokenHtml}}
16+
<input class="fake" type="password">
17+
<div class="inline required field {{if .Err_Password}}error{{end}}">
18+
<label for="password">{{.i18n.Tr "password"}}</label>
19+
<input id="password" name="password" type="password" autocomplete="off" autofocus required>
20+
</div>
21+
<div class="ui red button delete-button" data-type="form" data-form="#delete-form">
22+
{{.i18n.Tr "org.settings.confirm_delete_account"}}
23+
</div>
24+
</form>
2925
</div>
3026
</div>
3127
</div>

‎templates/org/settings/hook_new.tmpl

+37-41
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,46 @@
11
{{template "base/head" .}}
22
<div class="page-content organization settings new webhook">
33
{{template "org/header" .}}
4+
{{template "org/settings/navbar" .}}
45
<div class="ui container">
5-
<div class="ui grid">
6-
{{template "org/settings/navbar" .}}
7-
<div class="twelve wide column content">
8-
{{template "base/alert" .}}
9-
<h4 class="ui top attached header">
10-
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
11-
<div class="ui right">
12-
{{if eq .HookType "gitea"}}
13-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
14-
{{else if eq .HookType "gogs"}}
15-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
16-
{{else if eq .HookType "slack"}}
17-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png">
18-
{{else if eq .HookType "discord"}}
19-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png">
20-
{{else if eq .HookType "dingtalk"}}
21-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.png">
22-
{{else if eq .HookType "telegram"}}
23-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png">
24-
{{else if eq .HookType "msteams"}}
25-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png">
26-
{{else if eq .HookType "feishu"}}
27-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png">
28-
{{else if eq .HookType "matrix"}}
29-
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg">
30-
{{end}}
31-
</div>
32-
</h4>
33-
<div class="ui attached segment">
34-
{{template "repo/settings/webhook/gitea" .}}
35-
{{template "repo/settings/webhook/gogs" .}}
36-
{{template "repo/settings/webhook/slack" .}}
37-
{{template "repo/settings/webhook/discord" .}}
38-
{{template "repo/settings/webhook/dingtalk" .}}
39-
{{template "repo/settings/webhook/telegram" .}}
40-
{{template "repo/settings/webhook/msteams" .}}
41-
{{template "repo/settings/webhook/feishu" .}}
42-
{{template "repo/settings/webhook/matrix" .}}
43-
</div>
44-
45-
{{template "repo/settings/webhook/history" .}}
6+
{{template "base/alert" .}}
7+
<h4 class="ui top attached header">
8+
{{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
9+
<div class="ui right">
10+
{{if eq .HookType "gitea"}}
11+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg">
12+
{{else if eq .HookType "gogs"}}
13+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico">
14+
{{else if eq .HookType "slack"}}
15+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png">
16+
{{else if eq .HookType "discord"}}
17+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png">
18+
{{else if eq .HookType "dingtalk"}}
19+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.png">
20+
{{else if eq .HookType "telegram"}}
21+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png">
22+
{{else if eq .HookType "msteams"}}
23+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png">
24+
{{else if eq .HookType "feishu"}}
25+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png">
26+
{{else if eq .HookType "matrix"}}
27+
<img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg">
28+
{{end}}
4629
</div>
30+
</h4>
31+
<div class="ui attached segment">
32+
{{template "repo/settings/webhook/gitea" .}}
33+
{{template "repo/settings/webhook/gogs" .}}
34+
{{template "repo/settings/webhook/slack" .}}
35+
{{template "repo/settings/webhook/discord" .}}
36+
{{template "repo/settings/webhook/dingtalk" .}}
37+
{{template "repo/settings/webhook/telegram" .}}
38+
{{template "repo/settings/webhook/msteams" .}}
39+
{{template "repo/settings/webhook/feishu" .}}
40+
{{template "repo/settings/webhook/matrix" .}}
4741
</div>
42+
43+
{{template "repo/settings/webhook/history" .}}
4844
</div>
4945
</div>
5046
{{template "base/footer" .}}

‎templates/org/settings/hooks.tmpl

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{{template "base/head" .}}
22
<div class="page-content organization settings webhooks">
33
{{template "org/header" .}}
4+
{{template "org/settings/navbar" .}}
45
<div class="ui container">
5-
<div class="ui grid">
6-
{{template "org/settings/navbar" .}}
7-
<div class="twelve wide column content">
8-
{{template "repo/settings/webhook/list" .}}
9-
</div>
10-
</div>
6+
{{template "repo/settings/webhook/list" .}}
117
</div>
128
</div>
139
{{template "base/footer" .}}

‎templates/org/settings/labels.tmpl

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
{{template "base/head" .}}
22
<div class="page-content organization settings labels">
33
{{template "org/header" .}}
4+
{{template "org/settings/navbar" .}}
45
<div class="ui container">
56
<div class="ui grid">
6-
{{template "org/settings/navbar" .}}
7-
<div class="ui twelve wide column content">
8-
<div class="ui grid">
9-
<div class="left floated twelve wide column">
10-
{{$.i18n.Tr "org.settings.labels_desc" | Str2html}}
11-
</div>
12-
<div class="right floated three wide column">
13-
<div class="ui right">
14-
<div class="ui green new-label button">{{.i18n.Tr "repo.issues.new_label"}}</div>
15-
</div>
16-
</div>
17-
</div>
18-
<div class="ui divider"></div>
19-
{{template "repo/issue/labels/label_new" .}}
20-
{{template "base/alert" .}}
21-
{{template "repo/issue/labels/label_list" .}}
7+
<div class="left floated twelve wide column">
8+
{{$.i18n.Tr "org.settings.labels_desc" | Str2html}}
9+
</div>
10+
<div class="right floated three wide column">
11+
<div class="ui right">
12+
<div class="ui green new-label button">{{.i18n.Tr "repo.issues.new_label"}}</div>
2213
</div>
23-
</div>
14+
</div>
2415
</div>
16+
<div class="ui divider"></div>
17+
{{template "repo/issue/labels/label_new" .}}
18+
{{template "base/alert" .}}
19+
{{template "repo/issue/labels/label_list" .}}
2520
</div>
2621
</div>
2722

‎templates/org/settings/navbar.tmpl

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<div class="four wide column">
2-
<div class="ui vertical menu">
3-
<div class="header item">{{.i18n.Tr "org.settings"}}</div>
1+
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
2+
<div class="new-menu-inner">
43
<a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings">
54
{{.i18n.Tr "org.settings.options"}}
65
</a>

0 commit comments

Comments
 (0)