From 09ab1c3131179f801d66f9b66852dbd13360db78 Mon Sep 17 00:00:00 2001
From: PLanCompS <18308236+pdmosses@users.noreply.github.com>
Date: Mon, 28 Sep 2020 17:06:06 +0200
Subject: [PATCH] List children also when excluded from main navigation

- Limit the effect of `nav_exclude: true` to the main navigation.
- Include links to excluded pages in auto-generating lists of child pages
and in breadcrumbs.
- Refactor implementation by moving assignment of `first_level_url` and `second_level_url` from `_includes/nav.html` to `_layouts/default.html`.
- Clarify the effect of `nav_exclude` in the documentation.
---
 _includes/nav.html           | 19 +++++++++----------
 _layouts/default.html        | 15 +++++++++++++++
 docs/navigation-structure.md |  4 +++-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 976dbbd..325a68c 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,6 +1,5 @@
 <ul class="nav-list">
-  {%- assign included_pages = include.pages
-        | where_exp:"item", "item.nav_exclude != true"
+  {%- assign titled_pages = include.pages
         | where_exp:"item", "item.title != nil" -%}
 
   {%- comment -%}
@@ -15,9 +14,9 @@
     The case-sensitivity of string sorting is determined by `site.nav_sort`.
   {%- endcomment -%}
   
-  {%- assign string_ordered_pages = included_pages
+  {%- assign string_ordered_pages = titled_pages
         | where_exp:"item", "item.nav_order == nil" -%}
-  {%- assign nav_ordered_pages = included_pages
+  {%- assign nav_ordered_pages = titled_pages
         | where_exp:"item", "item.nav_order != nil"  -%}
 
   {%- comment -%}
@@ -60,10 +59,8 @@
   
   {%- for node in pages_list -%}
     {%- if node.parent == nil -%}
+      {%- unless node.nav_exclude -%}
       <li class="nav-list-item{% if page.url == node.url or page.parent == node.title or page.grand_parent == node.title %} active{% endif %}">
-        {%- if page.parent == node.title or page.grand_parent == node.title -%}
-          {%- assign first_level_url = node.url | absolute_url -%}
-        {%- endif -%}
         {%- if node.has_children -%}
           <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
         {%- endif -%}
@@ -72,10 +69,8 @@
           {%- assign children_list = pages_list | where: "parent", node.title -%}
           <ul class="nav-list ">
           {%- for child in children_list -%}
+            {%- unless child.nav_exclude -%}
             <li class="nav-list-item {% if page.url == child.url or page.parent == child.title %} active{% endif %}">
-              {%- if page.url == child.url or page.parent == child.title -%}
-                {%- assign second_level_url = child.url | absolute_url -%}
-              {%- endif -%}
               {%- if child.has_children -%}
                 <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
               {%- endif -%}
@@ -84,17 +79,21 @@
                 {%- assign grand_children_list = pages_list | where: "parent", child.title | where: "grand_parent", node.title -%}
                 <ul class="nav-list">
                 {%- for grand_child in grand_children_list -%}
+                  {%- unless grand_child.nav_exclude -%}
                   <li class="nav-list-item {% if page.url == grand_child.url %} active{% endif %}">
                     <a href="{{ grand_child.url | absolute_url }}" class="nav-list-link{% if page.url == grand_child.url %} active{% endif %}">{{ grand_child.title }}</a>
                   </li>
+                  {%- endunless -%}
                 {%- endfor -%}
                 </ul>
               {%- endif -%}
             </li>
+            {%- endunless -%}
           {%- endfor -%}
           </ul>
         {%- endif -%}
       </li>
+      {%- endunless -%}
     {%- endif -%}
   {%- endfor -%}
 </ul>
diff --git a/_layouts/default.html b/_layouts/default.html
index 442d44d..a92beb9 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -101,6 +101,21 @@ layout: table_wrappers
     <div id="main-content-wrap" class="main-content-wrap">
       {% unless page.url == "/" %}
         {% if page.parent %}
+          {%- for node in pages_list -%}
+            {%- if node.parent == nil -%}
+              {%- if page.parent == node.title or page.grand_parent == node.title -%}
+                {%- assign first_level_url = node.url | absolute_url -%}
+              {%- endif -%}
+              {%- if node.has_children -%}
+                {%- assign children_list = pages_list | where: "parent", node.title -%}
+                {%- for child in children_list -%}
+                  {%- if page.url == child.url or page.parent == child.title -%}
+                    {%- assign second_level_url = child.url | absolute_url -%}
+                  {%- endif -%}
+                {%- endfor -%}
+              {%- endif -%}
+            {%- endif -%}
+          {%- endfor -%}
           <nav aria-label="Breadcrumb" class="breadcrumb-nav">
             <ol class="breadcrumb-nav-list">
               {% if page.grand_parent %}
diff --git a/docs/navigation-structure.md b/docs/navigation-structure.md
index bb601d4..893a9b8 100644
--- a/docs/navigation-structure.md
+++ b/docs/navigation-structure.md
@@ -66,7 +66,9 @@ nav_exclude: true
 ---
 ```
 
-Pages with no `title` are automatically excluded from the navigation.
+The `nav_exclude` parameter does not affect the [auto-generating list of child pages](#auto-generating-table-of-contents), which you can use to access pages excluded from the main navigation.
+
+Pages with no `title` are automatically excluded from the navigation. 
 
 ---