Browse Source

Revert "Alternative way to handle js disabled users"

This reverts commit 10da3d61e2.
CLDC-3787-Autocomplete-address-search
Manny Dinssa 4 days ago
parent
commit
7f3811c8f1
  1. 18
      app/views/form/_address_search_question.html.erb
  2. 6
      app/views/form/page.html.erb

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

@ -1,18 +1,7 @@
<% selected = @log.public_send(question.id) || "" %>
<% answers = question.displayed_answer_options(@log, current_user).map { |key, value| OpenStruct.new(id: key, name: select_option_name(value), resource: value) } %> <% answers = question.displayed_answer_options(@log, current_user).map { |key, value| OpenStruct.new(id: key, name: select_option_name(value), resource: value) } %>
<%= render partial: "form/guidance/#{question.top_guidance_partial}" if question.top_guidance? %> <%= render partial: "form/guidance/#{question.top_guidance_partial}" if question.top_guidance? %>
<noscript>
<%= govuk_notification_banner(title_text: "Important") do %>
<p class="govuk-notification-banner__heading govuk-!-width-full" style="max-width: fit-content">
This feature requires JavaScript to be enabled
<p>
<p style="max-width: fit-content">
Searching for an address or UPRN requires JavaScript to be enabled in your browser. Please enter the address manually instead in the next question.
</p>
<% end %>
</noscript>
<div id="js-enabled-content" style="display: none;">
<%= f.govuk_select(question.id.to_sym, <%= f.govuk_select(question.id.to_sym,
label: legend(question, page_header, conditional), label: legend(question, page_header, conditional),
"data-controller": "address-search", "data-controller": "address-search",
@ -33,12 +22,7 @@
<% end %> <% end %>
<%= render partial: "form/guidance/#{question.bottom_guidance_partial}" if question.bottom_guidance? %> <%= render partial: "form/guidance/#{question.bottom_guidance_partial}" if question.bottom_guidance? %>
</div>
<div class="govuk-button-group"> <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" %> <%= govuk_link_to "Enter the address manually instead", address_manual_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div> </div>
<script>
document.getElementById('js-enabled-content').style.display = 'block';
</script>

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

@ -76,13 +76,9 @@
<% end %> <% end %>
<% if @page.id == "address" %> <% if @page.id == "address" %>
<div id="js-enabled-button" style="display: none;" class="govuk-button-group"> <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" %> <%= govuk_link_to "Clear address and search instead", address_search_input_path(@log.log_type, @log.id), class: "govuk-button govuk-button--secondary" %>
</div> </div>
<script>
document.getElementById('js-enabled-button').style.display = 'block';
</script>
<% end %> <% end %>
<% if @pages_with_errors_count > 1 %> <% if @pages_with_errors_count > 1 %>

Loading…
Cancel
Save