Browse Source

Fix page alignment

pull/1615/head
Kat 3 years ago
parent
commit
beb6c5c1e8
  1. 38
      app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb
  2. 30
      app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb

38
app/views/bulk_upload_lettings_data_check/soft_errors_valid.html.erb

@ -1,25 +1,25 @@
<div class="govuk-grid-row"> <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
<div class="govuk-grid-column-two-thirds"> <div class="govuk-grid-row">
<%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %> <div class="govuk-grid-column-two-thirds">
<%= f.govuk_error_summary %> <%= f.govuk_error_summary %>
<span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span> <span class="govuk-caption-l">Bulk upload for lettings (<%= @bulk_upload.year_combo %>)</span>
<h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1> <h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1>
<p class="govuk-body">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p> <p class="govuk-body-l">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p>
<div class="govuk-body-l"> <p class="govuk-body">
<%= @bulk_upload.filename %> <%= @bulk_upload.filename %>
</div> </p>
</div>
<div class="govuk-grid-row"> <div class="govuk-grid-column-full">
<div class="govuk-grid-column-full"> <% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
<% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %> <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %>
<%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %> <% end %>
<% end %> </div>
</div>
</div>
<div class="govuk-grid-column-full">
<%= f.govuk_collection_radio_buttons :soft_errors_valid, <%= f.govuk_collection_radio_buttons :soft_errors_valid,
@form.options, @form.options,
:id, :id,
@ -27,6 +27,6 @@
legend: { text: "Are there any errors in these fields?", size: "l" } %> legend: { text: "Are there any errors in these fields?", size: "l" } %>
<%= f.govuk_submit %> <%= f.govuk_submit %>
<% end %> </div>
</div> </div>
</div> <% end %>

30
app/views/bulk_upload_sales_data_check/soft_errors_valid.html.erb

@ -1,25 +1,25 @@
<div class="govuk-grid-row"> <%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %>
<div class="govuk-grid-column-two-thirds"> <div class="govuk-grid-row">
<%= form_with model: @form, scope: :form, url: page_bulk_upload_sales_data_check_path(@bulk_upload, page: "soft-errors-valid"), method: :patch do |f| %> <div class="govuk-grid-column-two-thirds">
<%= f.govuk_error_summary %> <%= f.govuk_error_summary %>
<span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span> <span class="govuk-caption-l">Bulk upload for sales (<%= @bulk_upload.year_combo %>)</span>
<h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1> <h1 class="govuk-heading-l">Check these <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> </h1>
<p class="govuk-body">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p> <p class="govuk-body-l">Some data from your bulk upload might not be right. Check your file for any errors in the fields below.</p>
<div class="govuk-body-l"> <p class="govuk-body">
<%= @bulk_upload.filename %> <%= @bulk_upload.filename %>
</div> </p>
</div>
<div class="govuk-grid-row"> <div class="govuk-grid-column-full">
<div class="govuk-grid-column-full"> <% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %>
<% @bulk_upload.bulk_upload_errors.order_by_cell.group_by(&:row).each do |_row, errors_for_row| %> <%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %>
<%= render BulkUploadErrorRowComponent.new(bulk_upload_errors: errors_for_row) %> <% end %>
<% end %> </div>
</div>
</div>
<div class="govuk-grid-column-full">
<%= f.govuk_collection_radio_buttons :soft_errors_valid, <%= f.govuk_collection_radio_buttons :soft_errors_valid,
@form.options, @form.options,
:id, :id,
@ -27,6 +27,6 @@
legend: { text: "Are there any errors in these fields?", size: "l" } %> legend: { text: "Are there any errors in these fields?", size: "l" } %>
<%= f.govuk_submit %> <%= f.govuk_submit %>
<% end %> </div>
</div> </div>
</div> <% end %>

Loading…
Cancel
Save