domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 350 additions and 582 deletions
Download patch file Download diff file Expand all files Collapse all files

10
templates/user/settings/account.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings account">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings account")}}
<div class="user-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.password"}}
</h4>
@ -159,7 +156,6 @@
</form>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal" id="delete-email">
<div class="header">
@ -183,4 +179,4 @@
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

11
templates/user/settings/appearance.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
<div class="user-setting-content">
<!-- Theme -->
<h4 class="ui top attached header">
@ -170,6 +167,4 @@
</form>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

11
templates/user/settings/applications.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings applications">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings applications")}}
<div class="user-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.manage_access_token"}}
</h4>
@ -266,7 +263,6 @@
{{template "user/settings/applications_oauth2" .}}
{{end}}
</div>
</div>
<div class="ui gitea-confirm-modal delete modal" id="delete-token">
<div class="header">
@ -289,5 +285,4 @@
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

12
templates/user/settings/applications_oauth2_edit.tmpl
View file

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

1
templates/user/settings/applications_oauth2_edit_form.tmpl
View file

@ -1,5 +1,4 @@
<div class="ui container">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.locale.Tr "settings.edit_oauth2_application"}}
</h4>

14
templates/user/settings/hook_new.tmpl
View file

@ -1,10 +1,7 @@
{{template "base/head" .}}
<div class="page-content user settings new webhook">
{{template "user/settings/navbar" .}}
<div class="ui container">
<div class="twelve wide column content">
{{template "base/alert" .}}
<h4 class="ui top attached header">
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings new webhook")}}
<div class="user-setting-content">
<div class="user-setting-content">
<h4 class="ui top attached header">
{{if .PageIsSettingsHooksNew}}{{.locale.Tr "repo.settings.add_webhook"}}{{else}}{{.locale.Tr "repo.settings.update_webhook"}}{{end}}
<div class="ui right">
{{if eq .HookType "gitea"}}
@ -49,5 +46,4 @@
{{template "repo/settings/webhook/history" .}}
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

9
templates/user/settings/hooks.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div class="page-content user settings webhooks">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings webhooks")}}
<div class="user-setting-content">
{{template "repo/settings/webhook/list" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

11
templates/user/settings/keys.tmpl
View file

@ -1,12 +1,7 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings sshkeys">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings sshkeys")}}
<div class="user-setting-content">
{{template "user/settings/keys_ssh" .}}
{{template "user/settings/keys_principal" .}}
{{template "user/settings/keys_gpg" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

11
templates/user/settings/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="user-layout-right">
<div>
{{/* block: user-setting-content */}}
{{end}}
</div>
</div>
</div>
{{template "base/footer" .}}

13
templates/user/settings/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 "user/settings/navbar" .ctxData}}
<div class="twelve wide column">
{{template "base/alert" .ctxData}}
{{/* block: user-setting-content */}}
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
</div>
</div>
</div>
{{end}}

5
templates/user/settings/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 "org.settings"}}</div>
<a class="{{if .PageIsSettingsProfile}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
{{.locale.Tr "settings.profile"}}
</a>

12
templates/user/settings/organization.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings organization">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings organization")}}
<div class="user-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.orgs"}}
{{if .SignedUser.CanCreateOrganization}}
@ -39,7 +36,7 @@
{{end}}
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
<div class="header">
{{$.locale.Tr "org.members.leave"}}
@ -49,4 +46,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

9
templates/user/settings/packages.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
<div class="user-setting-content">
{{template "package/shared/cleanup_rules/list" .}}
{{template "package/shared/cargo" .}}
@ -25,4 +22,4 @@
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

10
templates/user/settings/packages_cleanup_rules_edit.tmpl
View file

@ -1,9 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings packages">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings packages")}}
<div class="user-setting-content">
{{template "package/shared/cleanup_rules/edit" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

9
templates/user/settings/packages_cleanup_rules_preview.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings packages admin">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user packages admin")}}
<div class="user-setting-content">
{{template "package/shared/cleanup_rules/preview" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

10
templates/user/settings/profile.tmpl
View file

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

11
templates/user/settings/repos.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings repos">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings repos")}}
<div class="user-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.repos"}}
</h4>
@ -127,7 +124,6 @@
{{end}}
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@ -139,4 +135,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

10
templates/user/settings/secrets.tmpl
View file

@ -1,10 +1,6 @@
{{template "base/head" .}}
<div class="page-content user settings secrets">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}}
<div class="user-setting-content">
{{template "shared/secrets/add_list" .}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

10
templates/user/settings/security/security.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings security">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings security")}}
<div class="user-setting-content">
{{template "user/settings/security/twofa" .}}
{{template "user/settings/security/webauthn" .}}
{{template "user/settings/security/accountlinks" .}}
@ -10,6 +7,5 @@
{{template "user/settings/security/openid" .}}
{{end}}
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}

10
templates/user/settings/security/twofa_enroll.tmpl
View file

@ -1,8 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content user settings twofa">
{{template "user/settings/navbar" .}}
<div class="ui container">
{{template "base/alert" .}}
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings twofa")}}
<div class="user-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "settings.twofa_enroll"}}
</h4>
@ -24,6 +21,5 @@
</form>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "user/settings/layout_footer" .}}