From 6d17e1376c484cf00ae93df41bddbfa84e9a58e9 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:10:13 +0300 Subject: [PATCH 1/5] Replace QGIS 3.38 docs links with QGIS testing --- content/resources/hub.md | 38 +++++++++---------- .../layouts/shortcodes/tabs.html | 4 -- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/content/resources/hub.md b/content/resources/hub.md index 5c47e4c85..a0490ebca 100644 --- a/content/resources/hub.md +++ b/content/resources/hub.md @@ -34,7 +34,7 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec {{< language-select >}} Select a language -{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS |version|" tab3="QGIS testing" tab4="Archived releases">}} +{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS testing" tab3="Archived releases">}} {{< tab-content-start tab="1" >}} @@ -51,7 +51,7 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec **For documentation writers (QGIS {{< param "ltrversion" >}}):** -{{< rich-list listLink="https://docs.qgis.org/|ltrversion|//docs/documentation_guidelinesion" layoutClass="inline-block link-with-language" listTitle="Documentation Guidelines — ">}} +{{< rich-list listLink="https://docs.qgis.org/|ltrversion|//docs/documentation_guidelines" layoutClass="inline-block link-with-language" listTitle="Documentation Guidelines — ">}} **For developers (QGIS {{< param "ltrversion" >}}):** @@ -76,24 +76,27 @@ 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|//docs/user_manual" layoutClass="inline-block link-with-language" listTitle="Desktop User Guide — " >}} +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|//docs/training_manual" layoutClass="inline-block link-with-language" listTitle="QGIS Training Manual — ">}} +{{< 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|//docs/gentle_gis_introduction" layoutClass="inline-block link-with-language" listTitle="Gentle Intro to GIS — " >}} +{{< 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|//docs/server_manual" layoutClass="inline-block link-with-language" listTitle="Server Guide/Manual — " >}} +{{< 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|//docs/documentation_guidelinesion" layoutClass="inline-block link-with-language" listTitle="Documentation Guidelines — ">}} +{{< 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|//docs/pyqgis_developer_cookbook" layoutClass="inline-block link-with-language" listTitle="PyQGIS cookbook (for plugins and scripting) — ">}} +{{< 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="">}} @@ -101,23 +104,16 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec {{< 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/" layoutClass="inline-block link-with-language" listTitle="QGIS 3.22 Documentation — " >}} diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html index d900db454..2107276ca 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html @@ -1,7 +1,6 @@ {{ $tab1 := .Get "tab1" }} {{ $tab2 := .Get "tab2" }} {{ $tab3 := .Get "tab3" }} -{{ $tab4 := .Get "tab4" }} {{ with index .Site.Data.conf }} {{ $tab1 = replace $tab1 "|ltrversion|" .ltrversion }} @@ -19,9 +18,6 @@ {{ if $tab3 }}
  • {{ $tab3 }}
    • {{ end }} - {{ if $tab4 }} -
  • {{ $tab4 }}
    • - {{ end }} From 383f014639aa92c3af4bed316799772737db8f74 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:11:46 +0300 Subject: [PATCH 2/5] Update playwright test --- playwright/ci-test/tests/fixtures/project-page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright/ci-test/tests/fixtures/project-page.ts b/playwright/ci-test/tests/fixtures/project-page.ts index e3728625c..2d8c90b37 100644 --- a/playwright/ci-test/tests/fixtures/project-page.ts +++ b/playwright/ci-test/tests/fixtures/project-page.ts @@ -26,7 +26,6 @@ export class ProjectPage { "Create maps", "Edit layers", "Process and analyze", - "Share maps", "Class-leading cartography", "Professional map production", "Powerful reporting tools", From 35ffe38e60fb2e59467c478c50b3fd0cda1b81c6 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:28:52 +0300 Subject: [PATCH 3/5] Revert tabs and playwright fixture --- playwright/ci-test/tests/fixtures/project-page.ts | 1 + themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/playwright/ci-test/tests/fixtures/project-page.ts b/playwright/ci-test/tests/fixtures/project-page.ts index 2d8c90b37..e3728625c 100644 --- a/playwright/ci-test/tests/fixtures/project-page.ts +++ b/playwright/ci-test/tests/fixtures/project-page.ts @@ -26,6 +26,7 @@ export class ProjectPage { "Create maps", "Edit layers", "Process and analyze", + "Share maps", "Class-leading cartography", "Professional map production", "Powerful reporting tools", diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html index 2107276ca..d900db454 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html @@ -1,6 +1,7 @@ {{ $tab1 := .Get "tab1" }} {{ $tab2 := .Get "tab2" }} {{ $tab3 := .Get "tab3" }} +{{ $tab4 := .Get "tab4" }} {{ with index .Site.Data.conf }} {{ $tab1 = replace $tab1 "|ltrversion|" .ltrversion }} @@ -18,6 +19,9 @@ {{ if $tab3 }}
  • {{ $tab3 }}
    • {{ end }} + {{ if $tab4 }} +
  • {{ $tab4 }}
    • + {{ end }} From 9260060e6f712482e0aa0d1bf5add74e53cf9f1c Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:37:11 +0300 Subject: [PATCH 4/5] Remove console log in language choice --- .../layouts/shortcodes/language-select.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/language-select.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/language-select.html index 9486c91f3..5a6d0c9de 100644 --- 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('', languageText) - console.log(newTitleContent) title.textContent = newTitleContent }); } From 91db420f305fcd9b26da9ec3176399e6fe595426 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:22:19 +0300 Subject: [PATCH 5/5] Specify the QGIS Testing version as > ltrversion --- README.md | 2 +- content/resources/hub.md | 2 +- themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 084666548..489dd7b54 100644 --- 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 index a0490ebca..d508d2549 100644 --- a/content/resources/hub.md +++ b/content/resources/hub.md @@ -34,7 +34,7 @@ You will find documentation for every QGIS Long Term Release (LTR) on the respec {{< language-select >}} Select a language -{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS testing" tab3="Archived releases">}} +{{< tabs tab1="QGIS |ltrversion|" tab2="QGIS testing (>|ltrversion|)" tab3="Archived releases">}} {{< tab-content-start tab="1" >}} diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/tabs.html index d900db454..3f1c57bb6 100644 --- 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 }}