Merge pull request qgis#395 from Xpirix/ltr_docs_links

DelazJ · Aug 19, 2024 · 4e30a7f · 4e30a7f
2 parents 22b4c68 + 91db420
commit 4e30a7f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -325,7 +325,7 @@ Example usage as shortcode param:
 tricky part: shortcodes can't be used as other shortcodes' params. So you need to make replacement in the outer shortcode: "tabs.html" make a replacement of `|ltrversion|` and `|version|` to the values from config.
 
 ```
-{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing" tab4="Archived releases">}}
+{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing (>|ltrversion|)" tab4="Archived releases">}}
 ```
 
 ## URL mapping from old site structure

diff --git a/content/resources/hub.md b/content/resources/hub.md
@@ -33,7 +33,7 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec
 
 {{< language-select >}}
 
-{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing" tab4="Archived releases">}}
+{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS testing (>|ltrversion|)" tab3="Archived releases">}}
 
 
 {{< tab-content-start tab="1" >}}
@@ -75,48 +75,44 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec
 
 
 {{< tab-content-start tab="2" >}}
-**For users (QGIS {{< param "version" >}}):**
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/user_manual"  layoutClass="inline-block link-with-language" listTitle="Desktop User Guide — <lang>" >}}
+We are still updating (not translating yet) the documentation for releases newer than QGIS {{< param "ltrversion" >}}. We call this version 'QGIS Testing' and the documentation can be found here: 
+
+**For users (QGIS testing):**
+
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/user_manual"  layoutClass="inline-block link-with-language" listTitle="Desktop User Guide" >}}
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/training_manual"  layoutClass="inline-block link-with-language" listTitle="QGIS Training Manual — <lang>">}}
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/training_manual"  layoutClass="inline-block link-with-language" listTitle="QGIS Training Manual">}}
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/gentle_gis_introduction"  layoutClass="inline-block link-with-language" listTitle="Gentle Intro to GIS — <lang>" >}}
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/gentle_gis_introduction"  layoutClass="inline-block link-with-language" listTitle="Gentle Intro to GIS" >}}
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/server_manual"  layoutClass="inline-block link-with-language" listTitle="Server Guide/Manual — <lang>" >}}
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/server_manual"  layoutClass="inline-block link-with-language" listTitle="Server Guide/Manual" >}}
 
-**For documentation writers (QGIS {{< param "version" >}}):**
+**For documentation writers (QGIS testing):**
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/documentation_guidelinesion"  layoutClass="inline-block link-with-language" listTitle="Documentation Guidelines — <lang>">}}
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/documentation_guidelines"  layoutClass="inline-block link-with-language" listTitle="Documentation Guidelines">}}
 
 
-**For developers (QGIS {{< param "version" >}}):**
+**For developers (QGIS testing):**
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/<lang>/docs/pyqgis_developer_cookbook"  layoutClass="inline-block link-with-language" listTitle="PyQGIS cookbook (for plugins and scripting) — <lang>">}}
+{{< rich-list listLink="https://docs.qgis.org/testing/en/docs/pyqgis_developer_cookbook"  layoutClass="inline-block link-with-language" listTitle="PyQGIS cookbook (for plugins and scripting)">}}
 
 {{< rich-list listLink="https://qgis.org/api/|version|/"  layoutClass="inline-block" listTitle="C++ API documentation" listSubtitle="">}}
 
 {{< rich-list listLink="https://qgis.org/pyqgis/|version|/"  layoutClass="inline-block" listTitle="PyQGIS - QGIS Python Api documentation" >}}
 
 {{< rich-list listLink="https://github.com/qgis/QGIS/blob/release-|version|/INSTALL.md"  layoutClass="inline-block" listTitle="Building QGIS from Source" >}}
 
-**For download (QGIS {{< param "version" >}}):**
+**For download (QGIS testing):**
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/pdf"  layoutClass="inline-block" listTitle="PDF of the manuals" >}}
+{{< rich-list listLink="https://docs.qgis.org/testing/pdf"  layoutClass="inline-block" listTitle="PDF of the manuals" >}}
 
-{{< rich-list listLink="https://docs.qgis.org/|version|/zip"  layoutClass="inline-block" listTitle="HTML zip of the manuals" >}}
+{{< rich-list listLink="https://docs.qgis.org/testing/zip"  layoutClass="inline-block" listTitle="HTML zip of the manuals" >}}
 
 {{< tab-content-end >}}
 
 {{< tab-content-start tab="3" >}}
 
-We are still updating (not translating yet) the documentation for releases newer than QGIS {{< param "version" >}}. We call this version 'QGIS Testing' and the documentation can be found here: 
-
-{{< rich-list listLink="https://docs.qgis.org/testing"  layoutClass="inline-block" listTitle="QGIS testing" >}}
-
-{{< tab-content-end >}}
-
-{{< tab-content-start tab="4" >}}
 
 {{< rich-list listLink="https://docs.qgis.org/3.22/<lang>"  layoutClass="inline-block link-with-language" listTitle="QGIS 3.22 Documentation — <lang>" >}}
 

diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/language-select.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/language-select.html
@@ -37,9 +37,7 @@
 
             linkTitleWithLang.forEach(function (title) {
                 const titleContent = title.getAttribute('title-content')
-                console.log(titleContent)
                 const newTitleContent = titleContent.replace('<lang>', languageText)
-                console.log(newTitleContent)
                 title.textContent = newTitleContent
             });
         }

diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html
@@ -5,7 +5,7 @@
 
 {{ with index .Site.Data.conf }}
 	{{ $tab1 = replace $tab1 "|ltrversion|" .ltrversion }}
-	{{ $tab2 = replace $tab2 "|version|" .version }}
+	{{ $tab2 = replace $tab2 "|ltrversion|" .ltrversion }}
 {{ end }}
 
 <div class="tabs">