diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 93e6f3c274..3a0ff06f72 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3659,10 +3659,7 @@ require_action.creation.failed = Create Global Require Action %s Failed. require_action.creation.success = Create Global Require Action %s successfully. require_action.deletion = Delete require_action.deletion.description = Removing the Global Require Action is permanent and cannot be undone. Continue? -require_action.deletion.success = The Global Require Action has been removed. - - - +require_action.deletion.success = The Global Require Action has been removed. workflow.disable = Disable Workflow workflow.disable_success = Workflow '%s' disabled successfully. diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index d89a4c860a..155cb07888 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -1,8 +1,8 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}}
- {{if eq .PageType "require_action"}} - {{template "shared/actions/require_action_list" .}} - {{else if eq .PageType "runners"}} + {{if eq .PageType "require_action"}} + {{template "shared/actions/require_action_list" .}} + {{else if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} {{else if eq .PageType "secrets"}} {{template "shared/secrets/add_list" .}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 7ee058dbee..0151af7899 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -29,9 +29,9 @@
{{ctx.Locale.Tr "actions.actions"}} @@ -68,10 +68,10 @@
- - + + {{if .AllowDisableOrEnableWorkflow}} {{end}} diff --git a/templates/shared/actions/require_action_list.tmpl b/templates/shared/actions/require_action_list.tmpl index e845d7fd39..99642eb62d 100644 --- a/templates/shared/actions/require_action_list.tmpl +++ b/templates/shared/actions/require_action_list.tmpl @@ -1,145 +1,145 @@
-

- {{ctx.Locale.Tr "actions.require_action.require_action_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) -
-
- -
-
-

-
-
- - {{template "shared/search/combo" dict "Value" .Keyword}} - -
-
-
- - - - - - - - - - - - {{if .RequireActions}} - {{range .RequireActions}} - - - - - - - - {{end}} - {{else}} - - - - {{end}} - -
- {{ctx.Locale.Tr "actions.require_action.id"}} - - {{ctx.Locale.Tr "actions.require_action.workflow"}} - {{ctx.Locale.Tr "actions.require_action.repo"}}{{ctx.Locale.Tr "actions.require_action.link"}}{{ctx.Locale.Tr "actions.require_action.remove"}}
{{.ID}}

{{.WorkflowName}}

{{.RepoName}}Workflow Link - {{if .Removable $.OrgID}} - - - {{end}} -
{{ctx.Locale.Tr "actions.require_action.none"}}
-
- {{template "base/paginate"}} +

+ {{ctx.Locale.Tr "actions.require_action.require_action_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) +
+
+ +
+
+

+
+
+ + {{template "shared/search/combo" dict "Value" .Keyword}} + +
+
+
+ + + + + + + + + + + + {{if .RequireActions}} + {{range .RequireActions}} + + + + + + + + {{end}} + {{else}} + + + + {{end}} + +
+ {{ctx.Locale.Tr "actions.require_action.id"}} + + {{ctx.Locale.Tr "actions.require_action.workflow"}} + {{ctx.Locale.Tr "actions.require_action.repo"}}{{ctx.Locale.Tr "actions.require_action.link"}}{{ctx.Locale.Tr "actions.require_action.remove"}}
{{.ID}}

{{.WorkflowName}}

{{.RepoName}}Workflow Link + {{if .Removable $.OrgID}} + + + {{end}} +
{{ctx.Locale.Tr "actions.require_action.none"}}
+
+ {{template "base/paginate"}}
{{/* Add RequireAction dialog */}}