Merge pull request #1056 from alphagov/fix-notice-spacing-consultations

Fix spacing for notices in consultations
alphagov · Aug 16, 2018 · 1ef4036 · 1ef4036
2 parents 0956a2f + 36f1057
commit 1ef4036
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/presenters/consultation_presenter.rb b/app/presenters/consultation_presenter.rb
@@ -110,6 +110,10 @@ def attachment_url
     ways_to_respond["attachment_url"]
   end
 
+  def add_margin?
+    final_outcome? || public_feedback_detail || public_feedback_documents?
+  end
+
 private
 
   def display_date_and_time(date, rollback_midnight = false)

diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb
@@ -31,7 +31,11 @@
       <% content_item_final_outcome = capture do %>
         Visit this page again soon to download the outcome to this public&nbsp;feedback.
       <% end %>
-      <%= render 'govuk_publishing_components/components/notice', title: 'We are analysing your feedback', description_text: content_item_final_outcome, margin_bottom: 0 %>
+      <%= render 'govuk_publishing_components/components/notice',
+        title: 'We are analysing your feedback',
+        description_text: content_item_final_outcome,
+        margin_bottom:(0 unless @content_item.add_margin?)
+      %>
 
     <% elsif @content_item.final_outcome? %>
       <%= render 'govuk_publishing_components/components/notice', title: 'This consultation has concluded' %>