Make the non-JS form more seamless without additional buttons

bitzesty · Jul 16, 2024 · 061b89c · 061b89c
1 parent 84eb8ad
commit 061b89c
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/app/controllers/form/support_letters_controller.rb b/app/controllers/form/support_letters_controller.rb
@@ -10,7 +10,11 @@ def create
       if @form_answer.save
         add_support_letters_to_document!
 
-        redirect_to form_form_answer_supporters_path(@form_answer)
+        if params[:next_step]
+          redirect_to edit_form_url(@form_answer, step: params[:next_step])
+        else
+          redirect_to form_form_answer_supporters_path(@form_answer)
+        end
       else
         @step = @form.steps.detect { |s| s.opts[:id] == :letters_of_support_step }
 

diff --git a/app/javascript/packs/application.scss b/app/javascript/packs/application.scss
@@ -101,6 +101,7 @@ body.js-enabled {
       }
 
       .govuk-button {
+        color: inherit;
         margin-bottom: 0 !important;
         margin-top: 0 !important;
         white-space: nowrap;

diff --git a/app/views/form/support_letters/_footer.html.slim b/app/views/form/support_letters/_footer.html.slim
@@ -0,0 +1,21 @@
+nav.pagination.no-border class="#{'pagination-alternative' unless step.next}" role="navigation" aria-label="Pagination"
+  ul.group
+    - if step.previous
+      li.previous.previous-alternate.js-step-link data-step="step-#{step.previous.title_to_param}"
+        = link_to edit_form_url(id: @form_answer.id, step: step.previous.title_to_param), rel: "prev", title: "Navigate to previous part", class: 'govuk-button govuk-button--secondary' do
+          span.pagination-label
+            | Back
+
+    - else
+      li.previous.previous-alternate
+        = link_to [:award_info, @form_answer.award_type.to_sym, form_id: @form_answer.id], rel: "prev", title: "Navigate to previous part", class: 'govuk-button govuk-button--secondary' do
+          span.pagination-label
+            | Back
+
+    - unless admin_in_read_only_mode?
+      li.save-quit-link
+        = link_to "Save and come back later", dashboard_path, class: "save-quit-link govuk-button govuk-button--secondary"
+
+    - if step.next
+      li.submit.js-next-link.js-step-link data-step="step-#{step.next.title_to_param}"
+        = f.submit "Save and continue", class: "govuk-button", title: "Submit letters of support"
diff --git a/app/views/form/support_letters/_form.html.slim b/app/views/form/support_letters/_form.html.slim
@@ -1,4 +1,6 @@
 = simple_form_for [:form, @form_answer], url: [:form, @form_answer, :support_letters], method: :post, data: { turbo: false }, html: { class: 'qae-form' } do |f|
+  = text_field_tag :next_step, @step.next.title_to_param, type: :hidden
+
   ul.list-add.supporters-list
     = f.simple_fields_for :support_letters do |ff|
       li
@@ -21,4 +23,4 @@
               = fff.input :form_answer_id, as: :hidden, input_html: { value: @form_answer.id }
               = fff.input :user_id, as: :hidden, input_html: { value: current_user.id }
 
-  = f.submit "Submit letters of support", class: "govuk-button"
+  = render partial: "form/support_letters/footer", locals: { f: f, step: @step }
diff --git a/app/views/form/supporters/index.html.slim b/app/views/form/supporters/index.html.slim
@@ -39,5 +39,3 @@ h1.govuk-heading-xl
           = render partial: "form/support_letters/form"
 
     = render "qae_form/steps_progress_bar", current_step: "letters-of-support"
-
-    = render "form/supporters/footer", step: @step
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,5 +39,3 @@ h1.govuk-heading-xl
		= render partial: "form/support_letters/form"

		= render "qae_form/steps_progress_bar", current_step: "letters-of-support"

		= render "form/supporters/footer", step: @step