From 7749e5109bd7d10dd9d341443e2e2c00cd8fbf7c Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Mon, 26 Aug 2024 15:44:27 +0200
Subject: [PATCH] Fix side navigation

---
 custom_theme/partials/nav.html | 81 ++++++++++++++++++++++++++++------
 custom_theme/partials/nav.old  | 20 +++++++++
 mkdocs.yml                     |  2 +-
 requirements.txt               |  2 +-
 4 files changed, 89 insertions(+), 16 deletions(-)
 create mode 100644 custom_theme/partials/nav.old

diff --git a/custom_theme/partials/nav.html b/custom_theme/partials/nav.html
index 56676e7e9..bb84882a6 100644
--- a/custom_theme/partials/nav.html
+++ b/custom_theme/partials/nav.html
@@ -1,20 +1,73 @@
-{#- This file was automatically generated - do not edit -#} {% set class = "md-nav md-nav--primary" %} {% if "navigation.tabs" in features %} {% set class = class ~ " md-nav--lifted" %} {% endif %} {% if "toc.integrate" in features %} {% set class = class
-~ " md-nav--integrated" %} {% endif %}
-<nav class="{{ class }}" aria-label="{{ lang.t('nav.title') }}" data-md-level="0">
-    <label class="md-nav__title" for="__drawer">
-      <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-nav__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
-        {% include "partials/logo.html" %}
-      </a>
-      {{ config.site_name }}
-    </label> {% if config.repo_url %}
+<!--
+  Copyright (c) 2016-2024 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+{% import "partials/nav-item.html" as item with context %}
+
+<!-- Determine classes -->
+{% set class = "md-nav md-nav--primary" %}
+{% if "navigation.tabs" in features %}
+  {% set class = class ~ " md-nav--lifted" %}
+{% endif %}
+{% if "toc.integrate" in features %}
+  {% set class = class ~ " md-nav--integrated" %}
+{% endif %}
+
+<!-- Navigation -->
+<nav
+  class="{{ class }}"
+  aria-label="{{ lang.t('nav') }}"
+  data-md-level="0"
+>
+
+  <!-- Site title -->
+  <label class="md-nav__title" for="__drawer">
+    <a
+      href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}"
+      title="{{ config.site_name | e }}"
+      class="md-nav__button md-logo"
+      aria-label="{{ config.site_name }}"
+      data-md-component="logo"
+    >
+      {% include "partials/logo.html" %}
+    </a>
+    {{ config.site_name }}
+  </label>
+
+  <!-- Repository information -->
+  {% if config.repo_url %}
     <div class="md-nav__source">
-        {% include "partials/source.html" %}
+      {% include "partials/source.html" %}
     </div>
-    {% endif %}
-    <ul class="md-nav__list" data-md-scrollfix>
-        {% for nav_item in nav %} {% set path = "__nav_" ~ loop.index %} {% set level = 1 %} {% include "partials/nav-item.html" %} {% endfor %}
-    </ul>
+  {% endif %}
+
+  <!-- Navigation list -->
+  <ul class="md-nav__list" data-md-scrollfix>
+    {% for nav_item in nav %}
+      {% set path = "__nav_" ~ loop.index %}
+      {{ item.render(nav_item, path, 1) }}
+    {% endfor %}
+  </ul>
 </nav>
+
 <nav>
     {% include "partials/social.html" %}
 </nav>
\ No newline at end of file
diff --git a/custom_theme/partials/nav.old b/custom_theme/partials/nav.old
new file mode 100644
index 000000000..56676e7e9
--- /dev/null
+++ b/custom_theme/partials/nav.old
@@ -0,0 +1,20 @@
+{#- This file was automatically generated - do not edit -#} {% set class = "md-nav md-nav--primary" %} {% if "navigation.tabs" in features %} {% set class = class ~ " md-nav--lifted" %} {% endif %} {% if "toc.integrate" in features %} {% set class = class
+~ " md-nav--integrated" %} {% endif %}
+<nav class="{{ class }}" aria-label="{{ lang.t('nav.title') }}" data-md-level="0">
+    <label class="md-nav__title" for="__drawer">
+      <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-nav__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
+        {% include "partials/logo.html" %}
+      </a>
+      {{ config.site_name }}
+    </label> {% if config.repo_url %}
+    <div class="md-nav__source">
+        {% include "partials/source.html" %}
+    </div>
+    {% endif %}
+    <ul class="md-nav__list" data-md-scrollfix>
+        {% for nav_item in nav %} {% set path = "__nav_" ~ loop.index %} {% set level = 1 %} {% include "partials/nav-item.html" %} {% endfor %}
+    </ul>
+</nav>
+<nav>
+    {% include "partials/social.html" %}
+</nav>
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 71643ae07..d8390462e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,7 +89,7 @@ theme:
     - search.suggest
     - search.highlight
     - navigation.top
-    # - navigation.path
+    # - navigation.path    # Breadcrumbs
     # - toc.integrate 
     # - navigation.indexes # incompatible with toc.integrate 
 
diff --git a/requirements.txt b/requirements.txt
index f3c47a83d..e3dcfd948 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ pymdown-extensions>=7.0
 mike==1.1.2
 #mkdocs==1.4.1
 mkdocs>=1.5.3
-mkdocs-awesome-pages-plugin>=2.5.0
+mkdocs-awesome-pages-plugin>=2.9.3
 mkdocs-bootstrap>=1.1
 mkdocs-htmlproofer-plugin>=0.0.3
 mkdocs-material>=9.4