metadata_presenter 2.17.2 → 2.17.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/metadata_presenter/analytics/_ga4.html.erb +10 -4
  3. data/app/views/metadata_presenter/analytics/_global_analytics.html.erb +10 -0
  4. data/app/views/metadata_presenter/analytics/_google.html.erb +1 -1
  5. data/app/views/metadata_presenter/analytics/_gtm.html.erb +1 -1
  6. data/app/views/metadata_presenter/analytics/_ua.html.erb +1 -1
  7. data/app/views/metadata_presenter/analytics/analytics.html.erb +4 -0
  8. data/app/views/metadata_presenter/page/checkanswers.html.erb +1 -1
  9. data/app/views/metadata_presenter/page/form.html.erb +1 -1
  10. data/app/views/metadata_presenter/page/start.html.erb +1 -1
  11. data/config/locales/en.yml +4 -0
  12. data/lib/metadata_presenter/version.rb +1 -1
  13. data/schemas/component/autocomplete.json +6 -0
  14. data/schemas/definition/select.json +0 -8
  15. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3f166401c26890424e4053dc8556d828ddb7d391ac259119b0098a9cb5d614ba
4
- data.tar.gz: c914587d1a980e8df8ad1512e3375b5145d316678c2704b0ed2f4703c8301ad4
3
+ metadata.gz: 155219213a31ec8767775b4f491cc306452ed2d773e128a105e92f85b2128e52
4
+ data.tar.gz: e9ec98867eaf689f2766687dba0e69ebb5f4a2adbccbcfee67df85c8c3992eee
5
5
  SHA512:
6
- metadata.gz: 34864d1617ef5d9ed0509cc9c25c4252560535281191ebeec75c7043eb0d8709fb433aaeb69133c52a3883b0898c793085708b33d5ca1e44339014b3f3ad32f5
7
- data.tar.gz: 814c7b09df2cb20a3a8cd8632c9104f049a7c0e0f77b39e9d18f4ad613aad7e5877af2ef0e7e5b776f0187ed0de85b34032a3f5d68488885255be317b19cf3a3
6
+ metadata.gz: 9b7914d013cdac0ffadaf6a05e1f1f3c446779773d775f66d924754e54d406685a0eccab2e4015bf6ab3594ce39fd0266f11e077a8384ea30ea3d9732e682db0
7
+ data.tar.gz: 567831ee776a38a1fa5804ae287422334ea39d45e4f2cdf9da66ea0e6b112673673dc8ed935fe5ee0e1b75f7dfd0656f06eb6dab0db1ba771fa089b8d5c15a50
data/app/views/metadata_presenter/analytics/_ga4.html.erb CHANGED
@@ -1,10 +1,16 @@
1
- <!-- Global site tag (gtag.js) - Google Analytics -->
2
- <script async src="https://www.googletagmanager.com/gtag/js?id=<%= analytic_tag %>"></script>
1
+ <!-- Google Analytics 4 -->
2
+ <% if Rails.application.config.respond_to?(:global_ga4) %>
3
+ <script>
4
+ gtag('config', '<%= measurement_id %>');
5
+ </script>
6
+ <% else %>
7
+ <script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
3
8
  <script>
4
9
  window.dataLayer = window.dataLayer || [];
5
10
  function gtag(){dataLayer.push(arguments);}
6
11
  gtag('js', new Date());
7
12
 
8
- gtag('config', '<%= analytic_tag %>');
13
+ gtag('config', '<%= measurement_id %>');
9
14
  </script>
10
- <!-- End Global site tag (gtag.js) - Google Analytics -->
15
+ <% end %>
16
+ <!-- End Google Analytics 4 -->
data/app/views/metadata_presenter/analytics/_global_analytics.html.erb ADDED
@@ -0,0 +1,10 @@
1
+ <!-- Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
2
+ <script async src="https://www.googletagmanager.com/gtag/js?id=<%= measurement_id %>"></script>
3
+ <script>
4
+ window.dataLayer = window.dataLayer || [];
5
+ function gtag(){dataLayer.push(arguments);}
6
+ gtag('js', new Date());
7
+
8
+ gtag('config', '<%= measurement_id %>');
9
+ </script>
10
+ <!-- End Global MoJ Forms site tag (gtag.js) - Google Analytics 4 -->
data/app/views/metadata_presenter/analytics/_google.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <% analytics.each do |analytic| %>
2
2
  <% if ENV[analytic].present? %>
3
- <%= render partial: "metadata_presenter/analytics/#{analytic.downcase}", locals: { analytic_tag: ENV[analytic] } %>
3
+ <%= render partial: "metadata_presenter/analytics/#{analytic.downcase}", locals: { measurement_id: ENV[analytic] } %>
4
4
  <% end %>
5
5
  <% end %>
data/app/views/metadata_presenter/analytics/_gtm.html.erb CHANGED
@@ -3,5 +3,5 @@
3
3
  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
