Skip to content

Commit

Permalink
Merge pull request #1352 from alphagov/add-ga4-migration-notice
Browse files Browse the repository at this point in the history
Add GA4 migration notice
  • Loading branch information
deborahchua authored Jan 31, 2024
2 parents 62a9e55 + 366278e commit a82a3d3
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 0 deletions.
11 changes: 11 additions & 0 deletions app/views/components/_ga4_notice.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<% i18n_scope = [:data_sources, :ga4_migration_warning] %>

<div class="govuk-inset-text ga-data-notice">
<p class="govuk-body govuk-!-font-weight-bold">
<%= I18n.t(:heading, scope: i18n_scope) %>
</p>

<p class="govuk-body">
<%= raw(I18n.t(:body, scope: i18n_scope)) %>
</p>
</div>
1 change: 1 addition & 0 deletions app/views/content/export_csv.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<a href="/content" class="local-nav__search-link govuk-link govuk-link--no-visited-state" data-gtm-id="back-link">Search</a>
</div>
<% end %>
<%= render(partial: 'components/ga4_notice') %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">Sending the CSV export</h1>
Expand Down
6 changes: 6 additions & 0 deletions app/views/content/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<% content_for :title, @presenter.title %>
<% content_for :page_class, "content-data__index" %>

<div class="govuk-grid-row">
<div class="govuk-grid-column-full ga-data-notice-column">
<%= render(partial: 'components/ga4_notice') %>
</div>
</div>

<div class="govuk-grid-row">
<div class="govuk-grid-column-one-quarter">
<div class="filters-control__wrapper filter--hidden" data-module="filter-toggle">
Expand Down
2 changes: 2 additions & 0 deletions app/views/content_csv_mailer/content_csv_email.text.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ The data you exported from Content Data will be available from this link for 7 d

<%= @file_url %>

<%= I18n.t(:heading, scope: [:data_sources, :ga4_migration_warning])%> <%= I18n.t(:body, scope: [:data_sources, :ga4_migration_warning])%>

If you have feedback on the Content Data tool or problems downloading the CSV, email [email protected].

Do not reply to this message.
1 change: 1 addition & 0 deletions app/views/documents/children.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<% end %>

<div class="content-wrapper">
<%= render(partial: 'components/ga4_notice') %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds headings">
<span class="govuk-caption-xl" data-gtm-id="page-kicker"><%= @presenter.kicker %></span>
Expand Down
1 change: 1 addition & 0 deletions app/views/metrics/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<% end %>
<% current_selection = @performance_data.date_range.time_period || 'past-30-days' %>

<%= render(partial: 'components/ga4_notice') %>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<span class="govuk-caption-xl" data-gtm-id="page-kicker"><%= t ".page_kicker" %></span>
Expand Down
3 changes: 3 additions & 0 deletions config/locales/defaults/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ en:
no_matching_results: 'No matching results'
data_sources:
google_analytics: 'Google Analytics'
ga4_migration_warning:
heading: We're currently upgrading our Google Analytics source to Google's new product, GA4. Users may see the numbers vary as of January 2024.
body: For more information please contact <a href="mailto:[email protected]">[email protected]</a>. Data is only collected for users that consent to analytics cookies.
calculated_google_analytics: 'calculated from Google Analytics'
feedback_explorer: 'Feedback Explorer'
none: false
Expand Down

0 comments on commit a82a3d3

Please sign in to comment.