diff options
| author | Hester Gong <hestergong@gmail.com> | 2023-04-28 08:08:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 20:08:47 -0400 |
| commit | 63a401ac40ce2cc19c7d0341d11d434b568653fc (patch) | |
| tree | 0db5d52b2ea9645cf97a7ab6dd410727dece4a36 /templates/org | |
| parent | 6dfc0c87ec4fc20213025d72928320222af3a785 (diff) | |
| download | gitea-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/org')
| -rw-r--r-- | templates/org/settings/actions.tmpl (renamed from templates/org/settings/runners.tmpl) | 6 | ||||
| -rw-r--r-- | templates/org/settings/navbar.tmpl | 17 | ||||
| -rw-r--r-- | templates/org/settings/secrets.tmpl | 5 |
3 files changed, 16 insertions, 12 deletions
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" .}} |