Fix Paging

Author: rcosta358

_includes/components/nav/flattened.html

@@ -0,0 +1,31 @@
+{%- comment -%}
+  Include as: {%- include components/nav/flattened.html pages=page_array ancestors=title_array all=bool -%}
+  Depends on: include.pages, include.ancestors, include.all.
+  Includes: components/nav/children.html, components/nav/flattened.html.
+  Assigns to: nav_flattened_pages.
+  Overwrites:
+    node, nav_children, nav_ancestors, nav_flattened_before_children.
+{%- endcomment -%}
+
+{%- assign nav_flattened_pages = "" | split: "" -%}
+
+{%- for node in include.pages -%}
+  {%- if include.all == true or node.nav_exclude != true -%}
+    {%- assign nav_flattened_pages = nav_flattened_pages | push: node -%}
+
+    {%- unless include.ancestors contains node.title -%}
+      {%- include components/nav/children.html node=node ancestors=include.ancestors all=include.all -%}
+
+      {%- if nav_children.size >= 1 -%}
+        {%- if node.child_nav_order == 'desc' or node.child_nav_order == 'reversed' -%}
+          {%- assign nav_children = nav_children | reverse -%}
+        {%- endif -%}
+
+        {%- assign nav_ancestors = include.ancestors | push: node.title -%}
+        {%- assign nav_flattened_before_children = nav_flattened_pages -%}
+        {%- include components/nav/flattened.html pages=nav_children ancestors=nav_ancestors all=include.all -%}
+        {%- assign nav_flattened_pages = nav_flattened_before_children | concat: nav_flattened_pages -%}
+      {%- endif -%}
+    {%- endunless -%}
+  {%- endif -%}
+{%- endfor -%}

_includes/footer_custom.html

@@ -2,20 +2,14 @@
       | where_exp: "item", "item.title != nil"
       | where_exp: "item", "item.nav_exclude != true" -%}
 
-{%- if page.parent -%}
-  {%- assign pager_candidates = nav_pages | where: "parent", page.parent -%}
-  {%- if page.grand_parent -%}
-    {%- assign pager_candidates = pager_candidates | where: "grand_parent", page.grand_parent -%}
-  {%- endif -%}
-  {%- if page.ancestor -%}
-    {%- assign pager_candidates = pager_candidates | where: "ancestor", page.ancestor -%}
-  {%- endif -%}
-{%- else -%}
-  {%- assign pager_candidates = nav_pages | where_exp: "item", "item.parent == nil" -%}
-{%- endif -%}
-
-{%- include components/nav/sorted.html pages=pager_candidates -%}
-{%- assign pager_pages = nav_sorted -%}
+{%- assign nav_parenthood = nav_pages | group_by: "parent" -%}
+{%- assign nav_top_nodes = nav_parenthood
+      | where_exp: "item", "item.name == ''" | map: "items" | first -%}
+{%- include components/nav/sorted.html pages=nav_top_nodes -%}
+{%- assign nav_top_node_titles = nav_top_nodes | map: "title" -%}
+{%- assign nav_ancestors = "" | split: "" -%}
+{%- include components/nav/flattened.html pages=nav_sorted ancestors=nav_ancestors all=false -%}
+{%- assign pager_pages = nav_flattened_pages -%}
 
 {%- assign current_index = -1 -%}
 {%- for pager_page in pager_pages -%}