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

15
templates/org/settings/applications.tmpl
View File

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

12
templates/org/settings/applications_oauth2_edit.tmpl
View File

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

17
templates/org/settings/delete.tmpl
View File

@@ -1,11 +1,6 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings delete">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings delete")}}
<div class="org-setting-content">
<h4 class="ui top attached error header">
{{.locale.Tr "org.settings.delete_account"}}
</h4>
@@ -25,9 +20,6 @@
</form>
</div>
</div>
</div>
</div>
</div>
<div class="ui gitea-confirm-modal delete modal">
<div class="header">
@@ -39,4 +31,5 @@
</div>
{{template "base/modal_actions_confirm" .}}
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

16
templates/org/settings/hook_new.tmpl
View File

@@ -1,11 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings new webhook">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}}
<div class="org-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">
@@ -50,7 +44,5 @@
{{template "repo/settings/webhook/history" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

14
templates/org/settings/hooks.tmpl
View File

@@ -1,13 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}}
<div class="org-setting-content">
{{template "repo/settings/webhook/list" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

18
templates/org/settings/labels.tmpl
View File

@@ -1,10 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings labels">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="ui twelve wide column content">
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
<div class="org-setting-content">
<div class="ui grid">
<div class="left floated twelve wide column">
{{$.locale.Tr "org.settings.labels_desc" | Str2html}}
@@ -17,13 +12,8 @@
</div>
<div class="ui divider"></div>
{{template "repo/issue/labels/label_new" .}}
{{template "base/alert" .}}
{{template "repo/issue/labels/label_list" .}}
</div>
</div>
</div>
</div>
</div>
{{template "repo/issue/labels/edit_delete_label" .}}
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

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

14
templates/org/settings/layout_head.tmpl Normal file
View File

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

15
templates/org/settings/options.tmpl
View File

@@ -1,11 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings options">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}}
<div class="org-setting-content">
<h4 class="ui top attached header">
{{.locale.Tr "org.settings.options"}}
</h4>
@@ -101,7 +95,4 @@
</form>
</div>
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

15
templates/org/settings/packages.tmpl
View File

@@ -1,15 +1,6 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings packages">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "base/alert" .}}
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}}
<div class="org-setting-content">
{{template "package/shared/cleanup_rules/list" .}}
{{template "package/shared/cargo" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

15
templates/org/settings/packages_cleanup_rules_edit.tmpl
View File

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

14
templates/org/settings/packages_cleanup_rules_preview.tmpl
View File

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

14
templates/org/settings/runners.tmpl
View File

@@ -1,13 +1,5 @@
{{template "base/head" .}}
<div class="page-content organization settings runners">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
<div class="org-setting-content">
{{template "shared/actions/runner_list" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

14
templates/org/settings/runners_edit.tmpl
View File

@@ -1,13 +1,5 @@
{{template "base/head" .}}
<div class="page-content organization settings runners">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
<div class="org-setting-content">
{{template "shared/actions/runner_edit" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}

16
templates/org/settings/secrets.tmpl
View File

@@ -1,15 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content organization settings webhooks">
{{template "org/header" .}}
<div class="ui container">
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="ui twelve wide column content">
{{template "base/alert" .}}
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}}
<div class="org-setting-content">
{{template "shared/secrets/add_list" .}}
</div>
</div>
</div>
</div>
{{template "base/footer" .}}
{{template "org/settings/layout_footer" .}}