From aa247408e41ea9e26aa25c850fcdbcf25c8f12e0 Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Mon, 28 Sep 2020 12:08:27 +0200 Subject: [PATCH 1/5] Tests updated --- docs/tests/navigation/exclude/0.md | 13 ++++++++ docs/tests/navigation/exclude/00.md | 15 +++++++++ docs/tests/navigation/exclude/000.md | 17 ++++++++++ docs/tests/navigation/exclude/001.md | 17 ++++++++++ docs/tests/navigation/exclude/01.md | 15 +++++++++ docs/tests/navigation/exclude/010.md | 17 ++++++++++ docs/tests/navigation/exclude/011.md | 17 ++++++++++ docs/tests/navigation/exclude/1.md | 13 ++++++++ docs/tests/navigation/exclude/10.md | 15 +++++++++ docs/tests/navigation/exclude/100.md | 17 ++++++++++ docs/tests/navigation/exclude/101.md | 17 ++++++++++ docs/tests/navigation/exclude/11.md | 15 +++++++++ docs/tests/navigation/exclude/110.md | 17 ++++++++++ docs/tests/navigation/exclude/111.md | 17 ++++++++++ .../navigation/exclude/excluded-child.md | 15 --------- .../navigation/exclude/excluded-grandchild.md | 17 ---------- docs/tests/navigation/exclude/excluded.md | 15 --------- docs/tests/navigation/exclude/index.md | 32 +++++++++++++++++++ .../exclude/non-excluded-child-of-excluded.md | 15 --------- .../navigation/exclude/non-excluded-child.md | 16 ---------- .../non-excluded-grandchild-of-excluded.md | 17 ---------- .../exclude/non-excluded-grandchild.md | 17 ---------- docs/tests/navigation/exclude/non-excluded.md | 14 -------- docs/tests/navigation/exclude/untitled.md | 2 +- docs/tests/navigation/grandparent/index.md | 12 +++++++ docs/tests/navigation/index.md | 22 +------------ docs/tests/navigation/order/default/index.md | 2 +- docs/tests/navigation/order/floats/index.md | 2 +- docs/tests/navigation/order/index.md | 10 ++++-- docs/tests/navigation/order/integers/index.md | 2 +- docs/tests/navigation/order/mixture/index.md | 2 +- docs/tests/navigation/order/order.md | 7 ++++ docs/tests/navigation/order/strings/index.md | 2 +- 33 files changed, 288 insertions(+), 155 deletions(-) create mode 100644 docs/tests/navigation/exclude/0.md create mode 100644 docs/tests/navigation/exclude/00.md create mode 100644 docs/tests/navigation/exclude/000.md create mode 100644 docs/tests/navigation/exclude/001.md create mode 100644 docs/tests/navigation/exclude/01.md create mode 100644 docs/tests/navigation/exclude/010.md create mode 100644 docs/tests/navigation/exclude/011.md create mode 100644 docs/tests/navigation/exclude/1.md create mode 100644 docs/tests/navigation/exclude/10.md create mode 100644 docs/tests/navigation/exclude/100.md create mode 100644 docs/tests/navigation/exclude/101.md create mode 100644 docs/tests/navigation/exclude/11.md create mode 100644 docs/tests/navigation/exclude/110.md create mode 100644 docs/tests/navigation/exclude/111.md delete mode 100644 docs/tests/navigation/exclude/excluded-child.md delete mode 100644 docs/tests/navigation/exclude/excluded-grandchild.md delete mode 100644 docs/tests/navigation/exclude/excluded.md create mode 100644 docs/tests/navigation/exclude/index.md delete mode 100644 docs/tests/navigation/exclude/non-excluded-child-of-excluded.md delete mode 100644 docs/tests/navigation/exclude/non-excluded-child.md delete mode 100644 docs/tests/navigation/exclude/non-excluded-grandchild-of-excluded.md delete mode 100644 docs/tests/navigation/exclude/non-excluded-grandchild.md delete mode 100644 docs/tests/navigation/exclude/non-excluded.md create mode 100644 docs/tests/navigation/grandparent/index.md create mode 100644 docs/tests/navigation/order/order.md diff --git a/docs/tests/navigation/exclude/0.md b/docs/tests/navigation/exclude/0.md new file mode 100644 index 0000000..3e49590 --- /dev/null +++ b/docs/tests/navigation/exclude/0.md @@ -0,0 +1,13 @@ +--- +layout: default +title: "0" +has_children: true +nav_exclude: true +--- +# Tests for exclusion 0 + +```yaml +title: "0" +has_children: true +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/00.md b/docs/tests/navigation/exclude/00.md new file mode 100644 index 0000000..5353004 --- /dev/null +++ b/docs/tests/navigation/exclude/00.md @@ -0,0 +1,15 @@ +--- +layout: default +title: "00" +parent: "0" +has_children: true +nav_exclude: true +--- +# Tests for exclusion 00 + +```yaml +title: "00" +parent: "0" +has_children: true +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/000.md b/docs/tests/navigation/exclude/000.md new file mode 100644 index 0000000..fa34b83 --- /dev/null +++ b/docs/tests/navigation/exclude/000.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "000" +parent: "00" +grand_parent: "0" +has_children: false +nav_exclude: true +--- +# Tests for exclusion 000 + +```yaml +title: "000" +parent: "00" +grand_parent: "0" +has_children: false +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/001.md b/docs/tests/navigation/exclude/001.md new file mode 100644 index 0000000..823cfad --- /dev/null +++ b/docs/tests/navigation/exclude/001.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "001" +parent: "00" +grand_parent: "0" +has_children: false +nav_exclude: false +--- +# Tests for exclusion 001 + +```yaml +title: "001" +parent: "00" +grand_parent: "0" +has_children: false +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/01.md b/docs/tests/navigation/exclude/01.md new file mode 100644 index 0000000..499230e --- /dev/null +++ b/docs/tests/navigation/exclude/01.md @@ -0,0 +1,15 @@ +--- +layout: default +title: "01" +parent: "0" +has_children: true +nav_exclude: false +--- +# Tests for exclusion 01 + +```yaml +title: "01" +parent: "0" +has_children: true +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/010.md b/docs/tests/navigation/exclude/010.md new file mode 100644 index 0000000..01f498e --- /dev/null +++ b/docs/tests/navigation/exclude/010.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "010" +parent: "01" +grand_parent: "0" +has_children: false +nav_exclude: true +--- +# Tests for exclusion 010 + +```yaml +title: "010" +parent: "01" +grand_parent: "0" +has_children: false +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/011.md b/docs/tests/navigation/exclude/011.md new file mode 100644 index 0000000..e1413b3 --- /dev/null +++ b/docs/tests/navigation/exclude/011.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "011" +parent: "01" +grand_parent: "0" +has_children: false +nav_exclude: false +--- +# Tests for exclusion 011 + +```yaml +title: "011" +parent: "01" +grand_parent: "0" +has_children: false +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/1.md b/docs/tests/navigation/exclude/1.md new file mode 100644 index 0000000..4200f2c --- /dev/null +++ b/docs/tests/navigation/exclude/1.md @@ -0,0 +1,13 @@ +--- +layout: default +title: "1" +has_children: true +nav_exclude: false +--- +# Tests for exclusion 1 + +```yaml +title: "1" +has_children: true +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/10.md b/docs/tests/navigation/exclude/10.md new file mode 100644 index 0000000..c68339e --- /dev/null +++ b/docs/tests/navigation/exclude/10.md @@ -0,0 +1,15 @@ +--- +layout: default +title: "10" +parent: "1" +has_children: true +nav_exclude: true +--- +# Tests for exclusion 10 + +```yaml +title: "10" +parent: "1" +has_children: true +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/100.md b/docs/tests/navigation/exclude/100.md new file mode 100644 index 0000000..22d144e --- /dev/null +++ b/docs/tests/navigation/exclude/100.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "100" +parent: "10" +grand_parent: "1" +has_children: false +nav_exclude: true +--- +# Tests for exclusion 100 + +```yaml +title: "100" +parent: "10" +grand_parent: "1" +has_children: false +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/101.md b/docs/tests/navigation/exclude/101.md new file mode 100644 index 0000000..5f4a0ee --- /dev/null +++ b/docs/tests/navigation/exclude/101.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "101" +parent: "10" +grand_parent: "1" +has_children: false +nav_exclude: false +--- +# Tests for exclusion 101 + +```yaml +title: "101" +parent: "10" +grand_parent: "1" +has_children: false +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/11.md b/docs/tests/navigation/exclude/11.md new file mode 100644 index 0000000..6ec08b3 --- /dev/null +++ b/docs/tests/navigation/exclude/11.md @@ -0,0 +1,15 @@ +--- +layout: default +title: "11" +parent: "1" +has_children: true +nav_exclude: false +--- +# Tests for exclusion 11 + +```yaml +title: "11" +parent: "1" +has_children: true +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/110.md b/docs/tests/navigation/exclude/110.md new file mode 100644 index 0000000..a9e8610 --- /dev/null +++ b/docs/tests/navigation/exclude/110.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "110" +parent: "11" +grand_parent: "1" +has_children: false +nav_exclude: true +--- +# Tests for exclusion 110 + +```yaml +title: "110" +parent: "11" +grand_parent: "1" +has_children: false +nav_exclude: true +``` diff --git a/docs/tests/navigation/exclude/111.md b/docs/tests/navigation/exclude/111.md new file mode 100644 index 0000000..524ab89 --- /dev/null +++ b/docs/tests/navigation/exclude/111.md @@ -0,0 +1,17 @@ +--- +layout: default +title: "111" +parent: "11" +grand_parent: "1" +has_children: false +nav_exclude: false +--- +# Tests for exclusion 111 + +```yaml +title: "111" +parent: "11" +grand_parent: "1" +has_children: false +nav_exclude: false +``` diff --git a/docs/tests/navigation/exclude/excluded-child.md b/docs/tests/navigation/exclude/excluded-child.md deleted file mode 100644 index b7b4f9a..0000000 --- a/docs/tests/navigation/exclude/excluded-child.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -title: Excluded Child -parent: Not Excluded -nav_exclude: true ---- -# Excluded Child - -This child page is explicitly excluded, and should not appear in the navigation. - -```yaml -title: Excluded Child -parent: Not Excluded -nav_exclude: true -``` diff --git a/docs/tests/navigation/exclude/excluded-grandchild.md b/docs/tests/navigation/exclude/excluded-grandchild.md deleted file mode 100644 index 2e3eadf..0000000 --- a/docs/tests/navigation/exclude/excluded-grandchild.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -layout: default -title: Excluded Grandchild -parent: Non-excluded Child -grand_parent: Non-excluded -nav_exclude: true ---- -# Excluded Grandchild - -This grandchild page is explicitly excluded, and should not appear in the navigation. - -```yaml -title: Excluded Grandchild -parent: Non-excluded Child -grand_parent: Non-excluded -nav_exclude: true -``` diff --git a/docs/tests/navigation/exclude/excluded.md b/docs/tests/navigation/exclude/excluded.md deleted file mode 100644 index 50cebd3..0000000 --- a/docs/tests/navigation/exclude/excluded.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -title: Excluded -has_children: true -nav_exclude: true ---- -# Excluded - -This top-level page is explicitly excluded, and should not appear in the navigation. Any child pages are implicitly excluded. - -```yaml -title: Excluded -has_children: true -nav_exclude: true -``` diff --git a/docs/tests/navigation/exclude/index.md b/docs/tests/navigation/exclude/index.md new file mode 100644 index 0000000..cdeeaab --- /dev/null +++ b/docs/tests/navigation/exclude/index.md @@ -0,0 +1,32 @@ +--- +layout: default +title: Exclusion +parent: Navigation +grand_parent: Tests +--- + +# Tests for exclusion Exclusion + +## Tests for exclusion Included in main navigation + +- ["1"](1/) +- ["11"](11/) +- ["111"](111/) + +## Tests for exclusion Included only in child navigation + +- ["110"](110/) +- ["10"](10/) +- ["101"](101/) +- ["100"](100/) + +## Tests for exclusion Not included in navigation + +- ["0"](0/) +- ["01"](01/) +- ["011"](011/) +- ["010"](010/) +- ["00"](00/) +- ["001"](001/) +- ["000"](000/) +- ["Untitled"](untitled/) diff --git a/docs/tests/navigation/exclude/non-excluded-child-of-excluded.md b/docs/tests/navigation/exclude/non-excluded-child-of-excluded.md deleted file mode 100644 index efe478c..0000000 --- a/docs/tests/navigation/exclude/non-excluded-child-of-excluded.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -title: Non-excluded Child of Excluded -parent: Excluded -nav_exclude: false ---- -# Non-excluded Child of Excluded - -This child page is explicitly not excluded, but its parent page is excluded, so it should not appear in the navigation. - -```yaml -title: Non-excluded Child of Excluded -parent: Excluded -nav_exclude: false -``` diff --git a/docs/tests/navigation/exclude/non-excluded-child.md b/docs/tests/navigation/exclude/non-excluded-child.md deleted file mode 100644 index b7ec02d..0000000 --- a/docs/tests/navigation/exclude/non-excluded-child.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: default -title: Non-excluded Child -parent: Non-excluded -has_children: true -nav_exclude: false ---- -# Non-excluded Child - -This child page is explicitly not excluded, and should appear in the navigation. - -```yaml -title: Non-excluded Child -parent: Non-excluded -nav_exclude: false -``` diff --git a/docs/tests/navigation/exclude/non-excluded-grandchild-of-excluded.md b/docs/tests/navigation/exclude/non-excluded-grandchild-of-excluded.md deleted file mode 100644 index 8dc7720..0000000 --- a/docs/tests/navigation/exclude/non-excluded-grandchild-of-excluded.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -layout: default -title: Non-excluded Grandchild of Excluded -parent: Non-excluded Child -grand_parent: Excluded -nav_exclude: false ---- -# Non-excluded Grandchild of Excluded - -This grandchild page is explicitly not excluded, and neither is its parent page; but its grandparent page is excluded, so it should not appear in the navigation. - -```yaml -title: Non-excluded Grandchild of Excluded -parent: Non-excluded Child -grand_parent: Excluded -nav_exclude: false -``` diff --git a/docs/tests/navigation/exclude/non-excluded-grandchild.md b/docs/tests/navigation/exclude/non-excluded-grandchild.md deleted file mode 100644 index 6fc2dd1..0000000 --- a/docs/tests/navigation/exclude/non-excluded-grandchild.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -layout: default -title: Non-excluded Grandchild -parent: Non-excluded Child -grand_parent: Non-excluded -nav_exclude: false ---- -# Non-excluded Grandchild - -This grandchild page is explicitly not excluded, and neither is its parent page nor its grandparent page, so it should appear in the navigation. - -```yaml -title: Non-excluded Grandchild of Excluded -parent: Non-excluded Child -grand_parent: Excluded -nav_exclude: false -``` diff --git a/docs/tests/navigation/exclude/non-excluded.md b/docs/tests/navigation/exclude/non-excluded.md deleted file mode 100644 index 849c4f2..0000000 --- a/docs/tests/navigation/exclude/non-excluded.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default -title: Non-excluded -has_children: true -nav_exclude: false ---- -# Non-excluded - -This top-level page is explicitly not excluded, and should appear in the navigation. - -```yaml -title: Non-excluded -nav_exclude: false -``` diff --git a/docs/tests/navigation/exclude/untitled.md b/docs/tests/navigation/exclude/untitled.md index 8fcd544..d822889 100644 --- a/docs/tests/navigation/exclude/untitled.md +++ b/docs/tests/navigation/exclude/untitled.md @@ -1,6 +1,6 @@ --- layout: default --- -# Untitled +# Tests for exclusion Untitled This page does not have a `title`, and it is excluded from the navigation -- unless it is located in a Jekyll collection (which provides default titles). To exclude a title-less page from the navigation, regardless of whether it is located in a collection, set `nav_exclude: true`. diff --git a/docs/tests/navigation/grandparent/index.md b/docs/tests/navigation/grandparent/index.md new file mode 100644 index 0000000..980a38b --- /dev/null +++ b/docs/tests/navigation/grandparent/index.md @@ -0,0 +1,12 @@ +--- +layout: default +title: Parent disambiguation +parent: Navigation +grand_parent: Tests +--- + +# Parent disambiguation + +- [Page A](a/) has a child [page with title C](ca/), and a grandchild [page with title D](dca/). +- [Page B](b/) has a child [page with title C](cb/), and a grandchild [page with title D](dcb/). +- The grandchild pages specify their parent and grandparent pages, so there is no ambiguity. diff --git a/docs/tests/navigation/index.md b/docs/tests/navigation/index.md index 50587d8..90c6711 100644 --- a/docs/tests/navigation/index.md +++ b/docs/tests/navigation/index.md @@ -2,27 +2,7 @@ layout: default title: Navigation parent: Tests +has_children: true --- # Navigation - -## Parent page disambiguation - -- [Page A](grandparent/a/) has a child [page with title C](grandparent/ca/), and a grandchild [page with title D](grandparent/dca/). -- [Page B](grandparent/b/) has a child [page with title C](grandparent/cb/), and a grandchild [page with title D](grandparent/dcb/). -- The grandchild pages specify their parent and grandparent pages, so there is no ambiguity. - -## Page exclusion - -- An [untitled page](exclude/untitled/) is excluded from the navigation. -- An excluded [top level page](exclude/excluded/), [child page](exclude/excluded-child/), or [grandchild page](exclude/excluded-grandchild/) does not appear. -- A non-excluded [top level page](exclude/non-excluded/) appears; and a non-excluded [child page](exclude/non-excluded-child/) or [grandchild page](exclude/non-excluded-grandchild/) appears if its parent appears. -- A non-excluded child page or grandchild page does not appear if its parent is excluded. - -## Page order - -- [Default](order/default/), using `title` instead of `nav_order` fields. -- [Strings](order/strings/), lexicographically ordered, possibly case-insensitively. -- [Integers](order/integers/), numerically ordered. -- [Floats](order/floats/), numerically ordered. -- [Mixture](order/mixture/), with numbers before strings. diff --git a/docs/tests/navigation/order/default/index.md b/docs/tests/navigation/order/default/index.md index d672d77..3c9cd8f 100644 --- a/docs/tests/navigation/order/default/index.md +++ b/docs/tests/navigation/order/default/index.md @@ -1,7 +1,7 @@ --- layout: default title: Default -parent: Order +parent: Tests for navigation order nav_order: 1 has_children: true --- diff --git a/docs/tests/navigation/order/floats/index.md b/docs/tests/navigation/order/floats/index.md index 2a3db37..145ed50 100644 --- a/docs/tests/navigation/order/floats/index.md +++ b/docs/tests/navigation/order/floats/index.md @@ -1,7 +1,7 @@ --- layout: default title: Floats -parent: Order +parent: Tests for navigation order nav_order: 4 has_children: true --- diff --git a/docs/tests/navigation/order/index.md b/docs/tests/navigation/order/index.md index c1b488a..427cc93 100644 --- a/docs/tests/navigation/order/index.md +++ b/docs/tests/navigation/order/index.md @@ -1,8 +1,14 @@ --- layout: default title: Order -has_children: true -nav_order: 110 +parent: Navigation +grand_parent: Tests --- # Order + +- [Default](default/), using `title` instead of `nav_order` fields. +- [Strings](strings/), lexicographically ordered, possibly case-insensitively. +- [Integers](integers/), numerically ordered. +- [Floats](floats/), numerically ordered. +- [Mixture](mixture/), with numbers before strings. diff --git a/docs/tests/navigation/order/integers/index.md b/docs/tests/navigation/order/integers/index.md index 674c841..093944c 100644 --- a/docs/tests/navigation/order/integers/index.md +++ b/docs/tests/navigation/order/integers/index.md @@ -1,7 +1,7 @@ --- layout: default title: Integers -parent: Order +parent: Tests for navigation order nav_order: 3 has_children: true --- diff --git a/docs/tests/navigation/order/mixture/index.md b/docs/tests/navigation/order/mixture/index.md index 1d45bc7..5b25463 100644 --- a/docs/tests/navigation/order/mixture/index.md +++ b/docs/tests/navigation/order/mixture/index.md @@ -1,7 +1,7 @@ --- layout: default title: Mixture -parent: Order +parent: Tests for navigation order nav_order: 5 has_children: true --- diff --git a/docs/tests/navigation/order/order.md b/docs/tests/navigation/order/order.md new file mode 100644 index 0000000..2d8cebf --- /dev/null +++ b/docs/tests/navigation/order/order.md @@ -0,0 +1,7 @@ +--- +layout: default +title: Tests for order +has_children: true +--- + +# Order diff --git a/docs/tests/navigation/order/strings/index.md b/docs/tests/navigation/order/strings/index.md index 3eb5bc5..10d20fa 100644 --- a/docs/tests/navigation/order/strings/index.md +++ b/docs/tests/navigation/order/strings/index.md @@ -1,7 +1,7 @@ --- layout: default title: Strings -parent: Order +parent: Tests for navigation order nav_order: 2 has_children: true --- From 405180c8634ae7a8a8a3d8ff390f2edc3e102820 Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Mon, 28 Sep 2020 16:37:42 +0200 Subject: [PATCH 2/5] Reorganise tests Make the titles of test pages more suggestive. Refactor the documentation of the tests. --- docs/tests/navigation/exclude/0.md | 4 +-- docs/tests/navigation/exclude/00.md | 8 ++--- docs/tests/navigation/exclude/000.md | 12 +++---- docs/tests/navigation/exclude/001.md | 12 +++---- docs/tests/navigation/exclude/01.md | 8 ++--- docs/tests/navigation/exclude/010.md | 12 +++---- docs/tests/navigation/exclude/011.md | 12 +++---- docs/tests/navigation/exclude/1.md | 4 +-- docs/tests/navigation/exclude/10.md | 8 ++--- docs/tests/navigation/exclude/100.md | 12 +++---- docs/tests/navigation/exclude/101.md | 12 +++---- docs/tests/navigation/exclude/11.md | 8 ++--- docs/tests/navigation/exclude/110.md | 12 +++---- docs/tests/navigation/exclude/111.md | 12 +++---- docs/tests/navigation/exclude/index.md | 32 +++++++++++-------- docs/tests/navigation/grandparent/a.md | 4 +-- docs/tests/navigation/grandparent/b.md | 4 +-- docs/tests/navigation/grandparent/ca.md | 8 ++--- docs/tests/navigation/grandparent/cb.md | 8 ++--- docs/tests/navigation/grandparent/dca.md | 12 +++---- docs/tests/navigation/grandparent/dcb.md | 12 +++---- docs/tests/navigation/grandparent/index.md | 6 ++-- docs/tests/navigation/order/default/10.md | 4 +-- docs/tests/navigation/order/default/2.md | 4 +-- docs/tests/navigation/order/default/a.md | 4 +-- .../navigation/order/default/aa-lower.md | 4 +-- docs/tests/navigation/order/default/aa.md | 4 +-- docs/tests/navigation/order/default/index.md | 2 +- docs/tests/navigation/order/floats/-1.1.md | 4 +-- docs/tests/navigation/order/floats/0.0.md | 4 +-- docs/tests/navigation/order/floats/10.0.md | 4 +-- docs/tests/navigation/order/floats/2.2222.md | 4 +-- docs/tests/navigation/order/floats/index.md | 2 +- docs/tests/navigation/order/index.md | 2 ++ docs/tests/navigation/order/integers/-1.md | 4 +-- docs/tests/navigation/order/integers/0.md | 4 +-- docs/tests/navigation/order/integers/10.md | 4 +-- docs/tests/navigation/order/integers/2.md | 4 +-- docs/tests/navigation/order/integers/index.md | 2 +- docs/tests/navigation/order/mixture/-1.1.md | 4 +-- docs/tests/navigation/order/mixture/-1.md | 4 +-- docs/tests/navigation/order/mixture/0.0.md | 4 +-- docs/tests/navigation/order/mixture/0.md | 4 +-- docs/tests/navigation/order/mixture/10.0.md | 4 +-- docs/tests/navigation/order/mixture/10.md | 4 +-- docs/tests/navigation/order/mixture/2.2222.md | 4 +-- docs/tests/navigation/order/mixture/2.md | 4 +-- docs/tests/navigation/order/mixture/a.md | 4 +-- .../navigation/order/mixture/aa-lower.md | 4 +-- docs/tests/navigation/order/mixture/aa.md | 4 +-- docs/tests/navigation/order/mixture/index.md | 2 +- docs/tests/navigation/order/strings/10.md | 4 +-- docs/tests/navigation/order/strings/2.md | 4 +-- docs/tests/navigation/order/strings/a.md | 4 +-- .../navigation/order/strings/aa-lower.md | 4 +-- docs/tests/navigation/order/strings/aa.md | 4 +-- docs/tests/navigation/order/strings/index.md | 2 +- 57 files changed, 179 insertions(+), 171 deletions(-) diff --git a/docs/tests/navigation/exclude/0.md b/docs/tests/navigation/exclude/0.md index 3e49590..96634dd 100644 --- a/docs/tests/navigation/exclude/0.md +++ b/docs/tests/navigation/exclude/0.md @@ -1,13 +1,13 @@ --- layout: default -title: "0" +title: Tests for exclusion 0 has_children: true nav_exclude: true --- # Tests for exclusion 0 ```yaml -title: "0" +title: Tests for exclusion 0 has_children: true nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/00.md b/docs/tests/navigation/exclude/00.md index 5353004..44aadd1 100644 --- a/docs/tests/navigation/exclude/00.md +++ b/docs/tests/navigation/exclude/00.md @@ -1,15 +1,15 @@ --- layout: default -title: "00" -parent: "0" +title: Tests for exclusion 00 +parent: Tests for exclusion 0 has_children: true nav_exclude: true --- # Tests for exclusion 00 ```yaml -title: "00" -parent: "0" +title: Tests for exclusion 00 +parent: Tests for exclusion 0 has_children: true nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/000.md b/docs/tests/navigation/exclude/000.md index fa34b83..5846671 100644 --- a/docs/tests/navigation/exclude/000.md +++ b/docs/tests/navigation/exclude/000.md @@ -1,17 +1,17 @@ --- layout: default -title: "000" -parent: "00" -grand_parent: "0" +title: Tests for exclusion 000 +parent: Tests for exclusion 00 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: true --- # Tests for exclusion 000 ```yaml -title: "000" -parent: "00" -grand_parent: "0" +title: Tests for exclusion 000 +parent: Tests for exclusion 00 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/001.md b/docs/tests/navigation/exclude/001.md index 823cfad..3afe961 100644 --- a/docs/tests/navigation/exclude/001.md +++ b/docs/tests/navigation/exclude/001.md @@ -1,17 +1,17 @@ --- layout: default -title: "001" -parent: "00" -grand_parent: "0" +title: Tests for exclusion 001 +parent: Tests for exclusion 00 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: false --- # Tests for exclusion 001 ```yaml -title: "001" -parent: "00" -grand_parent: "0" +title: Tests for exclusion 001 +parent: Tests for exclusion 00 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/01.md b/docs/tests/navigation/exclude/01.md index 499230e..0855b2c 100644 --- a/docs/tests/navigation/exclude/01.md +++ b/docs/tests/navigation/exclude/01.md @@ -1,15 +1,15 @@ --- layout: default -title: "01" -parent: "0" +title: Tests for exclusion 01 +parent: Tests for exclusion 0 has_children: true nav_exclude: false --- # Tests for exclusion 01 ```yaml -title: "01" -parent: "0" +title: Tests for exclusion 01 +parent: Tests for exclusion 0 has_children: true nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/010.md b/docs/tests/navigation/exclude/010.md index 01f498e..c9944ed 100644 --- a/docs/tests/navigation/exclude/010.md +++ b/docs/tests/navigation/exclude/010.md @@ -1,17 +1,17 @@ --- layout: default -title: "010" -parent: "01" -grand_parent: "0" +title: Tests for exclusion 010 +parent: Tests for exclusion 01 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: true --- # Tests for exclusion 010 ```yaml -title: "010" -parent: "01" -grand_parent: "0" +title: Tests for exclusion 010 +parent: Tests for exclusion 01 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/011.md b/docs/tests/navigation/exclude/011.md index e1413b3..f8359b4 100644 --- a/docs/tests/navigation/exclude/011.md +++ b/docs/tests/navigation/exclude/011.md @@ -1,17 +1,17 @@ --- layout: default -title: "011" -parent: "01" -grand_parent: "0" +title: Tests for exclusion 011 +parent: Tests for exclusion 01 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: false --- # Tests for exclusion 011 ```yaml -title: "011" -parent: "01" -grand_parent: "0" +title: Tests for exclusion 011 +parent: Tests for exclusion 01 +grand_parent: Tests for exclusion 0 has_children: false nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/1.md b/docs/tests/navigation/exclude/1.md index 4200f2c..0b6bff8 100644 --- a/docs/tests/navigation/exclude/1.md +++ b/docs/tests/navigation/exclude/1.md @@ -1,13 +1,13 @@ --- layout: default -title: "1" +title: Tests for exclusion 1 has_children: true nav_exclude: false --- # Tests for exclusion 1 ```yaml -title: "1" +title: Tests for exclusion 1 has_children: true nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/10.md b/docs/tests/navigation/exclude/10.md index c68339e..624d115 100644 --- a/docs/tests/navigation/exclude/10.md +++ b/docs/tests/navigation/exclude/10.md @@ -1,15 +1,15 @@ --- layout: default -title: "10" -parent: "1" +title: Tests for exclusion 10 +parent: Tests for exclusion 1 has_children: true nav_exclude: true --- # Tests for exclusion 10 ```yaml -title: "10" -parent: "1" +title: Tests for exclusion 10 +parent: Tests for exclusion 1 has_children: true nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/100.md b/docs/tests/navigation/exclude/100.md index 22d144e..89a8090 100644 --- a/docs/tests/navigation/exclude/100.md +++ b/docs/tests/navigation/exclude/100.md @@ -1,17 +1,17 @@ --- layout: default -title: "100" -parent: "10" -grand_parent: "1" +title: Tests for exclusion 100 +parent: Tests for exclusion 10 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: true --- # Tests for exclusion 100 ```yaml -title: "100" -parent: "10" -grand_parent: "1" +title: Tests for exclusion 100 +parent: Tests for exclusion 10 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/101.md b/docs/tests/navigation/exclude/101.md index 5f4a0ee..240dac7 100644 --- a/docs/tests/navigation/exclude/101.md +++ b/docs/tests/navigation/exclude/101.md @@ -1,17 +1,17 @@ --- layout: default -title: "101" -parent: "10" -grand_parent: "1" +title: Tests for exclusion 101 +parent: Tests for exclusion 10 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: false --- # Tests for exclusion 101 ```yaml -title: "101" -parent: "10" -grand_parent: "1" +title: Tests for exclusion 101 +parent: Tests for exclusion 10 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/11.md b/docs/tests/navigation/exclude/11.md index 6ec08b3..04cef63 100644 --- a/docs/tests/navigation/exclude/11.md +++ b/docs/tests/navigation/exclude/11.md @@ -1,15 +1,15 @@ --- layout: default -title: "11" -parent: "1" +title: Tests for exclusion 11 +parent: Tests for exclusion 1 has_children: true nav_exclude: false --- # Tests for exclusion 11 ```yaml -title: "11" -parent: "1" +title: Tests for exclusion 11 +parent: Tests for exclusion 1 has_children: true nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/110.md b/docs/tests/navigation/exclude/110.md index a9e8610..7c24237 100644 --- a/docs/tests/navigation/exclude/110.md +++ b/docs/tests/navigation/exclude/110.md @@ -1,17 +1,17 @@ --- layout: default -title: "110" -parent: "11" -grand_parent: "1" +title: Tests for exclusion 110 +parent: Tests for exclusion 11 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: true --- # Tests for exclusion 110 ```yaml -title: "110" -parent: "11" -grand_parent: "1" +title: Tests for exclusion 110 +parent: Tests for exclusion 11 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: true ``` diff --git a/docs/tests/navigation/exclude/111.md b/docs/tests/navigation/exclude/111.md index 524ab89..230b55b 100644 --- a/docs/tests/navigation/exclude/111.md +++ b/docs/tests/navigation/exclude/111.md @@ -1,17 +1,17 @@ --- layout: default -title: "111" -parent: "11" -grand_parent: "1" +title: Tests for exclusion 111 +parent: Tests for exclusion 11 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: false --- # Tests for exclusion 111 ```yaml -title: "111" -parent: "11" -grand_parent: "1" +title: Tests for exclusion 111 +parent: Tests for exclusion 11 +grand_parent: Tests for exclusion 1 has_children: false nav_exclude: false ``` diff --git a/docs/tests/navigation/exclude/index.md b/docs/tests/navigation/exclude/index.md index cdeeaab..7ea374d 100644 --- a/docs/tests/navigation/exclude/index.md +++ b/docs/tests/navigation/exclude/index.md @@ -7,26 +7,30 @@ grand_parent: Tests # Tests for exclusion Exclusion +Pages excluded from the main navigation can have parents and children. Navigation to and between excluded pages can be supported by the auto-generating list of child pages inserted at the bottom of each page, and by links to parents in the breadcrumbs at the top of each page. + +The following tests cover all combinations of excluded and included pages for the top level, child pages, and grandchild pages. The last binary digit in a page title indicates whether the page is included (1) or excluded (0); preceding digits refer to its parent and grandparent. + ## Tests for exclusion Included in main navigation -- ["1"](1/) -- ["11"](11/) -- ["111"](111/) +- [Tests for exclusion 1](1/) +- [Tests for exclusion 11](11/) +- [Tests for exclusion 111](111/) ## Tests for exclusion Included only in child navigation -- ["110"](110/) -- ["10"](10/) -- ["101"](101/) -- ["100"](100/) +- [Tests for exclusion 110](110/) +- [Tests for exclusion 10](10/) +- [Tests for exclusion 101](101/) +- [Tests for exclusion 100](100/) ## Tests for exclusion Not included in navigation -- ["0"](0/) -- ["01"](01/) -- ["011"](011/) -- ["010"](010/) -- ["00"](00/) -- ["001"](001/) -- ["000"](000/) +- [Tests for exclusion 0](0/) +- [Tests for exclusion 01](01/) +- [Tests for exclusion 011](011/) +- [Tests for exclusion 010](010/) +- [Tests for exclusion 00](00/) +- [Tests for exclusion 001](001/) +- [Tests for exclusion 000](000/) - ["Untitled"](untitled/) diff --git a/docs/tests/navigation/grandparent/a.md b/docs/tests/navigation/grandparent/a.md index 23bed50..b680fe6 100644 --- a/docs/tests/navigation/grandparent/a.md +++ b/docs/tests/navigation/grandparent/a.md @@ -1,6 +1,6 @@ --- layout: default -title: A +title: Tests for disambiguation A has_children: true --- @@ -9,6 +9,6 @@ has_children: true A top-level page ```yaml -title: A +title: Tests for disambiguation A has_children: true ``` diff --git a/docs/tests/navigation/grandparent/b.md b/docs/tests/navigation/grandparent/b.md index 7973bf0..23403e8 100644 --- a/docs/tests/navigation/grandparent/b.md +++ b/docs/tests/navigation/grandparent/b.md @@ -1,6 +1,6 @@ --- layout: default -title: B +title: Tests for disambiguation B has_children: true --- @@ -9,6 +9,6 @@ has_children: true A top-level page ```yaml -title: B +title: Tests for disambiguation B has_children: true ``` diff --git a/docs/tests/navigation/grandparent/ca.md b/docs/tests/navigation/grandparent/ca.md index 525428e..e645044 100644 --- a/docs/tests/navigation/grandparent/ca.md +++ b/docs/tests/navigation/grandparent/ca.md @@ -1,7 +1,7 @@ --- layout: default -title: C -parent: A +title: Tests for disambiguation C +parent: Tests for disambiguation A has_children: true --- @@ -10,7 +10,7 @@ has_children: true A child of page A, and parent of page D ```yaml -title: C -parent: A +title: Tests for disambiguation C +parent: Tests for disambiguation A has_children: true ``` diff --git a/docs/tests/navigation/grandparent/cb.md b/docs/tests/navigation/grandparent/cb.md index 1baa41b..d15844f 100644 --- a/docs/tests/navigation/grandparent/cb.md +++ b/docs/tests/navigation/grandparent/cb.md @@ -1,7 +1,7 @@ --- layout: default -title: C -parent: B +title: Tests for disambiguation C +parent: Tests for disambiguation B has_children: true --- @@ -10,7 +10,7 @@ has_children: true A child of page B, and parent of page D ```yaml -title: C -parent: B +title: Tests for disambiguation C +parent: Tests for disambiguation B has_children: true ``` diff --git a/docs/tests/navigation/grandparent/dca.md b/docs/tests/navigation/grandparent/dca.md index 5ff7584..c01dbbb 100644 --- a/docs/tests/navigation/grandparent/dca.md +++ b/docs/tests/navigation/grandparent/dca.md @@ -1,8 +1,8 @@ --- layout: default -title: D -parent: C -grand_parent: A +title: Tests for disambiguation D +parent: Tests for disambiguation C +grand_parent: Tests for disambiguation A --- # D @@ -10,7 +10,7 @@ grand_parent: A A grandchild of page A ```yaml -title: D -parent: C -grand_parent: A +title: Tests for disambiguation D +parent: Tests for disambiguation C +grand_parent: Tests for disambiguation A ``` diff --git a/docs/tests/navigation/grandparent/dcb.md b/docs/tests/navigation/grandparent/dcb.md index 567025d..f80d83d 100644 --- a/docs/tests/navigation/grandparent/dcb.md +++ b/docs/tests/navigation/grandparent/dcb.md @@ -1,8 +1,8 @@ --- layout: default -title: D -parent: C -grand_parent: B +title: Tests for disambiguation D +parent: Tests for disambiguation C +grand_parent: Tests for disambiguation B --- # D @@ -10,7 +10,7 @@ grand_parent: B A grandchild of page B ```yaml -title: D -parent: C -grand_parent: B +title: Tests for disambiguation D +parent: Tests for disambiguation C +grand_parent: Tests for disambiguation B ``` diff --git a/docs/tests/navigation/grandparent/index.md b/docs/tests/navigation/grandparent/index.md index 980a38b..3d8f799 100644 --- a/docs/tests/navigation/grandparent/index.md +++ b/docs/tests/navigation/grandparent/index.md @@ -1,11 +1,13 @@ --- layout: default -title: Parent disambiguation +title: Disambiguation parent: Navigation grand_parent: Tests --- -# Parent disambiguation +# Disambiguation + +When different pages with children have the same title, referencing the relevant grandparent in the children disambiguates which page is intended. - [Page A](a/) has a child [page with title C](ca/), and a grandchild [page with title D](dca/). - [Page B](b/) has a child [page with title C](cb/), and a grandchild [page with title D](dcb/). diff --git a/docs/tests/navigation/order/default/10.md b/docs/tests/navigation/order/default/10.md index bd6fbb8..7e1d82a 100644 --- a/docs/tests/navigation/order/default/10.md +++ b/docs/tests/navigation/order/default/10.md @@ -2,7 +2,7 @@ layout: default title: "10" parent: Default -grand_parent: Order +grand_parent: Tests for order --- # 10 @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: "10" parent: Default -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/default/2.md b/docs/tests/navigation/order/default/2.md index 5e2792b..158f49a 100644 --- a/docs/tests/navigation/order/default/2.md +++ b/docs/tests/navigation/order/default/2.md @@ -2,7 +2,7 @@ layout: default title: "2" parent: Default -grand_parent: Order +grand_parent: Tests for order --- # 2 @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: "2" parent: Default -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/default/a.md b/docs/tests/navigation/order/default/a.md index a122e97..bd7e347 100644 --- a/docs/tests/navigation/order/default/a.md +++ b/docs/tests/navigation/order/default/a.md @@ -2,7 +2,7 @@ layout: default title: A parent: Default -grand_parent: Order +grand_parent: Tests for order --- # A @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: A parent: Default -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/default/aa-lower.md b/docs/tests/navigation/order/default/aa-lower.md index 43957d6..295ed08 100644 --- a/docs/tests/navigation/order/default/aa-lower.md +++ b/docs/tests/navigation/order/default/aa-lower.md @@ -2,7 +2,7 @@ layout: default title: aa parent: Default -grand_parent: Order +grand_parent: Tests for order --- # aa @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: aa parent: Default -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/default/aa.md b/docs/tests/navigation/order/default/aa.md index 081bcfc..f100030 100644 --- a/docs/tests/navigation/order/default/aa.md +++ b/docs/tests/navigation/order/default/aa.md @@ -2,7 +2,7 @@ layout: default title: Aa parent: Default -grand_parent: Order +grand_parent: Tests for order --- # Aa @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: Aa parent: Default -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/default/index.md b/docs/tests/navigation/order/default/index.md index 3c9cd8f..c276bb3 100644 --- a/docs/tests/navigation/order/default/index.md +++ b/docs/tests/navigation/order/default/index.md @@ -1,7 +1,7 @@ --- layout: default title: Default -parent: Tests for navigation order +parent: Tests for order nav_order: 1 has_children: true --- diff --git a/docs/tests/navigation/order/floats/-1.1.md b/docs/tests/navigation/order/floats/-1.1.md index 3466e76..ee040c8 100644 --- a/docs/tests/navigation/order/floats/-1.1.md +++ b/docs/tests/navigation/order/floats/-1.1.md @@ -3,7 +3,7 @@ layout: default title: "-1.1" nav_order: -1.1 parent: Floats -grand_parent: Order +grand_parent: Tests for order --- # -1.1 @@ -12,5 +12,5 @@ grand_parent: Order title: "-1.1" nav_order: -1.1 parent: Floats -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/floats/0.0.md b/docs/tests/navigation/order/floats/0.0.md index 6c545ba..f5e516d 100644 --- a/docs/tests/navigation/order/floats/0.0.md +++ b/docs/tests/navigation/order/floats/0.0.md @@ -3,7 +3,7 @@ layout: default title: "0.0" nav_order: 0.0 parent: Floats -grand_parent: Order +grand_parent: Tests for order --- # 0.0 @@ -12,5 +12,5 @@ grand_parent: Order title: "0.0" nav_order: 0.0 parent: Floats -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/floats/10.0.md b/docs/tests/navigation/order/floats/10.0.md index fc648c4..797f81d 100644 --- a/docs/tests/navigation/order/floats/10.0.md +++ b/docs/tests/navigation/order/floats/10.0.md @@ -3,7 +3,7 @@ layout: default title: "10.0" nav_order: 10.0 parent: Floats -grand_parent: Order +grand_parent: Tests for order --- # 10.0 @@ -12,5 +12,5 @@ grand_parent: Order title: "10.0" nav_order: 10.0 parent: Floats -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/floats/2.2222.md b/docs/tests/navigation/order/floats/2.2222.md index 8050d7b..8910946 100644 --- a/docs/tests/navigation/order/floats/2.2222.md +++ b/docs/tests/navigation/order/floats/2.2222.md @@ -3,7 +3,7 @@ layout: default title: "2.2222" nav_order: 2.2222 parent: Floats -grand_parent: Order +grand_parent: Tests for order --- # 2.2222 @@ -12,5 +12,5 @@ grand_parent: Order title: "2.2222" nav_order: 2.2222 parent: Floats -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/floats/index.md b/docs/tests/navigation/order/floats/index.md index 145ed50..2846629 100644 --- a/docs/tests/navigation/order/floats/index.md +++ b/docs/tests/navigation/order/floats/index.md @@ -1,7 +1,7 @@ --- layout: default title: Floats -parent: Tests for navigation order +parent: Tests for order nav_order: 4 has_children: true --- diff --git a/docs/tests/navigation/order/index.md b/docs/tests/navigation/order/index.md index 427cc93..9dbff4a 100644 --- a/docs/tests/navigation/order/index.md +++ b/docs/tests/navigation/order/index.md @@ -7,6 +7,8 @@ grand_parent: Tests # Order +The value of `nav_order` can be numbers (integers, floats) and/or strings. The following tests illustrate their effects. + - [Default](default/), using `title` instead of `nav_order` fields. - [Strings](strings/), lexicographically ordered, possibly case-insensitively. - [Integers](integers/), numerically ordered. diff --git a/docs/tests/navigation/order/integers/-1.md b/docs/tests/navigation/order/integers/-1.md index 5b6e229..8b1444e 100644 --- a/docs/tests/navigation/order/integers/-1.md +++ b/docs/tests/navigation/order/integers/-1.md @@ -3,7 +3,7 @@ layout: default title: "-1" nav_order: -1 parent: Integers -grand_parent: Order +grand_parent: Tests for order --- # -1 @@ -12,5 +12,5 @@ grand_parent: Order title: "-1" nav_order: -1 parent: Integers -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/integers/0.md b/docs/tests/navigation/order/integers/0.md index f97f599..21b1327 100644 --- a/docs/tests/navigation/order/integers/0.md +++ b/docs/tests/navigation/order/integers/0.md @@ -3,7 +3,7 @@ layout: default title: "0" nav_order: 0 parent: Integers -grand_parent: Order +grand_parent: Tests for order --- # 0 @@ -12,5 +12,5 @@ grand_parent: Order title: "0" nav_order: 0 parent: Integers -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/integers/10.md b/docs/tests/navigation/order/integers/10.md index 181bffb..4157151 100644 --- a/docs/tests/navigation/order/integers/10.md +++ b/docs/tests/navigation/order/integers/10.md @@ -3,7 +3,7 @@ layout: default title: "10" nav_order: 10 parent: Integers -grand_parent: Order +grand_parent: Tests for order --- # 10 @@ -12,5 +12,5 @@ grand_parent: Order title: "10" nav_order: 10 parent: Integers -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/integers/2.md b/docs/tests/navigation/order/integers/2.md index 51c76c7..2ebb1ca 100644 --- a/docs/tests/navigation/order/integers/2.md +++ b/docs/tests/navigation/order/integers/2.md @@ -3,7 +3,7 @@ layout: default title: "2" nav_order: 2 parent: Integers -grand_parent: Order +grand_parent: Tests for order --- # 2 @@ -12,5 +12,5 @@ grand_parent: Order title: "2" nav_order: 2 parent: Integers -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/integers/index.md b/docs/tests/navigation/order/integers/index.md index 093944c..077cdc5 100644 --- a/docs/tests/navigation/order/integers/index.md +++ b/docs/tests/navigation/order/integers/index.md @@ -1,7 +1,7 @@ --- layout: default title: Integers -parent: Tests for navigation order +parent: Tests for order nav_order: 3 has_children: true --- diff --git a/docs/tests/navigation/order/mixture/-1.1.md b/docs/tests/navigation/order/mixture/-1.1.md index 60b8a60..668d642 100644 --- a/docs/tests/navigation/order/mixture/-1.1.md +++ b/docs/tests/navigation/order/mixture/-1.1.md @@ -3,7 +3,7 @@ layout: default title: "-1.1" nav_order: -1.1 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # -1.1 @@ -12,5 +12,5 @@ grand_parent: Order title: "-1.1" nav_order: -1.1 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/-1.md b/docs/tests/navigation/order/mixture/-1.md index 81c247f..e1c5a12 100644 --- a/docs/tests/navigation/order/mixture/-1.md +++ b/docs/tests/navigation/order/mixture/-1.md @@ -3,7 +3,7 @@ layout: default title: "-1" nav_order: -1 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # -1 @@ -12,5 +12,5 @@ grand_parent: Order title: "-1" nav_order: -1 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/0.0.md b/docs/tests/navigation/order/mixture/0.0.md index 46ea906..a2006d8 100644 --- a/docs/tests/navigation/order/mixture/0.0.md +++ b/docs/tests/navigation/order/mixture/0.0.md @@ -3,7 +3,7 @@ layout: default title: "0.0" nav_order: 0.0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 0.0 @@ -12,5 +12,5 @@ grand_parent: Order title: "0.0" nav_order: 0.0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/0.md b/docs/tests/navigation/order/mixture/0.md index 5fb96d8..14f137f 100644 --- a/docs/tests/navigation/order/mixture/0.md +++ b/docs/tests/navigation/order/mixture/0.md @@ -3,7 +3,7 @@ layout: default title: "0" nav_order: 0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 0 @@ -12,5 +12,5 @@ grand_parent: Order title: "0" nav_order: 0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/10.0.md b/docs/tests/navigation/order/mixture/10.0.md index 4f137a8..70308a6 100644 --- a/docs/tests/navigation/order/mixture/10.0.md +++ b/docs/tests/navigation/order/mixture/10.0.md @@ -3,7 +3,7 @@ layout: default title: "10.0" nav_order: 10.0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 10.0 @@ -12,5 +12,5 @@ grand_parent: Order title: "10.0" nav_order: 10.0 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/10.md b/docs/tests/navigation/order/mixture/10.md index 03c7c88..542ae3f 100644 --- a/docs/tests/navigation/order/mixture/10.md +++ b/docs/tests/navigation/order/mixture/10.md @@ -2,7 +2,7 @@ layout: default title: "10" parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 10 @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: "10" parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/2.2222.md b/docs/tests/navigation/order/mixture/2.2222.md index b8d74fb..2520d51 100644 --- a/docs/tests/navigation/order/mixture/2.2222.md +++ b/docs/tests/navigation/order/mixture/2.2222.md @@ -3,7 +3,7 @@ layout: default title: "2.2222" nav_order: 2.2222 parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 2.2222 @@ -12,5 +12,5 @@ grand_parent: Order title: "2.2222" nav_order: 2.2222 parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/2.md b/docs/tests/navigation/order/mixture/2.md index 22e118b..2ae4553 100644 --- a/docs/tests/navigation/order/mixture/2.md +++ b/docs/tests/navigation/order/mixture/2.md @@ -2,7 +2,7 @@ layout: default title: "2" parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # 2 @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: "2" parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/a.md b/docs/tests/navigation/order/mixture/a.md index 8d36765..342b05f 100644 --- a/docs/tests/navigation/order/mixture/a.md +++ b/docs/tests/navigation/order/mixture/a.md @@ -2,7 +2,7 @@ layout: default title: A parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # A @@ -10,5 +10,5 @@ grand_parent: Order ```yaml title: A parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/aa-lower.md b/docs/tests/navigation/order/mixture/aa-lower.md index 12a8631..2d63985 100644 --- a/docs/tests/navigation/order/mixture/aa-lower.md +++ b/docs/tests/navigation/order/mixture/aa-lower.md @@ -3,7 +3,7 @@ layout: default title: aa nav_order: "aa" parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # aa @@ -12,5 +12,5 @@ grand_parent: Order title: aa nav_order: "aa" parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/aa.md b/docs/tests/navigation/order/mixture/aa.md index d826339..69cf05f 100644 --- a/docs/tests/navigation/order/mixture/aa.md +++ b/docs/tests/navigation/order/mixture/aa.md @@ -3,7 +3,7 @@ layout: default title: Aa nav_order: "Aa" parent: Mixture -grand_parent: Order +grand_parent: Tests for order --- # Aa @@ -12,5 +12,5 @@ grand_parent: Order title: Aa nav_order: "Aa" parent: Mixture -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/mixture/index.md b/docs/tests/navigation/order/mixture/index.md index 5b25463..24317b2 100644 --- a/docs/tests/navigation/order/mixture/index.md +++ b/docs/tests/navigation/order/mixture/index.md @@ -1,7 +1,7 @@ --- layout: default title: Mixture -parent: Tests for navigation order +parent: Tests for order nav_order: 5 has_children: true --- diff --git a/docs/tests/navigation/order/strings/10.md b/docs/tests/navigation/order/strings/10.md index 4bc8b59..6c3e480 100644 --- a/docs/tests/navigation/order/strings/10.md +++ b/docs/tests/navigation/order/strings/10.md @@ -3,7 +3,7 @@ layout: default title: "10" nav_order: "10" parent: Strings -grand_parent: Order +grand_parent: Tests for order --- # 10 @@ -12,5 +12,5 @@ grand_parent: Order title: "10" nav_order: "10" parent: Strings -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/strings/2.md b/docs/tests/navigation/order/strings/2.md index be13a98..0c96c32 100644 --- a/docs/tests/navigation/order/strings/2.md +++ b/docs/tests/navigation/order/strings/2.md @@ -3,7 +3,7 @@ layout: default title: "2" nav_order: "2" parent: Strings -grand_parent: Order +grand_parent: Tests for order --- # 2 @@ -12,5 +12,5 @@ grand_parent: Order title: "2" nav_order: "2" parent: Strings -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/strings/a.md b/docs/tests/navigation/order/strings/a.md index 71dd447..ac1f3bd 100644 --- a/docs/tests/navigation/order/strings/a.md +++ b/docs/tests/navigation/order/strings/a.md @@ -3,7 +3,7 @@ layout: default title: A nav_order: A parent: Strings -grand_parent: Order +grand_parent: Tests for order --- # A @@ -12,5 +12,5 @@ grand_parent: Order title: A nav_order: A parent: Strings -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/strings/aa-lower.md b/docs/tests/navigation/order/strings/aa-lower.md index ea9c10b..0cbb0b2 100644 --- a/docs/tests/navigation/order/strings/aa-lower.md +++ b/docs/tests/navigation/order/strings/aa-lower.md @@ -3,7 +3,7 @@ layout: default title: aa nav_order: "aa" parent: Strings -grand_parent: Order +grand_parent: Tests for order --- # aa @@ -12,5 +12,5 @@ grand_parent: Order title: aa nav_order: "aa" parent: Strings -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/strings/aa.md b/docs/tests/navigation/order/strings/aa.md index 1daeb04..6eaf7a2 100644 --- a/docs/tests/navigation/order/strings/aa.md +++ b/docs/tests/navigation/order/strings/aa.md @@ -3,7 +3,7 @@ layout: default title: Aa nav_order: "Aa" parent: Strings -grand_parent: Order +grand_parent: Tests for order --- # Aa @@ -12,5 +12,5 @@ grand_parent: Order title: Aa nav_order: "Aa" parent: Strings -grand_parent: Order +grand_parent: Tests for order ``` diff --git a/docs/tests/navigation/order/strings/index.md b/docs/tests/navigation/order/strings/index.md index 10d20fa..404e3a8 100644 --- a/docs/tests/navigation/order/strings/index.md +++ b/docs/tests/navigation/order/strings/index.md @@ -1,7 +1,7 @@ --- layout: default title: Strings -parent: Tests for navigation order +parent: Tests for order nav_order: 2 has_children: true --- From 682dcf4ec1327eead0f417a58f49c016e08e7e4b Mon Sep 17 00:00:00 2001 From: PLanCompS <18308236+pdmosses@users.noreply.github.com> Date: Mon, 28 Sep 2020 16:54:07 +0200 Subject: [PATCH 3/5] Folders renamed Improve folder names. Correct classification of excluded test pages. --- .../{grandparent => disambiguation}/a.md | 0 .../{grandparent => disambiguation}/b.md | 0 .../{grandparent => disambiguation}/ca.md | 0 .../{grandparent => disambiguation}/cb.md | 0 .../{grandparent => disambiguation}/dca.md | 0 .../{grandparent => disambiguation}/dcb.md | 0 .../{grandparent => disambiguation}/index.md | 0 docs/tests/navigation/{exclude => exclusion}/0.md | 0 docs/tests/navigation/{exclude => exclusion}/00.md | 0 .../tests/navigation/{exclude => exclusion}/000.md | 0 .../tests/navigation/{exclude => exclusion}/001.md | 0 docs/tests/navigation/{exclude => exclusion}/01.md | 0 .../tests/navigation/{exclude => exclusion}/010.md | 0 .../tests/navigation/{exclude => exclusion}/011.md | 0 docs/tests/navigation/{exclude => exclusion}/1.md | 0 docs/tests/navigation/{exclude => exclusion}/10.md | 0 .../tests/navigation/{exclude => exclusion}/100.md | 0 .../tests/navigation/{exclude => exclusion}/101.md | 0 docs/tests/navigation/{exclude => exclusion}/11.md | 0 .../tests/navigation/{exclude => exclusion}/110.md | 0 .../tests/navigation/{exclude => exclusion}/111.md | 0 .../navigation/{exclude => exclusion}/index.md | 14 +++++++------- .../navigation/{exclude => exclusion}/untitled.md | 2 +- 23 files changed, 8 insertions(+), 8 deletions(-) rename docs/tests/navigation/{grandparent => disambiguation}/a.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/b.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/ca.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/cb.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/dca.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/dcb.md (100%) rename docs/tests/navigation/{grandparent => disambiguation}/index.md (100%) rename docs/tests/navigation/{exclude => exclusion}/0.md (100%) rename docs/tests/navigation/{exclude => exclusion}/00.md (100%) rename docs/tests/navigation/{exclude => exclusion}/000.md (100%) rename docs/tests/navigation/{exclude => exclusion}/001.md (100%) rename docs/tests/navigation/{exclude => exclusion}/01.md (100%) rename docs/tests/navigation/{exclude => exclusion}/010.md (100%) rename docs/tests/navigation/{exclude => exclusion}/011.md (100%) rename docs/tests/navigation/{exclude => exclusion}/1.md (100%) rename docs/tests/navigation/{exclude => exclusion}/10.md (100%) rename docs/tests/navigation/{exclude => exclusion}/100.md (100%) rename docs/tests/navigation/{exclude => exclusion}/101.md (100%) rename docs/tests/navigation/{exclude => exclusion}/11.md (100%) rename docs/tests/navigation/{exclude => exclusion}/110.md (100%) rename docs/tests/navigation/{exclude => exclusion}/111.md (100%) rename docs/tests/navigation/{exclude => exclusion}/index.md (85%) rename docs/tests/navigation/{exclude => exclusion}/untitled.md (90%) diff --git a/docs/tests/navigation/grandparent/a.md b/docs/tests/navigation/disambiguation/a.md similarity index 100% rename from docs/tests/navigation/grandparent/a.md rename to docs/tests/navigation/disambiguation/a.md diff --git a/docs/tests/navigation/grandparent/b.md b/docs/tests/navigation/disambiguation/b.md similarity index 100% rename from docs/tests/navigation/grandparent/b.md rename to docs/tests/navigation/disambiguation/b.md diff --git a/docs/tests/navigation/grandparent/ca.md b/docs/tests/navigation/disambiguation/ca.md similarity index 100% rename from docs/tests/navigation/grandparent/ca.md rename to docs/tests/navigation/disambiguation/ca.md diff --git a/docs/tests/navigation/grandparent/cb.md b/docs/tests/navigation/disambiguation/cb.md similarity index 100% rename from docs/tests/navigation/grandparent/cb.md rename to docs/tests/navigation/disambiguation/cb.md diff --git a/docs/tests/navigation/grandparent/dca.md b/docs/tests/navigation/disambiguation/dca.md similarity index 100% rename from docs/tests/navigation/grandparent/dca.md rename to docs/tests/navigation/disambiguation/dca.md diff --git a/docs/tests/navigation/grandparent/dcb.md b/docs/tests/navigation/disambiguation/dcb.md similarity index 100% rename from docs/tests/navigation/grandparent/dcb.md rename to docs/tests/navigation/disambiguation/dcb.md diff --git a/docs/tests/navigation/grandparent/index.md b/docs/tests/navigation/disambiguation/index.md similarity index 100% rename from docs/tests/navigation/grandparent/index.md rename to docs/tests/navigation/disambiguation/index.md diff --git a/docs/tests/navigation/exclude/0.md b/docs/tests/navigation/exclusion/0.md similarity index 100% rename from docs/tests/navigation/exclude/0.md rename to docs/tests/navigation/exclusion/0.md diff --git a/docs/tests/navigation/exclude/00.md b/docs/tests/navigation/exclusion/00.md similarity index 100% rename from docs/tests/navigation/exclude/00.md rename to docs/tests/navigation/exclusion/00.md diff --git a/docs/tests/navigation/exclude/000.md b/docs/tests/navigation/exclusion/000.md similarity index 100% rename from docs/tests/navigation/exclude/000.md rename to docs/tests/navigation/exclusion/000.md diff --git a/docs/tests/navigation/exclude/001.md b/docs/tests/navigation/exclusion/001.md similarity index 100% rename from docs/tests/navigation/exclude/001.md rename to docs/tests/navigation/exclusion/001.md diff --git a/docs/tests/navigation/exclude/01.md b/docs/tests/navigation/exclusion/01.md similarity index 100% rename from docs/tests/navigation/exclude/01.md rename to docs/tests/navigation/exclusion/01.md diff --git a/docs/tests/navigation/exclude/010.md b/docs/tests/navigation/exclusion/010.md similarity index 100% rename from docs/tests/navigation/exclude/010.md rename to docs/tests/navigation/exclusion/010.md diff --git a/docs/tests/navigation/exclude/011.md b/docs/tests/navigation/exclusion/011.md similarity index 100% rename from docs/tests/navigation/exclude/011.md rename to docs/tests/navigation/exclusion/011.md diff --git a/docs/tests/navigation/exclude/1.md b/docs/tests/navigation/exclusion/1.md similarity index 100% rename from docs/tests/navigation/exclude/1.md rename to docs/tests/navigation/exclusion/1.md diff --git a/docs/tests/navigation/exclude/10.md b/docs/tests/navigation/exclusion/10.md similarity index 100% rename from docs/tests/navigation/exclude/10.md rename to docs/tests/navigation/exclusion/10.md diff --git a/docs/tests/navigation/exclude/100.md b/docs/tests/navigation/exclusion/100.md similarity index 100% rename from docs/tests/navigation/exclude/100.md rename to docs/tests/navigation/exclusion/100.md diff --git a/docs/tests/navigation/exclude/101.md b/docs/tests/navigation/exclusion/101.md similarity index 100% rename from docs/tests/navigation/exclude/101.md rename to docs/tests/navigation/exclusion/101.md diff --git a/docs/tests/navigation/exclude/11.md b/docs/tests/navigation/exclusion/11.md similarity index 100% rename from docs/tests/navigation/exclude/11.md rename to docs/tests/navigation/exclusion/11.md diff --git a/docs/tests/navigation/exclude/110.md b/docs/tests/navigation/exclusion/110.md similarity index 100% rename from docs/tests/navigation/exclude/110.md rename to docs/tests/navigation/exclusion/110.md diff --git a/docs/tests/navigation/exclude/111.md b/docs/tests/navigation/exclusion/111.md similarity index 100% rename from docs/tests/navigation/exclude/111.md rename to docs/tests/navigation/exclusion/111.md diff --git a/docs/tests/navigation/exclude/index.md b/docs/tests/navigation/exclusion/index.md similarity index 85% rename from docs/tests/navigation/exclude/index.md rename to docs/tests/navigation/exclusion/index.md index 7ea374d..b7d4a3b 100644 --- a/docs/tests/navigation/exclude/index.md +++ b/docs/tests/navigation/exclusion/index.md @@ -5,32 +5,32 @@ parent: Navigation grand_parent: Tests --- -# Tests for exclusion Exclusion +# Exclusion Pages excluded from the main navigation can have parents and children. Navigation to and between excluded pages can be supported by the auto-generating list of child pages inserted at the bottom of each page, and by links to parents in the breadcrumbs at the top of each page. The following tests cover all combinations of excluded and included pages for the top level, child pages, and grandchild pages. The last binary digit in a page title indicates whether the page is included (1) or excluded (0); preceding digits refer to its parent and grandparent. -## Tests for exclusion Included in main navigation +## Included in main navigation - [Tests for exclusion 1](1/) - [Tests for exclusion 11](11/) - [Tests for exclusion 111](111/) -## Tests for exclusion Included only in child navigation +## Included only in child navigation - [Tests for exclusion 110](110/) - [Tests for exclusion 10](10/) - [Tests for exclusion 101](101/) - [Tests for exclusion 100](100/) - -## Tests for exclusion Not included in navigation - -- [Tests for exclusion 0](0/) - [Tests for exclusion 01](01/) - [Tests for exclusion 011](011/) - [Tests for exclusion 010](010/) - [Tests for exclusion 00](00/) - [Tests for exclusion 001](001/) - [Tests for exclusion 000](000/) + +## Not included in main or child navigation + +- [Tests for exclusion 0](0/) - ["Untitled"](untitled/) diff --git a/docs/tests/navigation/exclude/untitled.md b/docs/tests/navigation/exclusion/untitled.md similarity index 90% rename from docs/tests/navigation/exclude/untitled.md rename to docs/tests/navigation/exclusion/untitled.md index d822889..4d8b4b4 100644 --- a/docs/tests/navigation/exclude/untitled.md +++ b/docs/tests/navigation/exclusion/untitled.md @@ -1,6 +1,6 @@ --- layout: default --- -# Tests for exclusion Untitled +# Tests for exclusion untitled This page does not have a `title`, and it is excluded from the navigation -- unless it is located in a Jekyll collection (which provides default titles). To exclude a title-less page from the navigation, regardless of whether it is located in a collection, set `nav_exclude: true`. 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 4/5] 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 @@ 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
{% 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 -%}