From 6b00ce8873698a556ff3db44acf0a45c137f2e1c Mon Sep 17 00:00:00 2001 From: Ryan Brown Date: Mon, 25 Nov 2024 17:38:30 +0000 Subject: [PATCH] Apply link and button tracking globally across Whitehall --- .../admin/editions/show/sidebar_actions_component.html.erb | 2 +- app/helpers/admin/editions_helper.rb | 2 +- app/views/admin/attachments/_form.html.erb | 2 +- app/views/admin/new_document/index.html.erb | 2 +- app/views/layouts/design_system.html.erb | 2 +- app/views/shared/_header.html.erb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/admin/editions/show/sidebar_actions_component.html.erb b/app/components/admin/editions/show/sidebar_actions_component.html.erb index ccd49b2cd15..77e074c1b0d 100644 --- a/app/components/admin/editions/show/sidebar_actions_component.html.erb +++ b/app/components/admin/editions/show/sidebar_actions_component.html.erb @@ -1,4 +1,4 @@ -
+
<%= render "govuk_publishing_components/components/list", { extra_spacing: true, items: actions, diff --git a/app/helpers/admin/editions_helper.rb b/app/helpers/admin/editions_helper.rb index cbb09deef56..a36801997d5 100644 --- a/app/helpers/admin/editions_helper.rb +++ b/app/helpers/admin/editions_helper.rb @@ -93,7 +93,7 @@ def lead_organisation_id_at_index(edition, index) end def standard_edition_form(edition) - form_for form_url_for_edition(edition), as: :edition, html: { class: edition_form_classes(edition), multipart: true }, data: { module: "EditionForm LocaleSwitcher ga4-button-setup ga4-visual-editor-event-handlers", "rtl-locales": Locale.right_to_left.collect(&:to_param) } do |form| + form_for form_url_for_edition(edition), as: :edition, html: { class: edition_form_classes(edition), multipart: true }, data: { module: "EditionForm LocaleSwitcher ga4-visual-editor-event-handlers", "rtl-locales": Locale.right_to_left.collect(&:to_param) } do |form| concat render("standard_fields", form:, edition:) yield(form) concat render("settings_fields", form:, edition:) diff --git a/app/views/admin/attachments/_form.html.erb b/app/views/admin/attachments/_form.html.erb index c2b729eeb88..24265423e8b 100644 --- a/app/views/admin/attachments/_form.html.erb +++ b/app/views/admin/attachments/_form.html.erb @@ -1,4 +1,4 @@ -<%= form_for attachment, url: [:admin, typecast_for_attachable_routing(attachable), attachment.becomes(Attachment)], as: :attachment, html: { :class => "app-view-attachments__form", data: { module: "LocaleSwitcher ga4-button-setup ga4-visual-editor-event-handlers", "rtl-locales": Locale.right_to_left.collect(&:to_param) }}, multipart: true do |form| %> +<%= form_for attachment, url: [:admin, typecast_for_attachable_routing(attachable), attachment.becomes(Attachment)], as: :attachment, html: { :class => "app-view-attachments__form", data: { module: "LocaleSwitcher ga4-visual-editor-event-handlers", "rtl-locales": Locale.right_to_left.collect(&:to_param) }}, multipart: true do |form| %>
<%= render "govuk_publishing_components/components/input", { label: { diff --git a/app/views/admin/new_document/index.html.erb b/app/views/admin/new_document/index.html.erb index 408b712556e..e20fc4a6033 100644 --- a/app/views/admin/new_document/index.html.erb +++ b/app/views/admin/new_document/index.html.erb @@ -3,7 +3,7 @@
<%= form_with url: admin_new_document_options_path, data: { - module: "ga4-form-setup ga4-form-tracker ga4-link-setup ga4-link-tracker", + module: "ga4-form-setup ga4-form-tracker", } do %> <%= render "govuk_publishing_components/components/radio", { heading: "New document", diff --git a/app/views/layouts/design_system.html.erb b/app/views/layouts/design_system.html.erb index da186e223d6..4dd1c68a22f 100644 --- a/app/views/layouts/design_system.html.erb +++ b/app/views/layouts/design_system.html.erb @@ -22,7 +22,7 @@ <%= render partial: "shared/header" %> -
+
<%= render "shared/phase_banner", { show_feedback_banner: t("admin.feedback.show_banner"), } %> diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 3d27fec7936..bf67fa8afcf 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -28,7 +28,7 @@ ], } %> -
+
<%= render "components/sub_navigation", { items: [ sub_nav_item("New document", admin_new_document_path),