From 39c9824cdcac3738e475e523a0817657cd96042b Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Thu, 30 Nov 2023 12:31:20 +0100
Subject: [PATCH] More fixes in the navigation menu

---
 _docs_theme/main.html | 20 +++++++++++++-------
 mkdocs.yml            |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/_docs_theme/main.html b/_docs_theme/main.html
index f76c7293..a8b5fde6 100644
--- a/_docs_theme/main.html
+++ b/_docs_theme/main.html
@@ -27,19 +27,20 @@
                 <!-- General link --> <a href="{{ config.site_url }}"> WireMock </a>
                 <a href="{{ config.site_url }}/mock-api-templates"> Mock API Templates </a> 
                 <a href="https://docs.wiremock.io/getting-started/?utm_source=wiremock.org&utm_medium=masthead_doc-links&utm_campaign=2022_baseline"> WireMock Cloud </a> <!-- General link --> <a href="https://wiremock.org/external-resources"> External Resources </a> <!-- Show the preview link -->
-                <a href="{{ config.site_url }}/../2.x/docs/"> WireMock 2.x (Archive) </a>
+                <a href="{{ config.site_2x_url }}/docs/"> WireMock 2.x (Archive) </a>
               </div>
             </div>
           </span>
         </li>
         <li class="masthead__menu-item">
           <span class="navlink">
-            <a href="{{ config.site_url }}/../support"> Need Help? </a>
+            <a href="{{ config.site_url }}/resources/community-support"> Need Help? </a>
             <div class="divSubNav">
               <div class="divSubNav__inner">
-                <!-- General link --> <a href="{{ config.site_url }}/community/slack"> Q&A on Slack </a> 
+                <a href="{{ config.site_url }}/community/slack"> Q&A on Slack </a> 
                 <a href="https://stackoverflow.com/questions/tagged/wiremock"> StackOverflow </a> 
-                <a href="{{ config.site_url }}/../support/commercial"> Commercial Options </a>
+                <a href="{{ config.site_url }}/resources/community-support"> Community Support </a>
+                <a href="{{ config.site_url }}/resources/commercial-support"> Commercial Options </a>
               </div>
             </div>
           </span>
@@ -60,10 +61,15 @@
         </li>
         <li class="masthead__menu-item">
           <span class="navlink">
-            <a href="https://wiremock.org/external-resources"> Resources </a>
+            <a href="{{ config.site_url }}/resources/"> Resources </a>
             <div class="divSubNav">
               <div class="divSubNav__inner">
-                <!-- General link --> <a href="https://library.wiremock.org/"> Mock API Templates Library </a> <!-- General link --> <a href="https://github.com/wiremock/ecosystem"> WireMock Ecosystem </a> <!-- General link --> <a href="https://twitter.com/wiremockorg"> Twitter </a> <!-- General link --> <a href="https://fosstodon.org/@wiremock"> Mastodon </a> <!-- General link --> <a href="https://community.wiremock.io/"> Slack Archive </a> <!-- General link --> <a href="https://wiremock.org/external-resources"> External Resources </a>
+                <a href="https://library.wiremock.org/"> Mock API Templates Library </a>
+                <a href="https://github.com/wiremock/ecosystem"> WireMock Ecosystem </a>
+                <a href="https://twitter.com/wiremockorg"> Twitter </a>
+                <a href="https://fosstodon.org/@wiremock"> Mastodon </a>
+                <a href="https://community.wiremock.io/"> Slack Archive </a>
+                <a href="{{ config.site_url }}/resources/external"> External Resources </a>
               </div>
             </div>
           </span>
@@ -90,7 +96,7 @@
         <ul>
           <li> <a href="https://wiremock.io?utm_source=wiremock.org&utm_medium=masthead&utm_campaign=homepage_2022_baseline" title="WireMock Cloud" class="btn t-5"> Go to WM Cloud </a></li>
           <li> <a href="{{ config.site_url }}"> Docs </a></li>
-          <li> <a href="{{ config.site_url }}/../support"> Need Help? </a></li>
+          <li> <a href="{{ config.site_url }}/resources/community-support"> Need Help? </a></li>
           <li> <a href="{{ config.site_url }}/participate"> Participate </a></li>
           <li> <a href="{{ config.site_url }}/resources/external"> Resources </a></li>
         </ul>
diff --git a/mkdocs.yml b/mkdocs.yml
index 9a500a7a..d1da308c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,6 +3,7 @@ site_description: >-
   WireMock Documentation.
 # FIXME: replace by production file
 site_url: https://oleg-nenashev.github.io/wiremock.org/docs
+site_2x_url: https://oleg-nenashev.github.io/wiremock.org/2.x
 copyright: Copyright &copy; 2023 - WireMock Contributors
 docs_dir: _docs
 repo_url: https://github.com/wiremock/wiremock.org