Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turn off turbo links for links that go to somewhere on the same page #3590

Merged
merged 1 commit into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/base/passwords/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="govuk-error-summary__body">
<ul class="govuk-list govuk-error-summary__list">
<li>
<%= link_to flash[:error], "##{error_id('email')}" %>
<%= link_to flash[:error], "##{error_id('email')}", data: { turbolinks: false } %>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/base/users/_sms_mfa.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ul id="ccs-error-sum-list" class="govuk-list govuk-error-summary__list">
<% @challenge.errors.attribute_names.each do |attribute| %>
<li>
<%= link_to @challenge.errors[attribute].first, "##{error_id(attribute)}" %>
<%= link_to @challenge.errors[attribute].first, "##{error_id(attribute)}", data: { turbolinks: false } %>
</li>
<% end %>
</ul>
Expand Down
13 changes: 0 additions & 13 deletions app/views/errors/_inline_error_summary.html.erb

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="govuk-error-summary__body">
<ul class="govuk-list govuk-error-summary__list">
<li>
<%= link_to t(".error_message.#{first_error_type}"), "##{ @invalid_services.keys.first}_label", data: {errortype: 'invalid-input'} %>
<%= link_to t(".error_message.#{first_error_type}"), "##{ @invalid_services.keys.first}_label", data: { turbolinks: false, errortype: 'invalid-input'} %>
</li>
</ul>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<ul class="govuk-list govuk-error-summary__list">
<% if internal_area_incomplete? %>
<li>
<%= link_to t('facilities_management.rm3830.procurement_buildings.show.gia_error'), "#service_volumes" %>
<%= link_to t('facilities_management.rm3830.procurement_buildings.show.gia_error'), "#service_volumes", data: { turbolinks: false } %>
</li>
<% elsif external_area_incomplete? %>
<li>
<%= link_to t('facilities_management.rm3830.procurement_buildings.show.external_area_error'), "#service_volumes" %>
<%= link_to t('facilities_management.rm3830.procurement_buildings.show.external_area_error'), "#service_volumes", data: { turbolinks: false } %>
</li>
<% end %>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ul class="govuk-list govuk-error-summary__list">
<% requirements_errors_list.each do |attribute, message| %>
<li>
<%= link_to message, "##{error_id(attribute)}", data: { fieldname: attribute } %>
<%= link_to message, "##{error_id(attribute)}", data: { turbolinks: false, fieldname: attribute } %>
</li>
<% end %>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<% end %>

<div id="wrapper">
<a href="#main-content" class="govuk-skip-link" data-module="govuk-skip-link"><%= t('.skip') %></a>
<%= link_to t('.skip'), '#main-content', class: 'govuk-skip-link', data: { module: 'govuk-skip-link', turbolinks: false } %>
<%= render partial: '/layouts/cookie-banner' unless cookie_preferences_settings['settings_viewed'] || controller.action_name == 'cookie_settings' %>
<%= render partial: '/layouts/header' %>

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/error.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<% end %>

<div class="error-content">
<a href="#main-content" class="govuk-skip-link" data-module="govuk-skip-link"><%= t('layouts.application.skip') %></a>
<%= link_to t('layouts.application.skip'), '#main-content', class: 'govuk-skip-link', data: { module: 'govuk-skip-link', turbolinks: false } %>
<%= render partial: '/layouts/cookie-banner' unless cookie_preferences_settings['settings_viewed'] || controller.action_name == 'cookie_settings' %>
<%= render partial: '/layouts/header' %>

Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_error_summary.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ul class="govuk-list govuk-error-summary__list">
<% errors.attribute_names.each do |attribute| %>
<li>
<%= link_to "#{errors[attribute].first}", "##{error_id(attribute)}", data: {fieldname: attribute, errortype: get_client_side_error_type_from_errors(errors, attribute).to_s } %>
<%= link_to "#{errors[attribute].first}", "##{error_id(attribute)}", data: { turbolinks: false, fieldname: attribute, errortype: get_client_side_error_type_from_errors(errors, attribute).to_s } %>
</li>
<% end %>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_error_summary_nested_attributes.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<% nested_attributes.each do |nested_attr| %>
<% nested_attr.errors.attribute_names.each do |attribute| %>
<li>
<%= link_to "#{nested_attr.errors[attribute].first}", "##{error_id(nested_attr.id)}", data: {fieldname: attribute, errortype: get_client_side_error_type_from_errors(nested_attr.errors, attribute).to_s } %>
<%= link_to "#{nested_attr.errors[attribute].first}", "##{error_id(nested_attr.id)}", data: { turbolinks: false, fieldname: attribute, errortype: get_client_side_error_type_from_errors(nested_attr.errors, attribute).to_s } %>
</li>
<% end %>
<% end %>
Expand Down