Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Url fixes #184

Merged
merged 25 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
745e3ff
fix footnotes on install-guide
sleeping-h Feb 26, 2024
ab9bca2
move pdfs
sleeping-h Feb 26, 2024
77e5fa1
fix links in organization
sleeping-h Feb 26, 2024
a0f8499
fix alts on case studies
sleeping-h Feb 26, 2024
1da5b16
new shortcode funders-simple.html
sleeping-h Feb 27, 2024
553d5be
fix sidebar highlighting
sleeping-h Feb 27, 2024
d269ace
Merge branch 'main' into url-fixes
sleeping-h Feb 27, 2024
fda9efc
Merge branch 'main' into url-fixes
sleeping-h Feb 27, 2024
065ed27
fix rss link
sleeping-h Feb 27, 2024
4f2b3f0
fix 04-community-page.spec.ts
sleeping-h Feb 27, 2024
6436330
fix /download and thank-you
sleeping-h Feb 27, 2024
f3f513d
tests: community - fix 1st link selector
sleeping-h Feb 27, 2024
a13a655
add /download/thank-you
sleeping-h Feb 27, 2024
a40f8a4
moved pdfs to content/community/foundation/
sleeping-h Feb 27, 2024
ed9b197
tests: fix resources selector
sleeping-h Feb 27, 2024
b4562cb
fix tests
sleeping-h Feb 27, 2024
f9e08f1
fix more tests
sleeping-h Feb 27, 2024
ad52fa9
more fix more tests
sleeping-h Feb 27, 2024
22710d6
more fix tests
sleeping-h Feb 27, 2024
e655cfc
fix Sustaining Membership test
sleeping-h Feb 27, 2024
02aaacf
fix 04-community-page.spec.ts
sleeping-h Feb 27, 2024
b6c0a74
add todo in 04-community-page.spec.ts
sleeping-h Feb 27, 2024
3ee1548
remove Members and Donors from 01-home-page.spec.ts
sleeping-h Feb 27, 2024
cecca2e
redirect to thank-you after download
sleeping-h Feb 28, 2024
53589a8
fix 404 ../../foundation/finance
sleeping-h Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
18 changes: 9 additions & 9 deletions content/community/foundation/annual_general_meetings.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ description: Starting in 2016 (coincident with the establishment of a formal leg
# Annual General Meetings
Starting in 2016 (coincident with the establishment of a formal legal entity (Swiss “Verein”), we hold a virtual annual general meeting where QGIS Voting Members approve the budget for the coming year, the financial report for the past year, elect any new project members and so on. The minutes of these meetings are provided here as a matter of public record:

{{< rich-list listLink="/download/QGIS-AGM2023-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2023" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2023-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2023" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGIS-AGM2022-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2022" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2022-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2022" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2021-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2021" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2021-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2021" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2020-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2020" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2020-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2020" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2019-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2019" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2019-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2019" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2018-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2018" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2018-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2018" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2017-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2017" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2017-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 2017" listSubtitle="Download PDF">}}

{{< rich-list listLink="/download/QGIS-AGM2016-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 201" listSubtitle="Download PDF">}}
{{< rich-list listLink="../agm-minutes/QGIS-AGM2016-Minutes.pdf" linkAttr="download" layoutClass="half" listTitle="QGIS AGM Minutes 201" listSubtitle="Download PDF">}}


{{< content-end >}}
{{< content-end >}}
50 changes: 25 additions & 25 deletions content/community/foundation/finance.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,61 +14,61 @@ description: Please check the following reports, and see how your donations and
Please check the following reports, and see how your donations and sponsorships are important for the progress of the project.

## 2023
{{< rich-list listLink="/download/QGISBudget2023.pdf" linkAttr="download" layoutClass="third" listTitle="Budget 2023" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2023.pdf" linkAttr="download" layoutClass="third" listTitle="Budget 2023" listSubtitle="Download PDF" >}}

## 2022
{{< rich-list listLink="/download/PublicQGISfinancialreport2022.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2022" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2022.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2022" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2022.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2022" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2022.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2022" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2022.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2022" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2022.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2022" listSubtitle="Download PDF" >}}

## 2021
{{< rich-list listLink="/download/PublicQGISfinancialreport2021.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2021" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2021.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2021" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2021.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2021" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2021.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2021" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2021.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2021" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2021.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2021" listSubtitle="Download PDF" >}}

## 2020
{{< rich-list listLink="/download/PublicQGISfinancialreport2020.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2020" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2020.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2020" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2020.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2020" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2020.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2020" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2020.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2020" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2020.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2020" listSubtitle="Download PDF" >}}

## 2019
{{< rich-list listLink="/download/PublicQGISfinancialreport2019.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2019" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2019.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2019" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2019.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2019" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2019.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2019" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2019.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2019" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2019.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2019" listSubtitle="Download PDF" >}}

## 2018
{{< rich-list listLink="/download/PublicQGISfinancialreport2018.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2018" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2018.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2018" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2018.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2018" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2018.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2018" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2018.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2018" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2018.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2018" listSubtitle="Download PDF" >}}

## 2017
{{< rich-list listLink="/download/PublicQGISfinancialreport2017.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2017" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2017.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2017" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/Financial-Auditing-Report_QGIS-ORG_2017.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2017" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/Financial-Auditing-Report_QGIS-ORG_2017.pdf" linkAttr="download" layoutClass="third" listTitle="Financial auditing report 2017" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2017.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2017" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2017.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2017" listSubtitle="Download PDF" >}}

## 2016
{{< rich-list listLink="/download/PublicQGISfinancialreport2016.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2016" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2016.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2016" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2016.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2016" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2016.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2016" listSubtitle="Download PDF" >}}

## 2015
{{< rich-list listLink="/download/PublicQGISfinancialreport2015.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2015" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2015.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2015" listSubtitle="Download PDF" >}}

{{< rich-list listLink="/download/QGISBudget2015.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2015" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-budgets/QGISBudget2015.pdf" linkAttr="download" layoutClass="third " listTitle="Budget 2015" listSubtitle="Download PDF" >}}

## 2014
{{< rich-list listLink="/download/PublicQGISfinancialreport2014.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2014" listSubtitle="Download PDF" >}}
{{< rich-list listLink="../annual-financial-reports/PublicQGISfinancialreport2014.pdf" linkAttr="download" layoutClass="third" listTitle="Financial report 2014" listSubtitle="Download PDF" >}}

{{< content-end >}}
{{< content-end >}}
4 changes: 2 additions & 2 deletions content/community/groups.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Goals of a user group

* Initialization/coordination of application modules, e.g. surveying, urban planning, server/web client, etc.

* Electing a representative to act as a [QGIS Country Voting Member](../getinvolved/governance/governance.html#country-voting-members)
* Electing a representative to act as a [QGIS Country Voting Member]({{< ref "/community/organisation#voting-members" >}})


General assumptions/recommendations
Expand Down Expand Up @@ -170,4 +170,4 @@ Website template

if you do not wish to host and design from scratch the group website, you can use the template provided at [https://github.com/qgis/qgis-template.github.io](https://github.com/qgis/qgis-template.github.io)

{{< content-end >}}
{{< content-end >}}
4 changes: 2 additions & 2 deletions content/community/organisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Find the list of documentation and website translators at: [https://github.com/q

Current Translation Team Lead: Werner Macho

The QGIS Translation is managed by the Community Assistant (Translation Team Lead) and supported by additional language specific teams. Information about the current documentation status and the translation process are provided at the [Translators Corner](../translate.html#translate-qgis).
The QGIS Translation is managed by the Community Assistant (Translation Team Lead) and supported by additional language specific teams. Information about the current documentation status and the translation process are provided at the [Translators Corner](https://docs.qgis.org/latest/en/docs/documentation_guidelines/do_translations.html).

Contact : [qgis-community-team](http://lists.osgeo.org/mailman/listinfo/qgis-community-team) list or [QGIS Translation Mailing list](http://lists.osgeo.org/mailman/listinfo/qgis-tr)

Expand All @@ -240,4 +240,4 @@ These [individuals](https://github.com/qgis/QGIS/graphs/contributors) are recogn

Follow the lists of maintainers of the [documentation](https://github.com/qgis/QGIS-Documentation/graphs/contributors) and the [website](https://github.com/qgis/QGIS-Website/graphs/contributors). Feel free to join any of those teams.

{{< content-end >}}
{{< content-end >}}
4 changes: 2 additions & 2 deletions content/community/organisation/guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ These Guidelines should be followed along with all QGIS’s rules and policies,
Country Voting Members
-------------------------------------------------------------------------

QGIS.ORG permits official [QGIS country user groups](../../../forusers/usergroups.html#qgis-usergroups), to modify the QGIS logo and use the modified QGIS logo for non-commercial communications and projects. This permission is subject to continued compliance with these Guidelines, QGIS Trademark Guidelines and all other rules and policies. QGIS reserves the right to cancel or change this permission at any time at its sole discretion. If you would like to use a modified version of the QGIS logo, please submit your artwork for approval at [trademark@qgis.org](/cdn-cgi/l/email-protection#3a4e485b5e5f575b48511c19090d011c190f08011c190e02014b5d53491c190e0c0155485d). Upon approval, you will receive a license agreement to sign before you may begin using the artwork.
QGIS.ORG permits official [QGIS country user groups]({{< ref "/community/groups" >}}), to modify the QGIS logo and use the modified QGIS logo for non-commercial communications and projects. This permission is subject to continued compliance with these Guidelines, QGIS Trademark Guidelines and all other rules and policies. QGIS reserves the right to cancel or change this permission at any time at its sole discretion. If you would like to use a modified version of the QGIS logo, please submit your artwork for approval at trademark@qgis.org. Upon approval, you will receive a license agreement to sign before you may begin using the artwork.

QGIS.ORG also permits its official country user groups, to register a QGIS Top Level Domain (qgis.ch, qgis.dk etc.) according to the rules further down in this document.

Expand Down Expand Up @@ -194,4 +194,4 @@ Frequently Asked Questions



{{< content-end >}}
{{< content-end >}}
2 changes: 1 addition & 1 deletion content/documentation/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: "page"
title: "Documentation Overview"
subtitle: "QGIS Documentation Resources"
draft: false
draft: true
heroImage: "img/banners/banner2.png"
# Which second level menu to show
submenus: documentation
Expand Down
File renamed without changes.
26 changes: 0 additions & 26 deletions content/download/thank-you.md

This file was deleted.

6 changes: 3 additions & 3 deletions content/product/case-studies/afghanistan.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ The Danish Demining Group (DDG), the specialised mine action unit of the Danish
In Afghanistan, mineclearance activities are coordinated through the Mine Action Coordination Centre for Afghanistan (MACCA), who collect and disseminate geospatial information on known hazards (minefields, battlefields, 'spot' UXO tasks), and update this information as clearance progresses. New shapefiles of these 'hazard polygons' are issued by the MACCA on a regular basis, and mineclearance organisations can use these to assess the situation of mineclearance in their areas of operation. DDG is trialling the use of QGIS within the organization to replace the expensive commercial softwares it has used in the past.

<figure>
<img src="../images/afghanistan1.png" class="align-right" alt="./images/afghanistan1.png" />
<img src="../images/afghanistan1.png" class="align-right" alt="afghanistan1.png" />
<figcaption>Digital elevation models allow DDG to get an idea of the location of a minefield</figcaption>
</figure>

The use of geospatial data is most useful in the planning and survey phases. In Afghanistan, security problems and rugged terrain mean that physical re-survey of known sites is not always easy. Instead, the use of a mixture of data — satellite or aerial photography underlays, digitized Soviet-era topographic maps, hazard shapefiles and digital elevation models — allow DDG to get an idea of the location of a minefield in relation to the terrain and surrounding natural and physical features before sending in a survey team. QGIS plugins add useful capabilities, like the ability to visualise terrain in 3D. The attached screenshot above — made using the plugin Qgis2threejs —— shows an area just south of the Darulaman Palace in Kabul, with active minefields (along the ridgelines on the left) shown in red over a Soviet topographic raster layer combined with SRTM data. Minefields already cleared show as light green.

<figure>
<img src="../images/afghanistan2.jpg" class="align-right" alt="./images/afghanistan2.jpg" />
<img src="../images/afghanistan2.jpg" class="align-right" alt="afghanistan2.jpg" />
<figcaption>Active hazardous areas shown in red. Hazardous areas already cleared show as light green.</figcaption>
</figure>

Expand All @@ -41,7 +41,7 @@ The use of QGIS, along with a renewed interest in data analysis, has spurred new
## Author

<figure>
<img src="../images/afghanistan3.jpg" class="align-left" height="220" alt="./images/afghanistan3.jpg" />
<img src="../images/afghanistan3.jpg" class="align-left" height="220" alt="afghanistan3.jpg" />
<figcaption>Edward Crowther</figcaption>
</figure>

Expand Down
Loading
Loading