From 69a97d34f449d73e0247afb1d7771b2eaaaa422d Mon Sep 17 00:00:00 2001 From: Paul Robert Lloyd Date: Mon, 29 Nov 2021 17:11:09 +0000 Subject: [PATCH] Use govuk_link_to and govuk_button_link_to helpers --- app/helpers/check_answers_helper.rb | 4 +++- app/helpers/tasklist_helper.rb | 4 +++- app/views/case_logs/_log_list.html.erb | 2 +- app/views/case_logs/index.html.erb | 2 +- .../devise/mailer/confirmation_instructions.html.erb | 2 +- .../mailer/reset_password_instructions.html.erb | 2 +- app/views/devise/mailer/unlock_instructions.html.erb | 2 +- app/views/devise/shared/_links.html.erb | 12 ++++++------ app/views/form/_check_answers_table.html.erb | 2 +- app/views/test/index.html.erb | 2 +- app/views/users/account/index.html.erb | 2 +- 11 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb index ba0237f58..082ac4709 100644 --- a/app/helpers/check_answers_helper.rb +++ b/app/helpers/check_answers_helper.rb @@ -1,3 +1,5 @@ +include GovukLinkHelper + module CheckAnswersHelper def display_answered_questions_summary(subsection, case_log) total = subsection.applicable_questions_count(case_log) @@ -15,6 +17,6 @@ private def create_next_missing_question_link(subsection, case_log) pages_to_fill_in = subsection.unanswered_questions(case_log).map(&:page) url = "/case_logs/#{case_log.id}/#{pages_to_fill_in.first.id}" - link_to("Answer the missing questions", url, class: "govuk-link").html_safe + govuk_link_to("Answer the missing questions", url).html_safe end end diff --git a/app/helpers/tasklist_helper.rb b/app/helpers/tasklist_helper.rb index d31257f25..d3dbca0b5 100644 --- a/app/helpers/tasklist_helper.rb +++ b/app/helpers/tasklist_helper.rb @@ -1,3 +1,5 @@ +include GovukLinkHelper + module TasklistHelper STATUSES = { not_started: "Not started", @@ -38,6 +40,6 @@ module TasklistHelper else "#" end - link_to(subsection.label, next_page_path, class: "task-name govuk-link") + govuk_link_to(subsection.label, next_page_path, class: "task-name") end end diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb index c0f856f09..1549fef37 100644 --- a/app/views/case_logs/_log_list.html.erb +++ b/app/views/case_logs/_log_list.html.erb @@ -12,7 +12,7 @@ <% case_logs.map do |log| %> - <%= link_to log.id, case_log_path(log), class: "govuk-link" %> + <%= govuk_link_to log.id, case_log_path(log) %> <%= log.property_postcode %> diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb index ef1bc3975..441b6c198 100644 --- a/app/views/case_logs/index.html.erb +++ b/app/views/case_logs/index.html.erb @@ -4,7 +4,7 @@
- <%= link_to "Create new log", case_logs_path, method: :post, class: "govuk-button" %> + <%= govuk_button_link_to "Create new log", case_logs_path, method: :post %> <% if @in_progress_case_logs.present? %> <%= render partial: "log_list", locals: { case_logs: @in_progress_case_logs, title: "Logs you need to complete", date_title: "Last Changed" } %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index dc55f64f6..fac57c4a2 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -2,4 +2,4 @@

You can confirm your account email through the link below:

-

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

+

<%= govuk_link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index f667dc12f..894cbda1d 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -2,7 +2,7 @@

Someone has requested a link to change your password. You can do this through the link below.

-

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+

<%= govuk_link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

If you didn't request this, please ignore this email.

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb index 41e148bf2..a36e910b5 100644 --- a/app/views/devise/mailer/unlock_instructions.html.erb +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -4,4 +4,4 @@

Click the link below to unlock your account:

-

<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

+

<%= govuk_link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index d8395536a..fee2f3976 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,25 +1,25 @@ <%- if controller_name != 'sessions' %> -

Already have an account? <%= link_to "Sign in", new_session_path(resource_name) %>.


+

Already have an account? <%= govuk_link_to "Sign in", new_session_path(resource_name) %>.


<% end %> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= govuk_link_to "Sign up", new_registration_path(resource_name) %>
<% end %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> -

You can <%= link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it.


+

You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it.


<% end %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= govuk_link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end %> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= govuk_link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end %> <%- if devise_mapping.omniauthable? %> <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %>
+ <%= govuk_link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %>
<% end %> <% end %> diff --git a/app/views/form/_check_answers_table.html.erb b/app/views/form/_check_answers_table.html.erb index f52e3d5b6..0b511f9bf 100644 --- a/app/views/form/_check_answers_table.html.erb +++ b/app/views/form/_check_answers_table.html.erb @@ -6,6 +6,6 @@ <%= question.answer_label(@case_log) %>

- <%= link_to(question.update_answer_link_name(@case_log), "/case_logs/#{@case_log.id}/#{question.page.id}", class: "govuk-link").html_safe %> + <%= govuk_link_to(question.update_answer_link_name(@case_log), "/case_logs/#{@case_log.id}/#{question.page.id}").html_safe %>
diff --git a/app/views/test/index.html.erb b/app/views/test/index.html.erb index 06d9c7dff..a60d8f44a 100644 --- a/app/views/test/index.html.erb +++ b/app/views/test/index.html.erb @@ -27,4 +27,4 @@ end end %> -<%= link_to('About', about_path) %> +<%= govuk_link_to('About', about_path) %> diff --git a/app/views/users/account/index.html.erb b/app/views/users/account/index.html.erb index 7cc3c5d6f..83b5d76fd 100644 --- a/app/views/users/account/index.html.erb +++ b/app/views/users/account/index.html.erb @@ -43,7 +43,7 @@ ••••••••
- <%= link_to "Change", edit_user_registration_path, id: "change-password" %> + <%= govuk_link_to "Change", edit_user_registration_path, id: "change-password" %>