diff --git a/config.toml b/config.toml index 035621e6c..bf9ac2e93 100644 --- a/config.toml +++ b/config.toml @@ -221,9 +221,9 @@ sectionPagesMenu = 'main' weight = 100 [[menu.main]] - parent = "Project Organisation" - name = "User Groups" - url = "/community/organisation/groups" + parent = "Community" + name = "Local User Groups" + url = "/community/groups" weight = 110 [[menu.main]] @@ -291,31 +291,6 @@ sectionPagesMenu = 'main' name = "Mailing Lists" url = "/community/organisation/mailinglists" weight = 220 - -[[menu.main]] - parent = "Community" - name = "Members and Donors" - url = "/community/members" - weight = 230 - -[[menu.main]] - parent = "Members and Donors" - name = "Become a Sustaining Member" - url = "/community/members/sustaining_member" - weight = 240 - - -[[menu.main]] - parent = "Members and Donors" - name = "Past sustaining members" - url = "/community/members/past_members" - weight = 260 - -[[menu.main]] - parent = "Members and Donors" - name = "Donors" - url = "/community/members/donors" - weight = 270 [[menu.main]] parent = "Community" @@ -341,14 +316,45 @@ sectionPagesMenu = 'main' name = "Download" url = "/download/" #pre = "" - weight = 30 # Sets the menu order + weight = 60 # Sets the menu order [[menu.main]] + name = "Funding" + url = "/funding/donate" + #pre = "" + weight = 50 # Sets the menu order + +[[menu.main]] + parent = "Funding" name = "Donate" - url = "/donate/" + url = "/funding/donate" #pre = "" weight = 30 # Sets the menu order +[[menu.main]] + parent = "Funding" + name = "Membership" + url = "/funding/membership" + weight = 230 + +[[menu.main]] + parent = "Membership" + name = "Members" + url = "/funding/membership/members" + weight = 240 + + +[[menu.main]] + parent = "Membership" + name = "Past Members" + url = "/funding/membership/past_members" + weight = 260 + +[[menu.main]] + parent = "Donate" + name = "Donors" + url = "/funding/donate/donors" + weight = 270 # Submenus are done this way: parent -> identifier [[menu.main]] diff --git a/content/community-blogs/qgis-server-3-28-is-officially-ogc-compliant.md b/content/community-blogs/qgis-server-3-28-is-officially-ogc-compliant.md index b35082ef8..a76497a06 100644 --- a/content/community-blogs/qgis-server-3-28-is-officially-ogc-compliant.md +++ b/content/community-blogs/qgis-server-3-28-is-officially-ogc-compliant.md @@ -24,7 +24,7 @@ showcase: "planet" -

All this has been possible thanks to the QGIS’s sustaining members and contributors.

+

All this has been possible thanks to the QGIS’s }}">sustaining members and contributors.