4
4
  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
5
5
  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
6
- })(window,document,'script','dataLayer','<%= analytic_tag %>');</script>
6
+ })(window,document,'script','dataLayer','<%= measurement_id %>');</script>
7
7
  <!-- End Google Tag Manager -->
data/app/views/metadata_presenter/analytics/_ua.html.erb CHANGED
@@ -5,7 +5,7 @@
5
5
  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
6
6
  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
7
7
 
8
- ga('create', '<%= analytic_tag %>', 'auto');
8
+ ga('create', '<%= measurement_id %>', 'auto');
9
9
  ga('send', 'pageview');
10
10
  </script>
11
11
  <!-- End Google Universal Analytics -->
data/app/views/metadata_presenter/analytics/analytics.html.erb CHANGED
@@ -1,3 +1,7 @@
1
+ <% if Rails.application.config.respond_to?(:global_ga4) %>
2
+ <%= render partial: 'metadata_presenter/analytics/global_analytics', locals: { measurement_id: Rails.application.config.global_ga4 } %>
3
+ <% end %>
4
+
1
5
  <% Rails.application.config.supported_analytics.each do |provider, analytics| %>
2
6
  <%= render partial: "metadata_presenter/analytics/#{provider}", locals: { analytics: analytics } %>
3
7
  <% end %>
data/app/views/metadata_presenter/page/checkanswers.html.erb CHANGED
@@ -85,7 +85,7 @@
85
85
  } %>
86
86
 
87
87
  <button <%= 'disabled' if editable? %> data-prevent-double-click="true" class="fb-block fb-block-actions govuk-button" data-module="govuk-button" data-block-id="actions" data-block-type="actions">
88
- Accept and send application
88
+ <%= t('actions.submit') -%>
89
89
  </button>
90
90
  <% end %>
91
91
 
data/app/views/metadata_presenter/page/form.html.erb CHANGED
@@ -8,7 +8,7 @@
8
8
  <%- end %>
9
9
  <%= form_tag(reserved_answers_path, method: :post) do %>
10
10
  <button class='govuk-button govuk-button--start govuk-!-margin-top-2'>
11
- Continue
11
+ <%= t('actions.continue') -%>
12
12
  <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
13
13
  <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
14
14
  </svg>
data/app/views/metadata_presenter/page/start.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
 
8
8
  <%= form_tag(root_path, method: :post) do %>
9
9
  <button <%= 'disabled' if editable? %> class='govuk-button govuk-button--start govuk-!-margin-top-2'>
10
- Start now
10
+ <%= t('actions.start') -%>
11
11
  <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
12
12
  <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z" />
13
13
  </svg>
data/config/locales/en.yml CHANGED
@@ -1,4 +1,8 @@
1
1
  en:
2
+ actions:
3
+ start: Start Now
4
+ continue: Continue
5
+ submit: Submit
2
6
  analytics:
3
7
  heading: Cookies on %{service_name}
4
8
  body_1: We use some essential cookies to make this service work.
data/lib/metadata_presenter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module MetadataPresenter
2
- VERSION = '2.17.2'.freeze
2
+ VERSION = '2.17.5'.freeze
3
3
  end
data/schemas/component/autocomplete.json CHANGED
@@ -7,6 +7,12 @@
7
7
  "allOf": [
8
8
  {
9
9
  "$ref": "definition.select"
10
+ },
11
+ {
12
+ "$ref": "definition.field"
13
+ },
14
+ {
15
+ "$ref": "definition.width_class.input"
10
16
  }
11
17
  ],
12
18
  "properties": {
data/schemas/definition/select.json CHANGED
@@ -2,14 +2,6 @@
2
2
  "$id": "http://gov.uk/schema/v1.0.0/definition/select",
3
3
  "_name": "definition.select",
4
4
  "title": "Select component definition",
5
- "allOf": [
6
- {
7
- "$ref": "definition.field"
8
- },
9
- {
10
- "$ref": "definition.width_class.input"
11
- }
12
- ],
13
5
  "properties": {
14
6
  "items": {
15
7
  "title": "Items",
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metadata_presenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.17.2
4
+ version: 2.17.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - MoJ Forms
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-16 00:00:00.000000000 Z
11
+ date: 2022-06-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: govuk_design_system_formbuilder
@@ -335,6 +335,7 @@ files:
335
335
  - app/views/layouts/metadata_presenter/application.html.erb
336
336
  - app/views/metadata_presenter/analytics/_cookie_banner.html.erb
337
337
  - app/views/metadata_presenter/analytics/_ga4.html.erb
338
+ - app/views/metadata_presenter/analytics/_global_analytics.html.erb
338
339
  - app/views/metadata_presenter/analytics/_google.html.erb
339
340
  - app/views/metadata_presenter/analytics/_gtm.html.erb
340
341
  - app/views/metadata_presenter/analytics/_ua.html.erb