diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 597863d73b1..1bddb674c03 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin actions")}} +{{template "admin/layout_head" (dict "pageClass" "admin actions")}}
{{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl index cbb66b16053..efc4e6e0df8 100644 --- a/templates/admin/applications/list.tmpl +++ b/templates/admin/applications/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}

{{ctx.Locale.Tr "settings.applications"}} diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl index 668bfe06334..34ae0bf4bfb 100644 --- a/templates/admin/applications/oauth2_edit.tmpl +++ b/templates/admin/applications/oauth2_edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}
{{template "user/settings/applications_oauth2_edit_form" .}} diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 60480ce82f7..40f19667b3c 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit authentication")}}

{{ctx.Locale.Tr "admin.auths.edit"}} diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 7296e955584..17795880ea5 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin authentication")}}

{{ctx.Locale.Tr "admin.auths.auth_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 256f648c6a2..6bc273c80df 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new authentication")}} +{{template "admin/layout_head" (dict "pageClass" "admin new authentication")}}

{{ctx.Locale.Tr "admin.auths.new"}} diff --git a/templates/admin/badge/edit.tmpl b/templates/admin/badge/edit.tmpl index f2cdc4ad443..582ba60cd65 100644 --- a/templates/admin/badge/edit.tmpl +++ b/templates/admin/badge/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit badge")}}

{{ctx.Locale.Tr "admin.badges.edit_badge"}} diff --git a/templates/admin/badge/list.tmpl b/templates/admin/badge/list.tmpl index 3020b7b25a1..691bc44811f 100644 --- a/templates/admin/badge/list.tmpl +++ b/templates/admin/badge/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin badge")}}

{{ctx.Locale.Tr "admin.badges.badges_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/badge/new.tmpl b/templates/admin/badge/new.tmpl index 5b67bed3146..0c64c39608c 100644 --- a/templates/admin/badge/new.tmpl +++ b/templates/admin/badge/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin new badge")}}

{{ctx.Locale.Tr "admin.badges.new_badge"}} diff --git a/templates/admin/badge/users.tmpl b/templates/admin/badge/users.tmpl index 711110ca68a..89d25973106 100644 --- a/templates/admin/badge/users.tmpl +++ b/templates/admin/badge/users.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin badge")}} +{{template "admin/layout_head" (dict "pageClass" "admin badge")}}

{{.Title}} diff --git a/templates/admin/badge/view.tmpl b/templates/admin/badge/view.tmpl index cbe5c7b7102..26d3d8dbe63 100644 --- a/templates/admin/badge/view.tmpl +++ b/templates/admin/badge/view.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" .)}} +{{template "admin/layout_head" (dict)}}
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index c381c5bf1d0..ae37950fb51 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "pageClass" "admin config")}}

{{ctx.Locale.Tr "admin.config.server_config"}} diff --git a/templates/admin/config_settings/config_settings.tmpl b/templates/admin/config_settings/config_settings.tmpl index 6d1db4f89fd..b12c2dc395b 100644 --- a/templates/admin/config_settings/config_settings.tmpl +++ b/templates/admin/config_settings/config_settings.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config" "dataGlobalInit" "initAdminConfigSettings")}} +{{template "admin/layout_head" (dict "pageClass" "admin config" "dataGlobalInit" "initAdminConfigSettings")}} {{template "admin/config_settings/avatars" .}} {{template "admin/config_settings/repository" .}} diff --git a/templates/admin/cron.tmpl b/templates/admin/cron.tmpl index 8e44614d97a..457cdd52123 100644 --- a/templates/admin/cron.tmpl +++ b/templates/admin/cron.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

