Merge pull request #3717 from alphagov/fix-nesting-in-content-page-sub-nav

Fix nesting in content page sub nav

app/assets/stylesheets/components/navigation.scss

@@ -179,6 +179,12 @@
     list-style: none;
     padding: 0;
     margin: 0;
+
+    ol,
+    ul {
+      margin-top: govuk-spacing(2);
+      border-top: 1px $grey-3 solid;
+    }
   }
 
   &__item {
@@ -199,6 +205,11 @@
 
     ol ol & {
       padding-left: govuk-spacing(6);
+
+      &:last-of-type {
+        border-bottom: none;
+        padding-bottom: 0;
+      }
     }
   }
 

app/templates/components/sub-navigation.html

@@ -7,22 +7,32 @@
     <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(item['link']) }}" itemprop="item">
       <span itemprop="name">{{item['name']}}</span>
     </a>
+    {% if caller %}
+      {{ caller() }}
+    {% endif %}
   </li>
 {% endmacro %}
 
+{% macro sub_navigation_item_sub_navigation(item) %}
+  <ol itemscope itemtype="http://schema.org/ItemList">
+    {% for sub_item in item.sub_navigation_items %}
+      {{ sub_navigation_item(sub_item) }}
+    {% endfor %}
+  </ol>
+{% endmacro %}
+
 {% macro sub_navigation(
   item_set
 ) %}
   <nav class="sub-navigation">
     <ol itemscope itemtype="http://schema.org/ItemList">
       {% for item in item_set %}
-        {{ sub_navigation_item(item) }}
         {% if item.sub_navigation_items %}
-          <ol itemscope itemtype="http://schema.org/ItemList">
+          {% call sub_navigation_item(item) %}
-            {% for sub_item in item.sub_navigation_items %}
+            {{ sub_navigation_item_sub_navigation(item) }}
-              {{ sub_navigation_item(sub_item) }}
+          {% endcall %}
-            {% endfor %}
+        {% else %}
-          </ol>
+          {{ sub_navigation_item(item) }}
         {% endif %}
       {% endfor %}
     </ol>