tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Change to vertical navbar layout for secondary navbar for repo/user/admin settings (#24246)

Browse Source 
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>
This commit is contained in:
Hester Gong
2023-04-23 18:21:21 +08:00
committed by GitHub
parent 476a043a5f
commit 44e0cfa96e
85 changed files with 350 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/admin/applications/list.tmpl
View File

@@ -1,14 +1,8 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
{{template "admin/navbar" .}}
<div class="ui container">
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.locale.Tr "settings.applications"}}
</h4>
{{template "user/settings/applications_oauth2_list" .}}
</div>
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.applications"}}
</h4>
{{template "user/settings/applications_oauth2_list" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/applications/oauth2_edit.tmpl
View File

@@ -1,7 +1,6 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
{{template "admin/navbar" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
<div class="admin-setting-content">
{{template "user/settings/applications_oauth2_edit_form" .}}
</div>
{{template "base/footer" .}}
{{template "user/settings/applications_oauth2_edit_form" .}}
</div>
{{template "admin/layout_footer" .}}

11
templates/admin/auth/edit.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin edit authentication">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.auths.edit"}}
</h4>
@@ -438,7 +435,6 @@
</form>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@@ -450,4 +446,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/auth/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin authentication">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.auths.auth_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
<div class="ui right">
@@ -38,5 +35,4 @@
</table>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/auth/new.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin new authentication">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.auths.new"}}
</h4>
@@ -122,5 +119,4 @@
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/config.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin config">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.config.server_config"}}
</h4>
@@ -426,5 +423,4 @@
</dl>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/dashboard.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin dashboard">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}}
<div class="admin-setting-content">
{{if .NeedUpdate}}
<div class="ui negative message flash-error">
<p>{{(.locale.Tr "admin.dashboard.new_version_hint" .RemoteVersion AppVer) | Str2html}}</p>
@@ -145,5 +142,4 @@
</dl>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/emails/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.emails.email_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
</h4>
@@ -101,5 +98,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/hook_new.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin settings new webhook">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{if .PageIsAdminDefaultHooksNew}}
{{.locale.Tr "admin.defaulthooks.add_webhook"}}
@@ -55,5 +52,4 @@
{{template "repo/settings/webhook/history" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/hooks.tmpl
View File

@@ -1,13 +1,9 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin hooks">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}}
<div class="admin-setting-content">
{{template "repo/settings/webhook/base_list" .SystemWebhooks}}
{{template "repo/settings/webhook/base_list" .DefaultWebhooks}}
{{template "repo/settings/webhook/delete_modal" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/layout_footer.tmpl Normal file
View File

@@ -0,0 +1,11 @@
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
<div class="page-content">
<div class="admin-layout-right">
<div>
{{/* block: admin-setting-content */}}
{{end}}
</div>
</div>
</div>
{{template "base/footer" .}}

13
templates/admin/layout_head.tmpl Normal file
View File

@@ -0,0 +1,13 @@
{{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
<div class="ui container stackable grid">
{{template "admin/navbar" .ctxData}}
<div class="twelve wide column">
{{template "base/alert" .ctxData}}
{{/* block: admin-setting-content */}}
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
</div>
</div>
</div>
{{end}}

14
templates/admin/monitor.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
<div class="admin-setting-content">
{{template "admin/cron" .}}
<h4 class="ui top attached header">
{{.locale.Tr "admin.monitor.queues"}}
@@ -26,7 +23,7 @@
<td>{{.Type}}</td>
<td>{{.ExemplarType}}</td>
<td>{{$sum := .NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
<td>{{$sum := .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
<td>{{$sum = .NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
<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>
</tr>
{{end}}
@@ -36,7 +33,7 @@
{{template "admin/process" .}}
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
{{.locale.Tr "admin.monitor.process.cancel"}}
@@ -47,4 +44,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

5
templates/admin/navbar.tmpl
View File

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

11
templates/admin/notice.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin notice">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})
</h4>
@@ -69,7 +66,6 @@
{{template "base/paginate" .}}
</div>
</div>
<div class="ui modal admin" id="detail-modal">
<div class="header">{{$.locale.Tr "admin.notices.view_detail_header"}}</div>
@@ -78,4 +74,5 @@
<pre></pre>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/org/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.orgs.org_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
<div class="ui right">
@@ -54,5 +51,4 @@
{{template "base/paginate" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/packages/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.packages.package_manage_panel"}} ({{.locale.Tr "admin.total" .TotalCount}},
{{.locale.Tr "admin.packages.total_size" (FileSize .TotalBlobSize)}},
@@ -78,7 +75,6 @@
{{template "base/paginate" .}}
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@@ -90,4 +86,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

15
templates/admin/queue.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.monitor.queue" .Queue.Name}}
</h4>
@@ -25,7 +22,7 @@
<td>{{.Queue.ExemplarType}}</td>
<td>{{$sum := .Queue.NumberOfWorkers}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
<td>{{if lt $sum 0}}-{{else}}{{.Queue.MaxNumberOfWorkers}}{{end}}</td>
<td>{{$sum := .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
<td>{{$sum = .Queue.NumberInQueue}}{{if lt $sum 0}}-{{else}}{{$sum}}{{end}}</td>
</tr>
</tbody>
</table>
@@ -177,10 +174,10 @@
{{.locale.Tr "admin.monitor.queue.configuration"}}
</h4>
<div class="ui attached segment">
<pre>{{.Queue.Configuration | JsonPrettyPrint}}
<pre>{{.Queue.Configuration | JsonPrettyPrint}}</pre>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
@@ -192,4 +189,4 @@
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/repo/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
<div class="ui right">
@@ -93,7 +90,6 @@
{{template "base/paginate" .}}
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@@ -107,4 +103,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/repo/unadopted.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.repos.unadopted"}}
<div class="ui right">
@@ -95,6 +92,5 @@
</div>
{{end}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

9
templates/admin/runners/base.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div class="page-content admin runners">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
<div class="admin-setting-content">
{{template "shared/actions/runner_list" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

9
templates/admin/runners/edit.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div class="page-content admin runners">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
<div class="admin-setting-content">
{{template "shared/actions/runner_edit" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/stacktrace.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin monitor">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.monitor.stacktrace"}}: {{.locale.Tr "admin.monitor.goroutines" .GoroutineCount}}
<div class="ui right">
@@ -17,7 +14,7 @@
</div>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
{{.locale.Tr "admin.monitor.process.cancel"}}
@@ -29,4 +26,4 @@
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

11
templates/admin/user/edit.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin edit user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.users.edit_account"}}
</h4>
@@ -194,7 +191,6 @@
</form>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
<div class="header">
@@ -216,4 +212,5 @@
{{template "base/modal_actions_confirm" .}}
</form>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/user/list.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.users.user_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
<div class="ui right">
@@ -109,5 +106,4 @@
{{template "base/paginate" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}

10
templates/admin/user/new.tmpl
View File

@@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content admin new user">
{{template "admin/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}}
<div class="admin-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "admin.users.new_account"}}
</h4>
@@ -90,5 +87,4 @@
</form>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "admin/layout_footer" .}}