diff --git a/content/community-blogs/reports-from-the-winning-grant-proposals-2022.md b/content/community-blogs/reports-from-the-winning-grant-proposals-2022.md index fc60c414c..24fa5cb23 100644 --- a/content/community-blogs/reports-from-the-winning-grant-proposals-2022.md +++ b/content/community-blogs/reports-from-the-winning-grant-proposals-2022.md @@ -15,7 +15,7 @@ showcase: "planet"
  • QGIS setting registry follow-up (#245) – Report
    The work can mainly be seen here PR qgis/QGIS#51295 with the proposed approach to register settings in a hierarchical and organized way, without too much complexity in the API to actually use the settings.
    To have a clean approach, some keys have been renamed. There is a compatibility handling (both forward and backward). The GUI implementation will be worked on during the HF in NL this spring.
  • Fix handling of provider default value clauses/Autogenerate/nextval(…) handling (#247) – Report
    The bulk of these changes landed in the QGIS 3.28 release. A quick way to demonstrate on of the issues fixed is: open a Geopackage file, start editing the layer, add some features to it, but don’t save the edits, then right click the edited layer and try to save it to a different file. On older QGIS releases you’ll be spammed with a number of error messages because we tried to write a string value of “Autogenerate” into a number field for all the newly created features. On QGIS 3.28 this all just works as expected, with no errors encountered.
  • -

    Thank you to everyone who participated and made this round of grants a great success and thank you to all our sustaining members and donors who make this initiative possible!

    +

    Thank you to everyone who participated and made this round of grants a great success and thank you to all our }}">sustaining members and donors who make this initiative possible!

    diff --git a/content/community-blogs/status-update-on-2023-crowd-funding.md b/content/community-blogs/status-update-on-2023-crowd-funding.md index 0da22d98c..4dbaff9cc 100644 --- a/content/community-blogs/status-update-on-2023-crowd-funding.md +++ b/content/community-blogs/status-update-on-2023-crowd-funding.md @@ -162,7 +162,7 @@ showcase: "planet" -

    Become a sustaining member or donor. Every contribution counts.

    +

    Become a }}">sustaining member or }}">donor. Every contribution counts.

    diff --git a/content/community/organisation/groups.md b/content/community/groups.md similarity index 100% rename from content/community/organisation/groups.md rename to content/community/groups.md diff --git a/content/community/involve.md b/content/community/involve.md index 1f5804b82..db2992458 100644 --- a/content/community/involve.md +++ b/content/community/involve.md @@ -16,9 +16,10 @@ sidebar: true {{< rich-content-start themeClass="coloring-1" >}} ### Participate in Support Channels +{{< button class="is-primary1 is-small is-rounded" link="community/groups" text="User groups 🇩🇪 🇫🇷 🇪🇸" >}} {{< button class="is-primary1 is-small is-rounded" link="community/organisation/mailinglists" text="QGIS mailing lists" >}} {{< button class="is-primary1 is-small is-rounded" link="resources/support/#communication-channels" text="Chats rooms" >}} -{{< button class="is-primary1 is-small is-rounded" link="community/organisation/groups" text="User groups" >}} + Utilize channels to seek assistance from fellow users and developers or stay updated on current project events. @@ -105,8 +106,8 @@ QGIS Core comprises libraries for building custom applications through a robust We welcome two types of financial contributions: -{{< button class = "is-primary1" link = "community/members/sustaining_member/" text = "Become a Sustaining Member" >}} -{{< button class = "is-primary6" link = "donate/" text = "One-Time Donation" >}} +{{< button class = "is-primary1" link = "funding/membership" text = "Become a Sustaining Member" >}} +{{< button class = "is-primary6" link = "funding/donate" text = "One-Time Donation" >}} {{< rich-content-end >}} {{< rich-right-start >}} diff --git a/content/community/organisation.md b/content/community/organisation.md index 49a0d8d91..a1c39cbd2 100644 --- a/content/community/organisation.md +++ b/content/community/organisation.md @@ -84,7 +84,7 @@ QGIS.ORG Böschacherstrasse 10a CH-8624 Grüt (Gossau ZH) ### Country Voting Members -According to our statutes, for each country user group that is formed, that group will select a QGIS Country User Group Voting Member to represent their interests. These voting members are listed [here]({{< ref "/community/organisation/groups.md" >}}) . Please email [trademark@qgis.org](mailto:trademark@qgis.org) if you have registered a new country user group, or have changed your user group representative. +According to our statutes, for each country user group that is formed, that group will select a QGIS Country User Group Voting Member to represent their interests. These voting members are listed [here]({{< ref "/community/groups.md" >}}) . Please email [trademark@qgis.org](mailto:trademark@qgis.org) if you have registered a new country user group, or have changed your user group representative. ### Community Voting Members diff --git a/content/community/organisation/meetings/reimbursements.md b/content/community/organisation/meetings/reimbursements.md index ee46c1f81..5910168ef 100644 --- a/content/community/organisation/meetings/reimbursements.md +++ b/content/community/organisation/meetings/reimbursements.md @@ -11,7 +11,7 @@ sidebar: true # Reimbursements for Developer Meetings The QGIS project holds twice-yearly developer meetings, typically somewhere in Europe. The purpose of the meetings is to provide face-to-face time for developers. It is a forum for presenting new ideas, planning, putting heads together to solve problems and so on. -We use funding from our [Sustaining Membership Program Overview]({{< ref "/community/members/sustaining_member.md" >}}) to facilitate the event, with co-funding from the host who usually supplies the venue and the infrastructure for hosting the meeting. Individual developers also co-fund the event by donating their time and in many cases financially supporting their visit to the meeting directly. +We use funding from our [Sustaining Membership Program Overview]({{< ref "/funding/membership.md" >}}) to facilitate the event, with co-funding from the host who usually supplies the venue and the infrastructure for hosting the meeting. Individual developers also co-fund the event by donating their time and in many cases financially supporting their visit to the meeting directly. Need a refund for QGIS HF expenses? -------------------------------------------------------------------------------------------------- diff --git a/content/donate/index.md b/content/donate/index.md deleted file mode 100644 index 6232cdb74..000000000 --- a/content/donate/index.md +++ /dev/null @@ -1,71 +0,0 @@ ---- -type: "page" -title: "Donate" -subtitle: "" -draft: false -sidebar: true ---- - -{{< content-start >}} - -# Support us - -QGIS is developed by a team of dedicated volunteers, companies and organisations. - -We rely on sponsorships and donations for much of our funding. If you would like to support us, donations are very welcome. Donations can be made by electronic funds transfer, by credit card, or by PayPal. - -Donations to QGIS are tax-deductible in several countries. Please refer to your local tax office for details. If you want to tax-deduct as a german company or organization, please donate through the German QGIS user group. They can issue a payment confirmation as a tax-exempt german association. - -{{< rich-box-start layoutClass="has-right" mode="html" >}} -{{< rich-content-start themeClass="coloring-1" >}} -## Stripe - -We use the stripe.com service to receive credit card donations. Note that the payment fees at Stripe are substantially lower than at Paypal - so we would appreciate it, if you could use Stripe instead of PayPal. No signup needed. -{{< rich-content-end >}} -{{< rich-right-start >}} -{{< stripe-widget >}} -{{< rich-right-end >}} -{{< rich-box-end >}} - - -{{< rich-box-start layoutClass="has-right" mode="html" >}} -{{< rich-content-start themeClass="coloring-1" >}} -## Bank transfer - -Use the details below to make a donation via international money transfer: -{{< rich-content-end >}} -{{< rich-right-start >}} -
    -Account name: QGIS.ORG
    -Address:      Boeschacherstrasse 10a
    -              CH-8624 Gruet
    -BIC/SWIFT:    POFICHBEXXX
    -IBAN:         CH09 0900 0000 9146 3839 8
    -Reference:    Donation QGIS
    -Currency:     EUR
    -Bank name:    PostFinance AG
    -Bank address: Mingerstrasse 20
    -              3030 Berne
    -              Switzerland
    -VAT-number:   CHE-489.853.176
    -
    -{{< rich-right-end >}} -{{< rich-box-end >}} - - -{{< rich-box-start layoutClass="has-right" >}} -{{< rich-content-start themeClass="coloring-1" >}} -## Paypal - -You can use Paypal to donate using your own credit card (but we prefer to use Stripe for that). The payment is processed by PayPal but you don't need to have a PayPal account or sign-up for one if you are paying by credit card. - -You can also use your own Paypal account to donate. - -{{< paypal-button >}} -{{< rich-content-end >}} -{{< rich-right-start >}} -![](paypal.png) -{{< rich-right-end >}} -{{< rich-box-end >}} - -{{< content-end >}} diff --git a/content/download/index.md b/content/download.md similarity index 90% rename from content/download/index.md rename to content/download.md index f71bf3cc5..4081a69a6 100644 --- a/content/download/index.md +++ b/content/download.md @@ -9,8 +9,8 @@ url: '/download' {{< content-start >}} -{{< rich-box mode="html" layoutClass="has-right" id="donate-prompt">}} -{{< rich-content themeClass="coloring-2" >}} +{{< rich-box-start mode="html" layoutClass="has-right" id="donate-prompt">}} +{{< rich-content-start themeClass="coloring-2" >}} ## Before download starts QGIS is free of charge, and will always be free of charge if downloaded from QGIS.org. @@ -20,11 +20,11 @@ If you can afford to support the project and people making this software, please Our very best regards! We use the stripe.com service to receive credit card donations. Note that the payment fees at Stripe are substantially lower than at Paypal - so we would appreciate it, if you could use Stripe instead of PayPal. No signup needed. -{{< /rich-content >}} -{{< rich-right mode="html" >}} +{{< rich-content-end >}} +{{< rich-right-start mode="html" >}} {{< stripe-widget otherMethods="true" >}} -{{< /rich-right >}} -{{< /rich-box >}} +{{< rich-right-end >}} +{{< rich-box-end >}} {{< hide-donate-prompt >}} @@ -56,12 +56,12 @@ For many flavors of GNU/Linux binary packages (rpm and deb) or software reposito Alternatively, for native support of both Intel x86 and Apple ARM architectures, together with the latest versions of key components (e.g. GDAL, PDAL, GRASS GIS) see [MacPorts Installing Instructions]({{< ref "resources/installation-guide/#macports" >}}) -{{< rich-box icon="💁" layoutClass="tips">}} -{{< rich-content themeClass="coloring-1" >}} +{{< rich-box-start icon="💁" layoutClass="tips">}} +{{< rich-content-start themeClass="coloring-1" >}} ##### Tips for first launch After installing QGIS, the first launch attempt may fail due to security protections. To enable QGIS, control-click on its icon in your Applications folder and select Open in the context menu. A confirmation dialog will display where you need to click the Open button again. This only has to be done once. -{{< /rich-content >}} -{{< /rich-box >}} +{{< rich-content-end >}} +{{< rich-box-end >}} {{< spoiler-end >}} diff --git a/content/download/thank-you.md b/content/download/thank-you.md new file mode 100644 index 000000000..927fd1a58 --- /dev/null +++ b/content/download/thank-you.md @@ -0,0 +1,26 @@ +--- +type: "page" +title: "Thank you for choosing QGIS!" +draft: false +HasBanner: false +sidebar: true +--- + +{{< content-start >}} + +# Thank you for choosing QGIS! + +## Your freshly baked copy of QGIS is downloading. + +{{< rich-box icon="💁" layoutClass="tips">}} +{{< rich-content themeClass="coloring-1" >}} +##### Tips for first launch +If you have any questions while starting QGIS, welcome to our complete guide to installing for the first time. + +{{< /rich-content >}} +{{< /rich-box >}} + + +ADD CONTENT + +{{< content-end >}} diff --git a/content/funding/_index.md b/content/funding-old/_index.md similarity index 100% rename from content/funding/_index.md rename to content/funding-old/_index.md diff --git a/content/funding/donate/index.md b/content/funding-old/donate/index.md similarity index 100% rename from content/funding/donate/index.md rename to content/funding-old/donate/index.md diff --git a/content/funding/donate/map3.png b/content/funding-old/donate/map3.png similarity index 100% rename from content/funding/donate/map3.png rename to content/funding-old/donate/map3.png diff --git a/content/funding/donate/paypal.png b/content/funding-old/donate/paypal.png similarity index 100% rename from content/funding/donate/paypal.png rename to content/funding-old/donate/paypal.png diff --git a/content/funding/donate/stripe.png b/content/funding-old/donate/stripe.png similarity index 100% rename from content/funding/donate/stripe.png rename to content/funding-old/donate/stripe.png diff --git a/content/funding/sustaining-members/index.md b/content/funding-old/sustaining-members/index.md similarity index 100% rename from content/funding/sustaining-members/index.md rename to content/funding-old/sustaining-members/index.md diff --git a/content/funding/donate.md b/content/funding/donate.md new file mode 100644 index 000000000..1a205dcd2 --- /dev/null +++ b/content/funding/donate.md @@ -0,0 +1,145 @@ +--- +type: "page" +title: "Donate" +subtitle: "Your support is vital to enhance and promote QGIS as an essential tool for the global GIS community" +draft: false +sidebar: true +HasBanner: true +HeroImage: "img/involve.jpg" +--- + +{{< content-start >}} + + +QGIS is developed by a team of dedicated volunteers, companies and organisations. + +We rely on sponsorships and donations for much of our funding. If you would like to support us, donations are very welcome. Donations can be made by electronic funds transfer, by credit card, or by PayPal. + +Donations to QGIS are tax-deductible in several countries. Please refer to your local tax office for details. If you want to tax-deduct as a german company or organization, please donate through the German QGIS user group. They can issue a payment confirmation as a tax-exempt german association. + + +{{< rich-box-start layoutClass="mt-6">}} +{{< rich-content-start themeClass="coloring-2" >}} +## Sustaining Membership +Create a recurring sustaining membership. + +{{< button class = "is-primary6" link = "funding/membership" text = "Subscribe" >}} + +{{< rich-content-end >}} +{{< rich-box-end >}} + + +{{< rich-box-start layoutClass="has-right mt-6" mode="html" >}} +{{< rich-content-start themeClass="coloring-1" >}} +## Stripe Donation + +We use the stripe.com service to receive credit card donations. Note that the payment fees at Stripe are substantially lower than at Paypal - so we would appreciate it, if you could use Stripe instead of PayPal. No signup needed. +{{< rich-content-end >}} +{{< rich-right-start >}} +{{< stripe-widget >}} +{{< rich-right-end >}} +{{< rich-box-end >}} + + +{{< rich-box-start layoutClass="has-right" mode="html" >}} +{{< rich-content-start themeClass="coloring-1" >}} +## Bank transfer + +Use the details below to make a donation via international money transfer: +{{< rich-content-end >}} +{{< rich-right-start >}} +
    +Account name: QGIS.ORG
    +Address:      Boeschacherstrasse 10a
    +              CH-8624 Gruet
    +BIC/SWIFT:    POFICHBEXXX
    +IBAN:         CH09 0900 0000 9146 3839 8
    +Reference:    Donation QGIS
    +Currency:     EUR
    +Bank name:    PostFinance AG
    +Bank address: Mingerstrasse 20
    +              3030 Berne
    +              Switzerland
    +VAT-number:   CHE-489.853.176
    +
    +{{< rich-right-end >}} +{{< rich-box-end >}} + + +{{< rich-box-start layoutClass="has-right paypal mb-6" >}} +{{< rich-content-start themeClass="coloring-1" >}} +## Paypal Donation + +You can use Paypal to donate using your own credit card (but we prefer to use Stripe for that). The payment is processed by PayPal but you don't need to have a PayPal account or sign-up for one if you are paying by credit card. + +You can also use your own Paypal account to donate. + +{{< paypal-button >}} +{{< rich-content-end >}} +{{< rich-right-start >}} +![](../paypal.png) +{{< rich-right-end >}} +{{< rich-box-end >}} + + +## Your support is vital to keep QGIS improving + +We would like to extend our activities and improve the quality of QGIS. Your financial contribution will support the maintenance, improvement, and promotion of QGIS. Becoming a sustaining member is a way of ensuring the longevity and overall health of the project. + +{{< columns-start >}} +{{< column-start class="is-flex-direction-column is-one-third left-title">}} +## Enhanced Infrastructure & Development Support +{{< column-end >}} + +{{< column-start class="is-flex-direction-column is-two-thirds">}} +{{< rich-box-start >}} +{{< rich-content-start themeClass="coloring-1" >}} +#### Maintaining Core Infrastructure +* The official QGIS.org website, a central hub for all things QGIS. +* Our issue tracking system for efficient bug and feature reporting. +* The continuous integration system, ensuring code quality and stability through automated tests. +{{< rich-content-end >}} +{{< rich-box-end >}} + +{{< rich-box-start >}} +{{< rich-content-start themeClass="coloring-1" >}} +#### Software Development & QA +* Continually improve and package QGIS for various operating systems, making it accessible to more users worldwide. +* Address bugs and other issues promptly, enhancing the user experience. +* Manage pull requests and conduct thorough code reviews, ensuring the highest standards of software development. +{{< rich-content-end >}} +{{< rich-box-end >}} + +{{< column-end >}} +{{< columns-end >}} + +{{< columns-start class="mb-6">}} +{{< column-start class="is-flex-direction-column is-one-third left-title">}} +## Community Growth & Engagement + + +{{< column-end >}} + +{{< column-start class="is-flex-direction-column is-two-thirds ">}} +{{< rich-box-start >}} +{{< rich-content-start themeClass="coloring-1" >}} +#### Empowering Our Volunteers +* Mentoring new contributors, fostering a welcoming and productive community. +* Translating QGIS into multiple languages, making the software truly global. +* Running the QGIS grant system, enabling focused work on significant improvements and innovations that are often challenging for volunteers to undertake on their own. +{{< rich-content-end >}} +{{< rich-box-end >}} + +{{< rich-box-start >}} +{{< rich-content-start themeClass="coloring-1" >}} +#### Fostering Collaboration & Knowledge Sharing +* Organizing and supporting contributor meetings and QGIS conferences, essential for knowledge exchange, collaboration, and the collective advancement of the QGIS project. +{{< rich-content-end >}} +{{< rich-box-end >}} + +{{< column-end >}} +{{< columns-end >}} + +QGIS.ORG wants to be transparent with the funds we receive and how we spend them. Please have a look at the financial reports and budgets in our [Finance](../../foundation/finance) section. + +{{< content-end >}} diff --git a/content/community/members/donors.md b/content/funding/donate/donors.md similarity index 81% rename from content/community/members/donors.md rename to content/funding/donate/donors.md index e974b64fd..663d2e828 100644 --- a/content/community/members/donors.md +++ b/content/funding/donate/donors.md @@ -9,7 +9,7 @@ sidebar: true {{< content-start >}} # Donors -Donations can be of any amount, via our bank account, Stripe or Paypal (information available at [Donations](https://donate.qgis.org/) page). Even a small donation can make a difference and help to reach important project goals! +Donations can be of any amount, via our bank account, Stripe or Paypal (information available at [Donations]({{< ref "/funding/donate.md" >}}) page). Even a small donation can make a difference and help to reach important project goals! If you wish to send us a larger donation, you are strongly encouraged to use the bank account or stripe (if you want to do credit card payments) rather than PayPal (they have higher payment fees and an unnecessary currency conversion is involved). Please contact [finance@qgis.org](mailto:finance@qgis.org) if you want to pay larger amounts with credit cards through Stripe. We can send you a payment link and/or invoice. diff --git a/content/community/members/sustaining_member.md b/content/funding/membership.md similarity index 75% rename from content/community/members/sustaining_member.md rename to content/funding/membership.md index 14ea2b675..ac735ce48 100644 --- a/content/community/members/sustaining_member.md +++ b/content/funding/membership.md @@ -7,7 +7,7 @@ HasBanner: true sidebar: true HeroImage: "img/involve.jpg" ButtonText: "Become a Sustaining Member" -ButtonLink: "/community/members/sustaining_member/#how-become-a-sustaining-member" +ButtonLink: "/funding/membership#how-become-a-sustaining-member" --- {{< content-start >}} @@ -18,64 +18,6 @@ QGIS is an entirely Open Source project. QGIS development is carried out largely As a result, you have free access to the source code and binaries that we provide on our web site. As a result of this volunteer approach, a number of tasks, less interesting or important for the developers, are sometimes left behind. In addition, promoting QGIS requires our participation at congresses and conferences and the production of information material, sometimes very expensive for volunteer developers. -We would like to extend our activities and improve the quality of QGIS. Your financial contribution will support the maintenance, improvement, and promotion of QGIS. Becoming a sustaining member is a way of ensuring the longevity and overall health of the project. - -{{< columns-start >}} -{{< column-start class="is-flex-direction-column is-one-third left-title">}} -## Enhanced Infrastructure & Development Support -{{< column-end >}} - -{{< column-start class="is-flex-direction-column is-two-thirds">}} -{{< rich-box-start >}} -{{< rich-content-start themeClass="coloring-1" >}} -#### Maintaining Core Infrastructure -* The official QGIS.org website, a central hub for all things QGIS. -* Our issue tracking system for efficient bug and feature reporting. -* The continuous integration system, ensuring code quality and stability through automated tests. -{{< rich-content-end >}} -{{< rich-box-end >}} - -{{< rich-box-start >}} -{{< rich-content-start themeClass="coloring-1" >}} -#### Software Development & QA -* Continually improve and package QGIS for various operating systems, making it accessible to more users worldwide. -* Address bugs and other issues promptly, enhancing the user experience. -* Manage pull requests and conduct thorough code reviews, ensuring the highest standards of software development. -{{< rich-content-end >}} -{{< rich-box-end >}} - -{{< column-end >}} -{{< columns-end >}} - -{{< columns-start >}} -{{< column-start class="is-flex-direction-column is-one-third left-title">}} -## Community Growth & Engagement - - -{{< column-end >}} - -{{< column-start class="is-flex-direction-column is-two-thirds ">}} -{{< rich-box-start >}} -{{< rich-content-start themeClass="coloring-1" >}} -#### Empowering Our Volunteers -* Mentoring new contributors, fostering a welcoming and productive community. -* Translating QGIS into multiple languages, making the software truly global. -* Running the QGIS grant system, enabling focused work on significant improvements and innovations that are often challenging for volunteers to undertake on their own. -{{< rich-content-end >}} -{{< rich-box-end >}} - -{{< rich-box-start >}} -{{< rich-content-start themeClass="coloring-1" >}} -#### Fostering Collaboration & Knowledge Sharing -* Organizing and supporting contributor meetings and QGIS conferences, essential for knowledge exchange, collaboration, and the collective advancement of the QGIS project. -{{< rich-content-end >}} -{{< rich-box-end >}} - -{{< column-end >}} -{{< columns-end >}} - -QGIS.ORG wants to be transparent with the funds we receive and how we spend them. Please have a look at the financial reports and budgets in our [Finance](../../foundation/finance) section. - ## Sustaining membership @@ -142,7 +84,7 @@ Supporting the QGIS project as a sustaining member provides the following benefi {{< rich-box-start >}} {{< rich-content-start themeClass="coloring-4" >}} #### Public Acknowledgment -All sustaining members and donors will be listed on the project [Members page](../../../about/sustaining_members.html#qgis-sustaining-members), ordered by membership category with a link back to the sustaining members organization or company website and the logo in a size reflecting their membership category. +All sustaining members and donors will be listed on the project [Members page]({{< ref "/funding/membership.md" >}}), ordered by membership category with a link back to the sustaining members organization or company website and the logo in a size reflecting their membership category. {{< rich-content-end >}} {{< rich-box-end >}} @@ -298,7 +240,7 @@ Past sustaining members are listed separately for a period of two years to ackno {{< rich-box-start icon="💡" layoutClass="tips">}} {{< rich-content-start themeClass="coloring-1" >}} ##### You can also make one-time payement -Donations can be of any amount, via direct transfers to our bank account (SEPA payment), credit card payment (through stripe.com) or Paypal (information available at [Donations](https://donate.qgis.org) page). Even a small donation can make a difference and help to reach important project goals! +Donations can be of any amount, via direct transfers to our bank account (SEPA payment), credit card payment (through stripe.com) or Paypal (information available at [Donations]({{< ref "/funding/donate.md" >}}) page). Even a small donation can make a difference and help to reach important project goals! {{< rich-content-end >}} {{< rich-box-end >}} diff --git a/content/community/members.md b/content/funding/membership/members.md similarity index 76% rename from content/community/members.md rename to content/funding/membership/members.md index d1291c869..b9adb8198 100644 --- a/content/community/members.md +++ b/content/funding/membership/members.md @@ -15,20 +15,13 @@ We thank our sustaining members and donors who support the QGIS project, often r {{< rich-box-start icon="💁" layoutClass="tips">}} {{< rich-content-start themeClass="coloring-2" >}} ##### How become a sustaining member? -For information on becoming a sustaining member, please visit [Sustaining Membership Program Overview](sustaining_member). +For information on becoming a sustaining member, please visit [Sustaining Membership Program Overview](../membership). {{< rich-content-end >}} {{< rich-box-end >}} {{< fund status="active" >}} -{{< rich-box-start >}} -{{< rich-content-start themeClass="coloring-6" >}} -### List of donors - -[Show list of donors](donors) -{{< rich-content-end >}} -{{< rich-box-end >}} {{< content-end >}} diff --git a/content/community/members/past_members.md b/content/funding/membership/past_members.md similarity index 100% rename from content/community/members/past_members.md rename to content/funding/membership/past_members.md diff --git a/content/donate/paypal.png b/content/funding/paypal.png similarity index 100% rename from content/donate/paypal.png rename to content/funding/paypal.png diff --git a/content/product/img/create.gif b/content/product/img/create.gif new file mode 100644 index 000000000..e05d88da3 Binary files /dev/null and b/content/product/img/create.gif differ diff --git a/content/product/img/edit.gif b/content/product/img/edit.gif new file mode 100644 index 000000000..174ef3ab9 Binary files /dev/null and b/content/product/img/edit.gif differ diff --git a/content/product/img/share.gif b/content/product/img/share.gif new file mode 100644 index 000000000..131a9bfda Binary files /dev/null and b/content/product/img/share.gif differ diff --git a/content/product/img/visuzlize.gif b/content/product/img/visuzlize.gif new file mode 100644 index 000000000..7413ffd16 Binary files /dev/null and b/content/product/img/visuzlize.gif differ diff --git a/content/product/overview.md b/content/product/overview.md index e0c159818..4ad4dd57e 100644 --- a/content/product/overview.md +++ b/content/product/overview.md @@ -17,8 +17,8 @@ LabelText: "Free and open source" {{< tabs tab1="Create map" tab2="Edit layers" tab3="Process and analyze" tab4="Share maps" >}} {{< columns-start id="content-tab-1" >}} -{{< column-start class="is-flex-direction-column is-two-thirds" >}} -![Create map](../img/placeholder.jpg "Create map") +{{< column-start class="is-flex-direction-column is-two-thirds rounded" >}} +![Create map](../img/create.gif "Create map") {{< column-end >}} {{< column-start class="is-flex-direction-column is-justify-content-center is-one-third">}} @@ -34,8 +34,8 @@ Create atlases and reports with maps, media and tabular content {{< columns-end >}} {{< columns-start id="content-tab-2" >}} -{{< column-start class="is-flex-direction-column is-two-thirds" >}} -![Create map](../img/placeholder.jpg "Create map") +{{< column-start class="is-flex-direction-column is-two-thirds rounded" >}} +![Edit map](../img/edit.gif "Edit map") {{< column-end >}} {{< column-start class="is-flex-direction-column is-justify-content-center is-one-third">}} @@ -52,8 +52,8 @@ Create user-friendly forms using our form designer {{< columns-end >}} {{< columns-start id="content-tab-3" >}} -{{< column-start class="is-flex-direction-column is-two-thirds" >}} -![Create map](../img/placeholder.jpg "Create map") +{{< column-start class="is-flex-direction-column is-two-thirds rounded" >}} +![visuzlize map](../img/visuzlize.gif "visuzlize map") {{< column-end >}} {{< column-start class="is-flex-direction-column is-justify-content-center is-one-third">}} @@ -70,8 +70,8 @@ Explore a diverse ecosystem of third-party analysis tools for expanded capabilit {{< columns-end >}} {{< columns-start id="content-tab-4" >}} -{{< column-start class="is-flex-direction-column is-two-thirds" >}} -![Create map](../img/placeholder.jpg "Create map") +{{< column-start class="is-flex-direction-column is-two-thirds rounded" >}} +![share map](../img/share.gif "share map") {{< column-end >}} {{< column-start class="is-flex-direction-column is-justify-content-center is-one-third">}} @@ -110,7 +110,7 @@ Enhance the functionality of QGIS application with free additional features. ### Annual international conference to explore the future of QGIS Connect with professionals, enthusiasts, and QGIS users for networking and knowledge sharing. -[Community meetings](../../community/organisation/meetings/user_meetings/) +[Community meetings]({{< ref "community/organisation/meetings/user_meetings.md" >}}) {{< column-end >}} {{< columns-end >}} @@ -122,11 +122,11 @@ Connect with professionals, enthusiasts, and QGIS users for networking and knowl ### Local user groups and support providers Join a community of like-minded individuals in your region. -[Local groups list](../../community/organisation/groups/) +[Local groups list]({{< ref "community/groups.md" >}}) {{< column-end >}} {{< columns-end >}} -[Join the community](../../community/involve/) +[Join the community]({{< ref "community/involve.md" >}}) ## Cross platform @@ -149,7 +149,7 @@ Publish your QGIS projects and layers as OGC compatible WMS, WMTS, WFS and WCS s Create, edit, visualise, analyse and publish geospatial information. -[Download](/download/) for Windows, Mac, Linux, BSD and Android. +[Download]({{< ref "download.md" >}}) for Windows, Mac, Linux, BSD and Android. {{< rich-content-end >}} {{< rich-box-end >}} {{< column-end >}} @@ -179,9 +179,9 @@ Benefit from the powerful symbology, labeling and blending features to impress w The QGIS experience does not stop on the desktop. Various third-party touch optimized apps allow you to take QGIS into the field -* [QField](/download/) -* [Mergin Maps Input app](/download/) -* [IntraMaps Roam](/download/) +* [QField]({{< ref "download.md" >}}) +* [Mergin Maps Input app]({{< ref "download.md" >}}) +* [IntraMaps Roam]({{< ref "download.md" >}}) {{< rich-content-end >}} {{< rich-box-end >}} {{< column-end >}} @@ -194,7 +194,7 @@ The QGIS experience does not stop on the desktop. Various third-party touch opti We gather inspiring stories from actual users that showcase the versatility and power of the QGIS solution -[Find out more](../case-studies) +[Find out more]({{< ref "product/case-studies.md" >}}) {{< rich-content-end >}} {{< rich-right-start >}} {{< usecase >}} @@ -209,7 +209,7 @@ We gather inspiring stories from actual users that showcase the versatility and ## Maps showcase QGIS users demonstrate their creativity, showcasing the app's powerful map creation capabilities. -[Go to maps showcase](maps/) +[Go to maps showcase]({{< ref "product/overview/maps.md" >}}) {{< column-end >}} @@ -224,7 +224,7 @@ QGIS users demonstrate their creativity, showcasing the app's powerful map creat ## Application screenshots Below are some screenshots from QGIS itself and a selection of Maps which are created with QGIS. -[Go to screenshots](screenshots/) +[Go to screenshots]({{< ref "product/overview/screenshots.md" >}}) {{< column-end >}} {{< column-start class="is-flex-direction-column is-two-thirds">}} diff --git a/content/product/visual-changelogs/visualchangelog310/index.md b/content/product/visual-changelogs/visualchangelog310/index.md index a7ff8ff6e..b47f20643 100644 --- a/content/product/visual-changelogs/visualchangelog310/index.md +++ b/content/product/visual-changelogs/visualchangelog310/index.md @@ -22,7 +22,7 @@ QGIS 3.10 brings an extensive list of new changes and a lot of polishing of exis We would like to thank the developers, documenters, testers and all the many folks out there who volunteer their time and effort (or fund people to do so). From the QGIS community we hope you enjoy this release! If you wish to donate time, money or otherwise get involved in making QGIS more awesome, please wander along to qgis.org and lend a hand! -QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list](../../../community/members/donors). If you would like to become an official sustaining member, please visit [our sustaining members page](../../../community/members/sustaining_member) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters! +QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list]({{< ref "/funding/donate.md" >}}). If you would like to become an official sustaining member, please visit [our sustaining members page]({{< ref "/funding/membership.md" >}}) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters!
    diff --git a/content/product/visual-changelogs/visualchangelog32/index.md b/content/product/visual-changelogs/visualchangelog32/index.md index f1e00896c..b79923374 100644 --- a/content/product/visual-changelogs/visualchangelog32/index.md +++ b/content/product/visual-changelogs/visualchangelog32/index.md @@ -16,13 +16,13 @@ releaseDate: "2018-06-22" Release date: 2018-06-22 -The greatest QGIS release ever! QGIS 3.2 brings a massive list of new changes - the highlights of which we will try to cover here. As always can we remind you that QGIS is an open source project and if you are able to, consider supporting our work through [donations](https://donate.qgis.org), [sustaining memberships](../../../community/members/sustaining_member) or contributions to the code documentation, web site and so on. +The greatest QGIS release ever! QGIS 3.2 brings a massive list of new changes - the highlights of which we will try to cover here. As always can we remind you that QGIS is an open source project and if you are able to, consider supporting our work through [donations]({{< ref "/funding/donate.md" >}}), [sustaining memberships]({{< ref "/funding/membership.md" >}}) or contributions to the code documentation, web site and so on. **Thanks** We would like to thank the developers, documenters, testers and all the many folks out there who volunteer their time and effort (or fund people to do so). From the QGIS community we hope you enjoy this release! If you wish to donate time, money or otherwise get involved in making QGIS more awesome, please wander along to [qgis.org](https://qgis.org) and lend a hand! -QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list](../../../community/members/donors). If you would like to become an official sustaining member, please visit [our sustaining members page](../../../community/members/sustaining_member) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters! +QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list]({{< ref "/funding/donate.md" >}}). If you would like to become an official sustaining member, please visit [our sustaining members page]({{< ref "/funding/membership.md" >}}) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters! QGIS is Free software and you are under no obligation to pay anything to use it - in fact we want to encourage people far and wide to use it regardless of what your financial or social status is - we believe empowering people with spatial decision making tools will result in a better society for all of humanity. @@ -30,7 +30,7 @@ QGIS is Free software and you are under no obligation to pay anything to use it ## Sponsors for QGIS version 3.2 -A special thanks to all our [sustaining members, sponsors and donors](../../../community/members) for helping us to make this release possible! +A special thanks to all our [sustaining members, sponsors and donors]({{< ref "/funding/membership.md" >}}) for helping us to make this release possible! ## General diff --git a/content/product/visual-changelogs/visualchangelog322/index.md b/content/product/visual-changelogs/visualchangelog322/index.md index e9f6a96e4..116362a8d 100644 --- a/content/product/visual-changelogs/visualchangelog322/index.md +++ b/content/product/visual-changelogs/visualchangelog322/index.md @@ -26,7 +26,7 @@ This feature-packed release includes a vast number of user experience enhancemen We would also like to extend a big thank you to the developers, documenters, testers, and all the many folks out there who volunteer their time and effort (or fund people to do so) to make these releases possible. From the QGIS community, we hope you enjoy this release! If you wish to donate time, money, or otherwise get involved in making QGIS more awesome, please wander along to [QGIS.ORG](qgis.org) and lend a hand! -QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list](https://www.qgis.org/en/site/about/sustaining_members.html#list-of-donors). If you would like to become an official project sustaining member, please visit our [sustaining member page](https://www.qgis.org/en/site/getinvolved/governance/sustaining_members/sustaining_members.html#qgis-sustaining-memberships) for details. Sponsoring QGIS helps us to fund our regular developer meetings, maintain project infrastructure, and fund bug fixing efforts. A complete list of current sponsors is provided below - our very great thank you to all of our sponsors! +QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list]({{< ref "/funding/donate/donors.md" >}}). If you would like to become an official project sustaining member, please visit our [sustaining member page]({{< ref "/funding/membership.md" >}}) for details. Sponsoring QGIS helps us to fund our regular developer meetings, maintain project infrastructure, and fund bug fixing efforts. A complete list of current sponsors is provided below - our very great thank you to all of our sponsors!
    diff --git a/content/product/visual-changelogs/visualchangelog34/index.md b/content/product/visual-changelogs/visualchangelog34/index.md index 0e7c3aa63..3a74b3d9a 100644 --- a/content/product/visual-changelogs/visualchangelog34/index.md +++ b/content/product/visual-changelogs/visualchangelog34/index.md @@ -22,7 +22,7 @@ The first long-term release (LTR) of QGIS 3. QGIS 3.4 just released. After five We would like to thank the developers, documenters, testers and all the many folks out there who volunteer their time and effort (or fund people to do so). From the QGIS community we hope you enjoy this release! If you wish to donate time, money or otherwise get involved in making QGIS more awesome, please wander along to [qgis.org](https://qgis.org) and lend a hand! -QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list](../../../community/members/donors). If you would like to become an official sustaining member, please visit [our sustaining members page](../../../community/members/sustaining_member) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current supporters is provided below - our very great thank you to all of our supporters! +QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list]({{< ref "/funding/donate/donors.md" >}}). If you would like to become an official sustaining member, please visit [our sustaining members page]({{< ref "/funding/membership.md" >}}) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current supporters is provided below - our very great thank you to all of our supporters!
    diff --git a/content/product/visual-changelogs/visualchangelog38/index.md b/content/product/visual-changelogs/visualchangelog38/index.md index 8808bd31c..d3d55c8f6 100644 --- a/content/product/visual-changelogs/visualchangelog38/index.md +++ b/content/product/visual-changelogs/visualchangelog38/index.md @@ -22,7 +22,7 @@ QGIS 3.8 brings an extensive list of new changes and a lot of polishing of exist We would like to thank the developers, documenters, testers and all the many folks out there who volunteer their time and effort (or fund people to do so). From the QGIS community we hope you enjoy this release! If you wish to donate time, money or otherwise get involved in making QGIS more awesome, please wander along to qgis.org and lend a hand! -QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list](../../../community/members/donors). If you would like to become an official sustaining member, please visit [our sustaining members page](../../../community/members/sustaining_member) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters! +QGIS is supported by donors and sustaining members. A current list of donors who have made financial contributions large and small to the project can be seen on our [donors list]({{< ref "/funding/donate/donors.md" >}}). If you would like to become an official sustaining member, please visit [our sustaining members page]({{< ref "/funding/membership.md" >}}) for details. Supporting QGIS helps us to fund our six monthly developer meetings, maintain project infrastructure and fund bug fixing efforts. A complete list of current sustaining members is provided below - our very great thank you to all of our supporters!
    diff --git a/content/resources/support.md b/content/resources/support.md index ed6a5e9b0..dbcf8133e 100644 --- a/content/resources/support.md +++ b/content/resources/support.md @@ -46,7 +46,7 @@ For Facebook users, an english-speaking global community group for QGIS users ca Local QGIS user groups are a great place to meet other users. -See [User Groups]({{< ref "community/organisation/groups" >}}) to read about it. +See [User Groups]({{< ref "community/groups" >}}) to read about it. ## Website diff --git a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/richbox.sass b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/richbox.sass index fa0a2603f..6e70d5558 100644 --- a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/richbox.sass +++ b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/richbox.sass @@ -1,11 +1,12 @@ .rich display: flex align-items: center - margin: 1rem 0 + margin: 1rem 0 .cont display: flex flex-direction: column align-items: flex-start + h4 margin-bottom: 0.2em font-weight: 500 @@ -177,3 +178,4 @@ width: 100% &::after width: 100% + diff --git a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/stripe.sass b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/stripe.sass index 5c3de31a3..726b3dbfa 100644 --- a/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/stripe.sass +++ b/themes/hugo-bulma-blocks-theme/assets/sass/bulma/components/stripe.sass @@ -1,16 +1,12 @@ .stripe-widget - background: #fff - border-radius: 20px - box-shadow: 0 0 10px rgba(0, 0, 0, 0.1) - padding: 20px - width: 100% p font-size: 20px font-weight: 500 + margin-bottom: 0.5rem !important &:not(:last-child) margin-bottom: 0 hr - margin: 0.5rem 0 1rem + margin: 0rem 0 1rem .submit-button height: 50px margin: 1rem 0 1rem @@ -35,3 +31,12 @@ @media screen and (max-width: 768px) .stripe-widget border-radius: 10px + +.donatbox, .paypal img + background: #fff + border-radius: 20px + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1) + padding: 20px + width: 100% + border: 0px + diff --git a/themes/hugo-bulma-blocks-theme/exampleSite/content/funding/_index.md b/themes/hugo-bulma-blocks-theme/exampleSite/content/funding/_index.md index cd0c2b63a..c97934727 100644 --- a/themes/hugo-bulma-blocks-theme/exampleSite/content/funding/_index.md +++ b/themes/hugo-bulma-blocks-theme/exampleSite/content/funding/_index.md @@ -41,7 +41,7 @@ We are a community project, and although we make the software available for free class="is-danger" title-size="is-4" subtitle-size="is-6" - link="funding/sustaining-members/" + link="funding/membership/" link-text="Subscribe!" >}}{{< /block >}} {{< column-end >}} diff --git a/themes/hugo-bulma-blocks-theme/layouts/partials/footer.html b/themes/hugo-bulma-blocks-theme/layouts/partials/footer.html index 462ce3fad..faeecd5d8 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/partials/footer.html +++ b/themes/hugo-bulma-blocks-theme/layouts/partials/footer.html @@ -10,7 +10,7 @@
    - +
    @@ -91,18 +110,18 @@ - + diff --git a/themes/hugo-bulma-blocks-theme/layouts/partials/funders-simple.html b/themes/hugo-bulma-blocks-theme/layouts/partials/funders-simple.html index 6b480a8c2..a0fa70415 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/partials/funders-simple.html +++ b/themes/hugo-bulma-blocks-theme/layouts/partials/funders-simple.html @@ -8,13 +8,13 @@

    diff --git a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/stripe-widget.html b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/stripe-widget.html index bdd6df727..082cb64dc 100644 --- a/themes/hugo-bulma-blocks-theme/layouts/shortcodes/stripe-widget.html +++ b/themes/hugo-bulma-blocks-theme/layouts/shortcodes/stripe-widget.html @@ -1,4 +1,4 @@ -
    +

    One-Time Payment