summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorHester Gong <hestergong@gmail.com>2023-04-28 08:08:47 +0800
committerGitHub <noreply@github.com>2023-04-27 20:08:47 -0400
commit63a401ac40ce2cc19c7d0341d11d434b568653fc (patch)
tree0db5d52b2ea9645cf97a7ab6dd410727dece4a36 /templates
parent6dfc0c87ec4fc20213025d72928320222af3a785 (diff)
downloadgitea-63a401ac40ce2cc19c7d0341d11d434b568653fc.tar.gz
gitea-63a401ac40ce2cc19c7d0341d11d434b568653fc.zip
Move secrets and runners settings to actions settings (#24200)
This PR moves the secrets and runners settings to actions settings on all settings(repo,org,user,admin) levels. After this PR, if [ENABLED](https://github.com/go-gitea/gitea/blob/5e7543fcf441afb30aba6188edac754ef32b9ac3/custom/conf/app.example.ini#L2604) inside `app.ini` under `[actions]` is set to `false`, the "Actions" tab (including runners management and secrets management) will not be shown. After, the settings under actions settings for each level: 1. Admin Level "Runners Management" <img width="1437" alt="Screen Shot 2023-04-26 at 14 34 20" src="https://user-images.githubusercontent.com/17645053/234489731-15822d21-38e1-4560-8bbe-69f122376abc.png"> 2. User Level "Secrets Management" <img width="1427" alt="Screen Shot 2023-04-26 at 14 34 30" src="https://user-images.githubusercontent.com/17645053/234489795-68c9c0cb-24f8-4f09-95c6-458ab914c313.png"> 3. Repo and Organization Levels "Runners Management" and "Secrets Management" Org: <img width="1437" alt="Screen Shot 2023-04-26 at 14 35 07" src="https://user-images.githubusercontent.com/17645053/234489996-f3af5ebb-d354-46ca-9087-a0b586845281.png"> <img width="1433" alt="Screen Shot 2023-04-26 at 14 35 14" src="https://user-images.githubusercontent.com/17645053/234490004-3abf8fed-81fd-4ce2-837a-935dade1793d.png"> Repo: <img width="1419" alt="Screen Shot 2023-04-26 at 14 34 50" src="https://user-images.githubusercontent.com/17645053/234489904-80c11038-4b58-462c-9d0b-8b7cf70bc2b3.png"> <img width="1430" alt="Screen Shot 2023-04-26 at 14 34 57" src="https://user-images.githubusercontent.com/17645053/234489918-4e8d1fe2-9bcd-4d8a-96c1-238a8088d92e.png"> It also finished these tasks : - [x] rename routers function "runners" to "actions", and refactor related file names - [x] check and modify part of the runners related functions to match their name - [x] Fix backend check caused by fmt check --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/admin/actions.tmpl (renamed from templates/admin/runners/base.tmpl)4
-rw-r--r--templates/admin/navbar.tmpl11
-rw-r--r--templates/org/settings/actions.tmpl (renamed from templates/org/settings/runners.tmpl)6
-rw-r--r--templates/org/settings/navbar.tmpl17
-rw-r--r--templates/org/settings/secrets.tmpl5
-rw-r--r--templates/repo/header.tmpl4
-rw-r--r--templates/repo/settings/actions.tmpl9
-rw-r--r--templates/repo/settings/nav.tmpl2
-rw-r--r--templates/repo/settings/navbar.tmpl17
-rw-r--r--templates/repo/settings/runners.tmpl5
-rw-r--r--templates/shared/secrets/add_list.tmpl2
-rw-r--r--templates/user/settings/actions.tmpl (renamed from templates/user/settings/secrets.tmpl)4
-rw-r--r--templates/user/settings/navbar.tmpl13
13 files changed, 64 insertions, 35 deletions
diff --git a/templates/admin/runners/base.tmpl b/templates/admin/actions.tmpl
index 36495b6a0b..9640e0fd1f 100644
--- a/templates/admin/runners/base.tmpl
+++ b/templates/admin/actions.tmpl
@@ -1,5 +1,7 @@
-{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}}
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin actions")}}
<div class="admin-setting-content">
+ {{if eq .PageType "runners"}}
{{template "shared/actions/runner_list" .}}
+ {{end}}
</div>
{{template "admin/layout_footer" .}}
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl
index e8eb54e58d..51a93bacd7 100644
--- a/templates/admin/navbar.tmpl
+++ b/templates/admin/navbar.tmpl
@@ -35,9 +35,14 @@
</a>
{{end}}
{{if .EnableActions}}
- <a class="{{if .PageIsAdminRunners}}active {{end}}item" href="{{AppSubUrl}}/admin/runners">
- {{.locale.Tr "actions.runners"}}
- </a>
+ <div class="item">
+ {{.locale.Tr "actions.actions"}}
+ <div class="menu">
+ <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{AppSubUrl}}/admin/actions/runners">
+ {{.locale.Tr "actions.runners"}}
+ </a>
+ </div>
+ </div>
{{end}}
<a class="{{if .PageIsAdminConfig}}active {{end}}item" href="{{AppSubUrl}}/admin/config">
{{.locale.Tr "admin.config"}}
diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/actions.tmpl
index 86cb1bcd78..b3b24e0517 100644
--- a/templates/org/settings/runners.tmpl
+++ b/templates/org/settings/actions.tmpl
@@ -1,5 +1,9 @@
-{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}}
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}}
<div class="org-setting-content">
+ {{if eq .PageType "runners"}}
{{template "shared/actions/runner_list" .}}
+ {{else if eq .PageType "secrets"}}
+ {{template "shared/secrets/add_list" .}}
+ {{end}}
</div>
{{template "org/settings/layout_footer" .}}
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 7380deff77..fcce43f914 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -12,9 +12,6 @@
<a class="{{if .PageIsOrgSettingsLabels}}active {{end}}item" href="{{.OrgLink}}/settings/labels">
{{.locale.Tr "repo.labels"}}
</a>
- <a class="{{if .PageIsOrgSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/secrets">
- {{.locale.Tr "secrets.secrets"}}
- </a>
{{if .EnableOAuth2}}
<a class="{{if .PageIsSettingsApplications}}active {{end}}item" href="{{.OrgLink}}/settings/applications">
{{.locale.Tr "settings.applications"}}
@@ -26,9 +23,17 @@
</a>
{{end}}
{{if .EnableActions}}
- <a class="{{if .PageIsOrgSettingsRunners}}active {{end}}item" href="{{.OrgLink}}/settings/runners">
- {{.locale.Tr "actions.runners"}}
- </a>
+ <div class="item">
+ {{.locale.Tr "actions.actions"}}
+ <div class="menu">
+ <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{.OrgLink}}/settings/actions/runners">
+ {{.locale.Tr "actions.runners"}}
+ </a>
+ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/actions/secrets">
+ {{.locale.Tr "secrets.secrets"}}
+ </a>
+ </div>
+ </div>
{{end}}
<a class="{{if .PageIsSettingsDelete}}active {{end}}item" href="{{.OrgLink}}/settings/delete">
{{.locale.Tr "org.settings.delete"}}
diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl
deleted file mode 100644
index 68ce415f41..0000000000
--- a/templates/org/settings/secrets.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}}
- <div class="org-setting-content">
- {{template "shared/secrets/add_list" .}}
- </div>
-{{template "org/settings/layout_footer" .}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 8a6833f499..9b3b2ce794 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -237,7 +237,7 @@
{{if .Permission.IsAdmin}}
<div class="right menu">
- <a class="{{if .PageIsSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
+ <a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
</a>
</div>
@@ -246,7 +246,7 @@
{{else if .Permission.IsAdmin}}
<div class="ui tabular stackable menu navbar">
<div class="right menu">
- <a class="{{if .PageIsSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
+ <a class="{{if .PageIsRepoSettings}}active {{end}}item" href="{{.RepoLink}}/settings">
{{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
</a>
</div>
diff --git a/templates/repo/settings/actions.tmpl b/templates/repo/settings/actions.tmpl
new file mode 100644
index 0000000000..72944234a3
--- /dev/null
+++ b/templates/repo/settings/actions.tmpl
@@ -0,0 +1,9 @@
+{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings actions")}}
+ <div class="repo-setting-content">
+ {{if eq .PageType "runners"}}
+ {{template "shared/actions/runner_list" .}}
+ {{else if eq .PageType "secrets"}}
+ {{template "shared/secrets/add_list" .}}
+ {{end}}
+ </div>
+{{template "repo/settings/layout_footer" .}}
diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl
index 3156d9b159..4a88d69adf 100644
--- a/templates/repo/settings/nav.tmpl
+++ b/templates/repo/settings/nav.tmpl
@@ -13,7 +13,7 @@
<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li>
{{end}}
<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li>
- <li {{if .PageIsSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li>
+ <li {{if .PageIsSharedSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li>
</ul>
</div>
</div>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 081d0c474e..b1beda7c94 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -28,18 +28,23 @@
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{.RepoLink}}/settings/keys">
{{.locale.Tr "repo.settings.deploy_keys"}}
</a>
- <a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/secrets">
- {{.locale.Tr "secrets.secrets"}}
- </a>
{{if .LFSStartServer}}
<a class="{{if .PageIsSettingsLFS}}active {{end}}item" href="{{.RepoLink}}/settings/lfs">
{{.locale.Tr "repo.settings.lfs"}}
</a>
{{end}}
{{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
- <a class="{{if .PageIsSettingsRunners}}active {{end}}item" href="{{.RepoLink}}/settings/runners">
- {{.locale.Tr "actions.runners"}}
- </a>
+ <div class="item">
+ {{.locale.Tr "actions.actions"}}
+ <div class="menu">
+ <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{.RepoLink}}/settings/actions/runners">
+ {{.locale.Tr "actions.runners"}}
+ </a>
+ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/actions/secrets">
+ {{.locale.Tr "secrets.secrets"}}
+ </a>
+ </div>
+ </div>
{{end}}
</div>
</div>
diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/runners.tmpl
deleted file mode 100644
index ab3ad40400..0000000000
--- a/templates/repo/settings/runners.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
- <div class="repo-setting-content">
- {{template "shared/actions/runner_list" .}}
- </div>
-{{template "repo/settings/layout_footer" .}}
diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl
index e56ace8fc6..e743c16f95 100644
--- a/templates/shared/secrets/add_list.tmpl
+++ b/templates/shared/secrets/add_list.tmpl
@@ -1,5 +1,5 @@
<h4 class="ui top attached header">
- {{.locale.Tr "secrets.secrets"}}
+ {{.locale.Tr "secrets.management"}}
<div class="ui right">
<button class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "secrets.creation"}}</button>
</div>
diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/actions.tmpl
index a831453f2a..4d56523587 100644
--- a/templates/user/settings/secrets.tmpl
+++ b/templates/user/settings/actions.tmpl
@@ -1,6 +1,8 @@
-{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}}
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings actions")}}
<div class="user-setting-content">
+ {{if eq .PageType "secrets"}}
{{template "shared/secrets/add_list" .}}
+ {{end}}
</div>
{{template "user/settings/layout_footer" .}}
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
index 27ec73c34f..b79308419b 100644
--- a/templates/user/settings/navbar.tmpl
+++ b/templates/user/settings/navbar.tmpl
@@ -19,9 +19,16 @@
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{AppSubUrl}}/user/settings/keys">
{{.locale.Tr "settings.ssh_gpg_keys"}}
</a>
- <a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/secrets">
- {{.locale.Tr "secrets.secrets"}}
- </a>
+ {{if .EnableActions}}
+ <div class="item">
+ {{.locale.Tr "actions.actions"}}
+ <div class="menu">
+ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/actions/secrets">
+ {{.locale.Tr "secrets.secrets"}}
+ </a>
+ </div>
+ </div>
+ {{end}}
{{if .EnablePackages}}
<a class="{{if .PageIsSettingsPackages}}active {{end}}item" href="{{AppSubUrl}}/user/settings/packages">
{{.locale.Tr "packages.title"}}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 20:26:46 +0000