Browse Source

Move buttons to bottom guidance partials

pull/2924/head
Manny Dinssa 2 months ago
parent
commit
6c5ff15b6c
  1. 1
      app/models/form/lettings/questions/postcode_for_full_address.rb
  2. 4
      app/views/form/_address_search_question.html.erb
  3. 3
      app/views/form/guidance/_address_fallback.html.erb
  4. 4
      app/views/form/guidance/_address_search.html.erb
  5. 6
      app/views/form/page.html.erb

1
app/models/form/lettings/questions/postcode_for_full_address.rb

@ -20,6 +20,7 @@ class Form::Lettings::Questions::PostcodeForFullAddress < ::Form::Question
@disable_clearing_if_not_routed_or_dynamic_answer_options = true
@question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
@hide_question_number_on_page = true
@bottom_guidance_partial = "address_fallback"
end
QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13, 2025 => 17 }.freeze

4
app/views/form/_address_search_question.html.erb

@ -22,7 +22,3 @@
<% end %>
<%= render partial: "form/guidance/#{question.bottom_guidance_partial}" if question.bottom_guidance? %>
<div class="govuk-button-group">
<%= govuk_link_to "Enter the address manually instead", address_manual_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div>

3
app/views/form/guidance/_address_fallback.html.erb

@ -0,0 +1,3 @@
<div class="govuk-button-group">
<%= govuk_link_to "Clear address and search instead", address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div>

4
app/views/form/guidance/_address_search.html.erb

@ -1,3 +1,7 @@
<%= govuk_details(summary_text: I18n.t("forms.#{@log.form.start_date.year}.#{@log.form.type}.guidance.address_search.title")) do %>
<%= I18n.t("forms.#{@log.form.start_date.year}.#{@log.form.type}.guidance.address_search.content").html_safe %>
<% end %>
<div class="govuk-button-group">
<%= govuk_link_to "Enter the address manually instead", address_manual_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div>

6
app/views/form/page.html.erb

@ -75,12 +75,6 @@
<%= f.hidden_field :check_errors, value: @check_errors %>
<% end %>
<% if @page.id == "address" %>
<div class="govuk-button-group">
<%= govuk_link_to "Clear address and search instead", address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div>
<% end %>
<% if @pages_with_errors_count > 1 %>
<div class="govuk-button-group">
<%= f.submit "See all related answers", name: "check_errors", class: "govuk-body govuk-link submit-button-link" %>

Loading…
Cancel
Save