Skip to content

Commit

Permalink
Merge pull request #4229 from DFE-Digital/Privacy-notice-link
Browse files Browse the repository at this point in the history
Privacy notice link opening in new tab changes
  • Loading branch information
mariosh-e authored Oct 9, 2024
2 parents c856580 + 20e1a48 commit 36a26d8
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion app/components/content/adviser_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<%= f.hidden_field :sub_channel_id, value: f.object&.sub_channel_id.presence || params[:sub_channel] %>
<%= f.hidden_field :accepted_policy_id, value: privacy_policy.id %>

<p>Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>.</p>
<p>Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before signing up to receive emails.</p>

Expand Down
2 changes: 1 addition & 1 deletion app/components/content/mailing_list_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<%= f.hidden_field :sub_channel_id, value: params[:sub_channel] || f.object&.sub_channel_id.presence %>
<%= f.hidden_field :accepted_policy_id, value: privacy_policy.id %>

<p>Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>.</p>
<p>Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before signing up to receive emails.</p>

Expand Down
2 changes: 1 addition & 1 deletion app/components/home/mailing_list_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<p>
<small>
Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>. This explains how we use your personal data. It's important you read it before signing up to receive emails.
Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: privacy_policy.id), { class: "link--black", target: :blank }) %>. This explains how we use your personal data. It's important you read it before signing up to receive emails.
</small>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/callbacks/steps/_personal_details.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<%= f.govuk_email_field :email, autocomplete: "email", width: 'two-thirds' %>
<%= f.hidden_field :accepted_policy_id, value: f.object.latest_privacy_policy.id %>

<p>Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>
<p>Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before booking a callback.</p>
2 changes: 1 addition & 1 deletion app/views/event_steps/_personal_details.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<%= f.hidden_field :channel_id, value: params[:channel] || f.object&.channel_id %>
<%= f.hidden_field :sub_channel_id, value: params[:sub_channel] || f.object&.sub_channel_id %>

<p>Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>
<p>Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before signing up for an event.</p>
2 changes: 1 addition & 1 deletion app/views/mailing_list/steps/_name.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ Find out how to get:
<%= f.hidden_field :sub_channel_id, value: params[:sub_channel] || f.object.sub_channel_id %>
<%= f.hidden_field :accepted_policy_id, value: f.object.latest_privacy_policy.id %>

<p>Your details are protected under the terms of our <%= link_to("privacy notice", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>
<p>Your details are protected under the terms of our <%= link_to("privacy notice (opens in new tab)", privacy_policy_path(id: f.object.latest_privacy_policy.id), { target: :blank }) %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before signing up to receive emails.</p>
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
<%= f.hidden_field :sub_channel_id, value: f.object.sub_channel_id.presence || params[:sub_channel] %>
<%= f.hidden_field :accepted_policy_id, value: f.object.latest_privacy_policy.id %>

<p>Your details are protected under the terms of our <%= link_to "privacy notice", privacy_policy_path(id: session[:privacy_policy_id].presence || GetIntoTeachingApiClient::PrivacyPoliciesApi.new.get_latest_privacy_policy.id), target: :blank %>.</p>
<p>Your details are protected under the terms of our <%= link_to "privacy notice (opens in new tab)", privacy_policy_path(id: session[:privacy_policy_id].presence || GetIntoTeachingApiClient::PrivacyPoliciesApi.new.get_latest_privacy_policy.id), target: :blank %>.</p>

<p>Our privacy notice explains how we use your personal data. It's important you read this before signing up to get support from an adviser.</p>
2 changes: 1 addition & 1 deletion spec/components/content/adviser_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
it { is_expected.to have_css("p", text: "intro") }
it { is_expected.to have_css(".action-container--#{color}") }
it { is_expected.to have_css("form") }
it { is_expected.to have_link("privacy notice", href: "/privacy-policy?id=123") }
it { is_expected.to have_link("privacy notice (opens in new tab)", href: "/privacy-policy?id=123") }
it { is_expected.not_to have_css(".action-container--no-margin") }

context "when color is trasparent" do
Expand Down
2 changes: 1 addition & 1 deletion spec/components/content/mailing_list_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
it { is_expected.to have_css("p", text: "intro") }
it { is_expected.to have_css(".action-container--#{color}") }
it { is_expected.to have_css("form") }
it { is_expected.to have_link("privacy notice", href: "/privacy-policy?id=123") }
it { is_expected.to have_link("privacy notice (opens in new tab)", href: "/privacy-policy?id=123") }
it { is_expected.not_to have_css(".action-container--no-margin") }

context "when color is trasparent" do
Expand Down
2 changes: 1 addition & 1 deletion spec/components/home/mailing_list_component_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
it { is_expected.to have_css(".home-mailing-list") }
it { is_expected.to have_css("h2") }
it { is_expected.to have_css("form") }
it { is_expected.to have_link("privacy notice", href: "/privacy-policy?id=123") }
it { is_expected.to have_link("privacy notice (opens in new tab)", href: "/privacy-policy?id=123") }
end

0 comments on commit 36a26d8

Please sign in to comment.