Skip to content

Commit 44e0cfa

Browse files
HesterGwxiaoguang
HesterG
and
wxiaoguang
authored
Change to vertical navbar layout for secondary navbar for repo/user/admin settings (#24246)
Co-Author: @wxiaoguang This is the first step of #24229. And this PR will only includes html changes, and followed by other PRs that fine tune css and change to submenus. After: Admin Level <img width="1400" alt="Screen Shot 2023-04-21 at 10 07 16" src="https://user-images.githubusercontent.com/17645053/233523870-f848b61d-056a-4b41-9760-a9a49fea1fe8.png"> User Level <img width="1422" alt="Screen Shot 2023-04-21 at 10 07 23" src="https://user-images.githubusercontent.com/17645053/233523878-979adb20-a657-43d9-99a6-ad414010c0ef.png"> Repo Level <img width="1404" alt="Screen Shot 2023-04-21 at 10 07 07" src="https://user-images.githubusercontent.com/17645053/233523863-337440bd-c03a-4dfd-87fa-cef40300bfe0.png"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent 476a043 commit 44e0cfa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+350
-582
lines changed

‎templates/admin/applications/list.tmpl

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
<div class="twelve wide column content">
6-
{{template "base/alert" .}}
7-
<h4 class="ui top attached header">
8-
{{.locale.Tr "settings.applications"}}
9-
</h4>
10-
{{template "user/settings/applications_oauth2_list" .}}
11-
</div>
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
2+
<div class="admin-setting-content">
3+
<h4 class="ui top attached header">
4+
{{.locale.Tr "settings.applications"}}
5+
</h4>
6+
{{template "user/settings/applications_oauth2_list" .}}
127
</div>
13-
</div>
14-
{{template "base/footer" .}}
8+
{{template "admin/layout_footer" .}}

‎templates/admin/applications/oauth2_edit.tmpl

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
3-
{{template "admin/navbar" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
2+
<div class="admin-setting-content">
43

5-
{{template "user/settings/applications_oauth2_edit_form" .}}
6-
</div>
7-
{{template "base/footer" .}}
4+
{{template "user/settings/applications_oauth2_edit_form" .}}
5+
</div>
6+
{{template "admin/layout_footer" .}}

‎templates/admin/auth/edit.tmpl

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.auths.edit"}}
85
</h4>
@@ -438,7 +435,6 @@
438435
</form>
439436
</div>
440437
</div>
441-
</div>
442438

443439
<div class="ui gitea-confirm-modal delete modal">
444440
<div class="header">
@@ -450,4 +446,5 @@
450446
</div>
451447
{{template "base/modal_actions_confirm" .}}
452448
</div>
453-
{{template "base/footer" .}}
449+
450+
{{template "admin/layout_footer" .}}

‎templates/admin/auth/list.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
85
<div class="ui right">
@@ -38,5 +35,4 @@
3835
</table>
3936
</div>
4037
</div>
41-
</div>
42-
{{template "base/footer" .}}
38+
{{template "admin/layout_footer" .}}

‎templates/admin/auth/new.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.auths.new"}}
85
</h4>
@@ -122,5 +119,4 @@
122119
</div>
123120
</div>
124121
</div>
125-
</div>
126-
{{template "base/footer" .}}
122+
{{template "admin/layout_footer" .}}

‎templates/admin/config.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.config.server_config"}}
85
</h4>
@@ -426,5 +423,4 @@
426423
</dl>
427424
</div>
428425
</div>
429-
</div>
430-
{{template "base/footer" .}}
426+
{{template "admin/layout_footer" .}}

‎templates/admin/dashboard.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
2+
<div class="admin-setting-content">
63
{{if .NeedUpdate}}
74
<div class="ui negative message flash-error">
85
<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
@@ -145,5 +142,4 @@
145142
</dl>
146143
</div>
147144
</div>
148-
</div>
149-
{{template "base/footer" .}}
145+
{{template "admin/layout_footer" .}}

‎templates/admin/emails/list.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
85
</h4>
@@ -101,5 +98,4 @@
10198
</div>
10299

103100
</div>
104-
</div>
105-
{{template "base/footer" .}}
101+
{{template "admin/layout_footer" .}}

‎templates/admin/hook_new.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{if .PageIsAdminDefaultHooksNew}}
85
{{.locale.Tr "admin.defaulthooks.add_webhook"}}
@@ -55,5 +52,4 @@
5552

5653
{{template "repo/settings/webhook/history" .}}
5754
</div>
58-
</div>
59-
{{template "base/footer" .}}
55+
{{template "admin/layout_footer" .}}

‎templates/admin/hooks.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
2+
<div class="admin-setting-content">
63

74
{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
85
{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
96

107
{{template "repo/settings/webhook/delete_modal" .}}
118
</div>
12-
</div>
13-
{{template "base/footer" .}}
9+
{{template "admin/layout_footer" .}}

‎templates/admin/layout_footer.tmpl

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
2+
<div class="page-content">
3+
<div class="admin-layout-right">
4+
<div>
5+
{{/* block: admin-setting-content */}}
6+
{{end}}
7+
8+
</div>
9+
</div>
10+
</div>
11+
{{template "base/footer" .}}

‎templates/admin/layout_head.tmpl

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{template "base/head" .ctxData}}
2+
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
3+
<div class="ui container stackable grid">
4+
{{template "admin/navbar" .ctxData}}
5+
<div class="twelve wide column">
6+
{{template "base/alert" .ctxData}}
7+
{{/* block: admin-setting-content */}}
8+
9+
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
10+
</div>
11+
</div>
12+
</div>
13+
{{end}}

‎templates/admin/monitor.tmpl

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
2+
<div class="admin-setting-content">
63
{{template "admin/cron" .}}
74
<h4 class="ui top attached header">
85
{{.locale.Tr "admin.monitor.queues"}}
@@ -26,7 +23,7 @@
2623
<td>{{.Type}}</td>
2724
<td>{{.ExemplarType}}</td>
2825
<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
29-
<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
26+
<td>{{$sum = .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
3027
<td><a href="{{$.Link}}/queue/{{.QID}}" class="button">{{if lt $sum 0}}{{$.locale.Tr "admin.monitor.queue.review"}}{{else}}{{$.locale.Tr "admin.monitor.queue.review_add"}}{{end}}</a>
3128
</tr>
3229
{{end}}
@@ -36,7 +33,7 @@
3633

3734
{{template "admin/process" .}}
3835
</div>
39-
</div>
36+
4037
<div class="ui gitea-confirm-modal delete modal">
4138
<div class="header">
4239
{{.locale.Tr "admin.monitor.process.cancel"}}
@@ -47,4 +44,5 @@
4744
</div>
4845
{{template "base/modal_actions_confirm" .}}
4946
</div>
50-
{{template "base/footer" .}}
47+
48+
{{template "admin/layout_footer" .}}

‎templates/admin/navbar.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<div class="ui secondary pointing tabular top attached borderless menu stackable new-menu navbar">
2-
<div class="new-menu-inner">
1+
<div class="four wide column">
2+
<div class="ui fluid vertical menu">
3+
<div class="header item">{{.locale.Tr "settings"}}</div>
34
<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
45
{{.locale.Tr "admin.dashboard"}}
56
</a>

‎templates/admin/notice.tmpl

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin notice">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
85
</h4>
@@ -69,7 +66,6 @@
6966

7067
{{template "base/paginate" .}}
7168
</div>
72-
</div>
7369

7470
<div class="ui modal admin" id="detail-modal">
7571
<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
@@ -78,4 +74,5 @@
7874
<pre></pre>
7975
</div>
8076
</div>
81-
{{template "base/footer" .}}
77+
78+
{{template "admin/layout_footer" .}}

‎templates/admin/org/list.tmpl

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
85
<div class="ui right">
@@ -54,5 +51,4 @@
5451

5552
{{template "base/paginate" .}}
5653
</div>
57-
</div>
58-
{{template "base/footer" .}}
54+
{{template "admin/layout_footer" .}}

‎templates/admin/packages/list.tmpl

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
85
{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
@@ -78,7 +75,6 @@
7875

7976
{{template "base/paginate" .}}
8077
</div>
81-
</div>
8278

8379
<div class="ui gitea-confirm-modal delete modal">
8480
<div class="header">
@@ -90,4 +86,5 @@
9086
</div>
9187
{{template "base/modal_actions_confirm" .}}
9288
</div>
93-
{{template "base/footer" .}}
89+
90+
{{template "admin/layout_footer" .}}

‎templates/admin/queue.tmpl

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
85
</h4>
@@ -25,7 +22,7 @@
2522
<td>{{.Queue.ExemplarType}}</td>
2623
<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
2724
<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
28-
<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
25+
<td>{{$sum = .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
2926
</tr>
3027
</tbody>
3128
</table>
@@ -177,10 +174,10 @@
177174
{{.locale.Tr "admin.monitor.queue.configuration"}}
178175
</h4>
179176
<div class="ui attached segment">
180-
<pre>{{.Queue.Configuration | JsonPrettyPrint}}
177+
<pre>{{.Queue.Configuration | JsonPrettyPrint}}</pre>
181178
</div>
182179
</div>
183-
</div>
180+
184181
<div class="ui gitea-confirm-modal delete modal">
185182
<div class="header">
186183
{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
@@ -192,4 +189,4 @@
192189
{{template "base/modal_actions_confirm" .}}
193190
</div>
194191

195-
{{template "base/footer" .}}
192+
{{template "admin/layout_footer" .}}

‎templates/admin/repo/list.tmpl

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
3-
{{template "admin/navbar" .}}
4-
<div class="ui container">
5-
{{template "base/alert" .}}
1+
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
2+
<div class="admin-setting-content">
63
<h4 class="ui top attached header">
74
{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
85
<div class="ui right">
@@ -93,7 +90,6 @@
9390

9491
{{template "base/paginate" .}}
9592
</div>
96-
</div>
9793

9894
<div class="ui gitea-confirm-modal delete modal">
9995
<div class="header">
@@ -107,4 +103,5 @@
107103
</div>
108104
{{template "base/modal_actions_confirm" .}}
109105
</div>
110-
{{template "base/footer" .}}
106+
107+
{{template "admin/layout_footer" .}}

0 commit comments

Comments
 (0)