{{ctx.Locale.Tr "admin.monitor.cron"}} diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index f44dc243622..059ddd3c7e5 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin dashboard")}} +{{template "admin/layout_head" (dict "pageClass" "admin dashboard")}}
{{if .NeedUpdate}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index d597a2753f5..135b4da3a01 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

{{ctx.Locale.Tr "admin.emails.email_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 37dcc49d535..d8df2054495 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin settings new webhook")}} +{{template "admin/layout_head" (dict "pageClass" "admin settings new webhook")}}
{{$CustomHeaderTitle := ctx.Locale.Tr "admin.defaulthooks.update_webhook"}} {{if .PageIsAdminDefaultHooksNew}} @@ -8,6 +8,6 @@ {{else if .Webhook.IsSystemWebhook}} {{$CustomHeaderTitle = ctx.Locale.Tr "admin.systemhooks.update_webhook"}} {{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{template "webhook/new" (dict "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "admin/layout_footer" .}} diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl index d5fdef68504..c36a9b10ebc 100644 --- a/templates/admin/hooks.tmpl +++ b/templates/admin/hooks.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin hooks")}} +{{template "admin/layout_head" (dict "pageClass" "admin hooks")}}
{{template "repo/settings/webhook/base_list" .SystemWebhooks}} {{template "repo/settings/webhook/base_list" .DefaultWebhooks}} diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 397516da5da..ce989c40c89 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -1,9 +1,9 @@ -{{template "base/head" .ctxData}} -
+{{template "base/head" ctx.RootData}} +
- {{template "admin/navbar" .ctxData}} + {{template "admin/navbar" ctx.RootData}}
- {{template "base/alert" .ctxData}} + {{template "base/alert" ctx.RootData}} {{/* block: admin-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 55ee9da8520..c4c29fc8306 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin notice")}} +{{template "admin/layout_head" (dict "pageClass" "admin notice")}}

{{ctx.Locale.Tr "admin.notices.system_notice_list"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index e6de93c5f81..ad2bb461670 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

{{ctx.Locale.Tr "admin.orgs.org_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 8701cb0d57d..800f8dac5b0 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

{{ctx.Locale.Tr "admin.packages.package_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .TotalCount}}, diff --git a/templates/admin/perftrace.tmpl b/templates/admin/perftrace.tmpl index 2e09f14e46d..6b302f2996e 100644 --- a/templates/admin/perftrace.tmpl +++ b/templates/admin/perftrace.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}
{{template "admin/trace_tabs" .}} diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index e6abd1e7945..b3804980ce1 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

{{ctx.Locale.Tr "admin.monitor.queues"}} diff --git a/templates/admin/queue_manage.tmpl b/templates/admin/queue_manage.tmpl index 73da9164cc1..a57273f0556 100644 --- a/templates/admin/queue_manage.tmpl +++ b/templates/admin/queue_manage.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

{{ctx.Locale.Tr "admin.monitor.queue" .Queue.GetName}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index c72daba3226..d366b8cb2d0 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

{{ctx.Locale.Tr "admin.repos.repo_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index e66add6ce8e..db27b11ac57 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

{{ctx.Locale.Tr "admin.repos.unadopted"}} diff --git a/templates/admin/runners/edit.tmpl b/templates/admin/runners/edit.tmpl index 1165c84b794..7d7fee15050 100644 --- a/templates/admin/runners/edit.tmpl +++ b/templates/admin/runners/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}} +{{template "admin/layout_head" (dict "pageClass" "admin runners")}}
{{template "shared/actions/runner_edit" .}}
diff --git a/templates/admin/self_check.tmpl b/templates/admin/self_check.tmpl index a7f43f4e12d..31d6a5d516a 100644 --- a/templates/admin/self_check.tmpl +++ b/templates/admin/self_check.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}} +{{template "admin/layout_head" (dict "pageClass" "admin")}}

diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index c5dde6b30c1..a74a3d3e417 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}
{{template "admin/trace_tabs" .}} diff --git a/templates/admin/stats.tmpl b/templates/admin/stats.tmpl index bb6a86ac301..610c2860a35 100644 --- a/templates/admin/stats.tmpl +++ b/templates/admin/stats.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin monitor")}} +{{template "admin/layout_head" (dict "pageClass" "admin monitor")}}

{{ctx.Locale.Tr "admin.dashboard.statistic"}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 83eac64fa04..0563cf63b4d 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin edit user")}} +{{template "admin/layout_head" (dict "pageClass" "admin edit user")}}

{{ctx.Locale.Tr "admin.users.edit_account"}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 168603354db..db7cb4874f1 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "pageClass" "admin user")}}

{{ctx.Locale.Tr "admin.users.user_manage_panel"}} ({{ctx.Locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 8af7f116a17..8fe91bd343e 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin new user")}} +{{template "admin/layout_head" (dict "pageClass" "admin new user")}}

{{ctx.Locale.Tr "admin.users.new_account"}} diff --git a/templates/admin/user/view.tmpl b/templates/admin/user/view.tmpl index 67f9148e646..bb1b4991d8a 100644 --- a/templates/admin/user/view.tmpl +++ b/templates/admin/user/view.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin view user")}} +{{template "admin/layout_head" (dict "pageClass" "admin view user")}}
diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index abb9c98435f..1abf895627b 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings actions")}}
{{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} diff --git a/templates/org/settings/actions_general.tmpl b/templates/org/settings/actions_general.tmpl index ebf9482f614..2d2c4a4ca0e 100644 --- a/templates/org/settings/actions_general.tmpl +++ b/templates/org/settings/actions_general.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" .)}} +{{template "org/settings/layout_head" (dict)}}
{{template "shared/actions/owner_general_settings" .}}
diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl index df5f4e9dbc1..eb12d3fa2ac 100644 --- a/templates/org/settings/applications.tmpl +++ b/templates/org/settings/applications.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}

{{ctx.Locale.Tr "settings.applications"}} diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl index 987803ac26a..7fdbc940587 100644 --- a/templates/org/settings/applications_oauth2_edit.tmpl +++ b/templates/org/settings/applications_oauth2_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}
{{template "user/settings/applications_oauth2_edit_form" .}}
diff --git a/templates/org/settings/blocked_users.tmpl b/templates/org/settings/blocked_users.tmpl index eab5ec0007c..4444048f7a5 100644 --- a/templates/org/settings/blocked_users.tmpl +++ b/templates/org/settings/blocked_users.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings blocked_users")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings blocked_users")}}
{{template "shared/user/blocked_users" .}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index f89ee5f2b85..11f71d9059b 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,7 +1,7 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings new webhook")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings new webhook")}}
{{$CustomHeaderTitle := ctx.Locale.Tr "repo.settings.update_webhook"}} {{if .PageIsSettingsHooksNew}}{{$CustomHeaderTitle = ctx.Locale.Tr "repo.settings.add_webhook"}}{{end}} - {{template "webhook/new" (dict "ctxData" . "CustomHeaderTitle" $CustomHeaderTitle)}} + {{template "webhook/new" (dict "CustomHeaderTitle" $CustomHeaderTitle)}}
{{template "org/settings/layout_footer" .}} diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl index b05e22fe205..dbb1721fff7 100644 --- a/templates/org/settings/hooks.tmpl +++ b/templates/org/settings/hooks.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings webhooks")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings webhooks")}}
{{template "repo/settings/webhook/base_list" .}}
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 283b2199cb7..4246c7305e4 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings labels")}}
diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl index 31dad2c1412..97515d89efc 100644 --- a/templates/org/settings/layout_head.tmpl +++ b/templates/org/settings/layout_head.tmpl @@ -1,10 +1,10 @@ -{{template "base/head" .ctxData}} -
- {{template "org/header" .ctxData}} +{{template "base/head" ctx.RootData}} +
+ {{template "org/header" ctx.RootData}}
- {{template "org/settings/navbar" .ctxData}} + {{template "org/settings/navbar" ctx.RootData}}
- {{template "base/alert" .ctxData}} + {{template "base/alert" ctx.RootData}} {{/* block: org-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 2c17e139376..614e861b09f 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings options")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings options")}}

diff --git a/templates/org/settings/packages.tmpl b/templates/org/settings/packages.tmpl index 91106c3f15d..a73ab97a372 100644 --- a/templates/org/settings/packages.tmpl +++ b/templates/org/settings/packages.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
{{template "package/shared/cleanup_rules/list" .}} {{template "package/shared/cargo" .}} diff --git a/templates/org/settings/packages_cleanup_rules_edit.tmpl b/templates/org/settings/packages_cleanup_rules_edit.tmpl index ff4c2dd6516..a6359416c0f 100644 --- a/templates/org/settings/packages_cleanup_rules_edit.tmpl +++ b/templates/org/settings/packages_cleanup_rules_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
{{template "package/shared/cleanup_rules/edit" .}}
diff --git a/templates/org/settings/packages_cleanup_rules_preview.tmpl b/templates/org/settings/packages_cleanup_rules_preview.tmpl index 5a2f0612251..973413c4404 100644 --- a/templates/org/settings/packages_cleanup_rules_preview.tmpl +++ b/templates/org/settings/packages_cleanup_rules_preview.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings packages")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings packages")}}
{{template "package/shared/cleanup_rules/preview" .}}
diff --git a/templates/org/settings/runners_edit.tmpl b/templates/org/settings/runners_edit.tmpl index acd67a4d7bd..b87c6c1091f 100644 --- a/templates/org/settings/runners_edit.tmpl +++ b/templates/org/settings/runners_edit.tmpl @@ -1,4 +1,4 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}} +{{template "org/settings/layout_head" (dict "pageClass" "organization settings runners")}}
{{template "shared/actions/runner_edit" .}}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index ad26d4da880..d5c0b5d7dfb 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -86,7 +86,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if .Issue.IsPull}} {{ctx.Locale.Tr "repo.pulls.reopened_at" .EventTag $createdStr}} {{else}} @@ -101,7 +101,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if .Issue.IsPull}} {{ctx.Locale.Tr "repo.pulls.closed_at" .EventTag $createdStr}} {{else}} @@ -116,7 +116,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{$link := printf "%s/commit/%s" $.Repository.Link ($.Issue.PullRequest.MergedCommitID|PathEscape)}} {{if eq $.Issue.PullRequest.Status 3}} {{ctx.Locale.Tr "repo.issues.comment_manually_pull_merged_at" (HTMLFormat `%[2]s` $link (ShortSha $.Issue.PullRequest.MergedCommitID)) (HTMLFormat "%[1]s" $.BaseTarget) $createdStr}} @@ -256,7 +256,7 @@ {{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}} {{ctx.Locale.Tr "repo.issues.stop_tracking_history" $timeStr $createdStr}} - {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
{{else if eq .Type 14}}
@@ -268,7 +268,7 @@ {{if not $timeStr}}{{$timeStr = .Content|Sec2Hour}}{{end}} {{ctx.Locale.Tr "repo.issues.add_time_history" $timeStr $createdStr}} - {{template "repo/issue/view_content/comments_delete_time" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_delete_time" dict "comment" .}}
{{else if eq .Type 15}}
@@ -380,7 +380,7 @@ {{- end -}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if eq $reviewType 1}} {{ctx.Locale.Tr "repo.issues.review.approve" $createdStr}} {{else if eq $reviewType 3}} @@ -490,7 +490,7 @@ {{template "shared/user/avatarlink" dict "user" .Poster}} {{end}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{ctx.Locale.Tr "repo.pulls.change_target_branch_at" .OldRef .NewRef $createdStr}}
@@ -665,7 +665,7 @@
{{svg "octicon-git-merge" 16}} - {{template "repo/issue/view_content/comments_authorlink" dict "ctxData" $ "comment" .}} + {{template "repo/issue/view_content/comments_authorlink" dict "comment" .}} {{if eq .Type 34}}{{ctx.Locale.Tr "repo.pulls.auto_merge_newly_scheduled_comment" $createdStr}} {{else}}{{ctx.Locale.Tr "repo.pulls.auto_merge_canceled_schedule_comment" $createdStr}}{{end}} diff --git a/templates/repo/issue/view_content/comments_authorlink.tmpl b/templates/repo/issue/view_content/comments_authorlink.tmpl index fd07bd2b1cc..8e0645c983e 100644 --- a/templates/repo/issue/view_content/comments_authorlink.tmpl +++ b/templates/repo/issue/view_content/comments_authorlink.tmpl @@ -1,10 +1,10 @@ {{if .comment.OriginalAuthor}} - {{svg (MigrationIcon .ctxData.Repository.GetOriginalURLHostname)}} + {{svg (MigrationIcon ctx.RootData.Repository.GetOriginalURLHostname)}} {{.comment.OriginalAuthor}} - {{if .ctxData.Repository.OriginalURL}} - ({{ctx.Locale.Tr "repo.migrated_from" .ctxData.Repository.OriginalURL .ctxData.Repository.GetOriginalURLHostname}}) + {{if ctx.RootData.Repository.OriginalURL}} + ({{ctx.Locale.Tr "repo.migrated_from" ctx.RootData.Repository.OriginalURL ctx.RootData.Repository.GetOriginalURLHostname}}) {{end}} {{else}} {{template "shared/user/authorlink" .comment.Poster}} diff --git a/templates/repo/issue/view_content/comments_delete_time.tmpl b/templates/repo/issue/view_content/comments_delete_time.tmpl index 219d5fc2034..dfbbd5fd7a1 100644 --- a/templates/repo/issue/view_content/comments_delete_time.tmpl +++ b/templates/repo/issue/view_content/comments_delete_time.tmpl @@ -1,9 +1,9 @@ -{{if and .comment.Time (.ctxData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}} +{{if and .comment.Time (ctx.RootData.Repository.IsTimetrackerEnabled ctx)}} {{/* compatibility with time comments made before v1.14 */}} {{if (not .comment.Time.Deleted)}} - {{if (or .ctxData.IsAdmin (and .ctxData.IsSigned (eq .ctxData.SignedUserID .comment.PosterID)))}} + {{if (or ctx.RootData.IsAdmin (and ctx.RootData.IsSigned (eq ctx.RootData.SignedUserID .comment.PosterID)))}}