Fix spacing issues in runner templates (#394)

Author: JamesGardiner

app/translations/messages.pot

@@ -390,7 +390,7 @@ msgstr ""
 #: templates/individual_response/confirmation-post.html:21
 #: templates/individual_response/confirmation-text-message.html:31
 #: templates/individual_response/question.html:5 templates/interstitial.html:8
-#: templates/sectionsummary.html:11 templates/sectionsummary.html:53
+#: templates/sectionsummary.html:11 templates/sectionsummary.html:54
 msgid "Continue"
 msgstr ""
 
@@ -773,6 +773,10 @@ msgstr ""
 msgid "If you can’t answer questions for this person"
 msgstr ""
 
+#: templates/interstitial.html:32 templates/layouts/_questionnaire.html:26
+msgid "Save and continue"
+msgstr ""
+
 #: templates/introduction.html:10
 msgid "Introduction"
 msgstr ""
@@ -1053,10 +1057,6 @@ msgstr ""
 msgid "Hide"
 msgstr ""
 
-#: templates/layouts/_questionnaire.html:26
-msgid "Save and continue"
-msgstr ""
-
 #: templates/layouts/_questionnaire.html:37
 msgid "Choose another section and return to this later"
 msgstr ""
@@ -1326,7 +1326,7 @@ msgid "No answer provided"
 msgstr ""
 
 #: templates/partials/summary/collapsible-summary.html:36
-#: templates/partials/summary/list-summary.html:14
+#: templates/partials/summary/list-summary.html:10
 #: templates/partials/summary/summary.html:19
 msgid "Change"
 msgstr ""
@@ -1336,15 +1336,15 @@ msgstr ""
 msgid "Change your answer for:"
 msgstr ""
 
-#: templates/partials/summary/list-summary.html:15
+#: templates/partials/summary/list-summary.html:11
 msgid "Change details for {item_name}"
 msgstr ""
 
-#: templates/partials/summary/list-summary.html:16
+#: templates/partials/summary/list-summary.html:12
 msgid "Remove"
 msgstr ""
 
-#: templates/partials/summary/list-summary.html:17
+#: templates/partials/summary/list-summary.html:13
 msgid "Remove {item_name}"
 msgstr ""
 

templates/interstitial.html

@@ -23,4 +23,17 @@ <h1 class="question__title">{{ block.content.title }}</h1>
     {% set title = _("If you can’t answer questions for this person") %}
     {% include 'partials/individual-response-guidance.html' %}
   {% endif %}
+
 {% endblock form_content %}
+
+{% block submit_button %}
+    {{
+        onsButton({
+            "text": continue_button_text | default(_("Save and continue")),
+            "classes": "u-mt-l",
+            "attributes": {
+                "data-qa": "btn-submit"
+            }
+        })
+    }}
+{% endblock %}

templates/partials/summary/list-summary.html

@@ -1,43 +1,38 @@
 {% from "components/summary/_macro.njk" import onsSummary %}
 
-{% if list.editable %}
-  {{ onsSummary({
-    "withinQuestion": true,
-    "summaries": [
-      {
-        "groups": [
-          {
-            "headers": ["Name of person", "Action"],
-            "rows": map_list_collector_config(
-              list.list_items,
-              "person",
-              _("Change"),
-              _("Change details for {item_name}"),
-              _("Remove"),
-              _("Remove {item_name}")
-            ),
-          }
-        ]
-      }
-    ],
-    "classes": "u-mt-s u-mb-m"
-  }) }}
-{% else %}
+{% if list.list_items | length > 0 %}
+
+  {% if list.editable %}
+    {% set headers = ["Name of person", "Action"] %}
+    {% set rows = map_list_collector_config(
+      list.list_items,
+      "person",
+      _("Change"),
+      _("Change details for {item_name}"),
+      _("Remove"),
+      _("Remove {item_name}")
+    ) %}
+  {% else %}
+    {% set headers = ["Name of person"] %}
+    {% set rows = map_list_collector_config(
+      list.list_items,
+      "person"
+    ) %}
+  {% endif %}
+
   {{ onsSummary({
     "withinQuestion": true,
     "summaries": [
       {
         "groups": [
           {
-            "headers": ["Name of person"],
-            "rows": map_list_collector_config(
-              list.list_items,
-              "person"
-            ),
+            "headers": headers,
+            "rows": rows,
           }
         ]
       }
     ],
     "classes": "u-mt-s u-mb-m"
   }) }}
+
 {% endif %}

templates/sectionsummary.html

@@ -26,18 +26,19 @@ <h1>{{content.summary.title}}</h1>
     <h1>{{content.summary.title}}</h1>
     {% for summary in content.summary.custom_summary %}
       {% if summary.type == 'List' %}
-        <div data-qa="{{summary.list_name}}-list-summary">
+
+          <div {{'class="u-mb-l"' if not loop.last }} data-qa="{{summary.list_name}}-list-summary">
           <h2>{{summary.title}}</h2>
           {% if summary.list and summary.list.list_items %}
             {% set list = summary.list %}
             {% include 'partials/summary/list-summary.html' %}
           {% elif summary.empty_list_text %}
-            <div class="u-mb-s">
+            <div>
               {{ summary.empty_list_text }}
             </div>
           {% endif %}
           {% if summary.add_link %}
-            <div class="u-mb-l">
+            <div>
               <a data-qa="add-item-link" href="{{summary.add_link}}">{{summary.add_link_text}}</a>
             </div>
           {% endif %}