Skip to content

Commit

Permalink
Feature/funding sections (#183)
Browse files Browse the repository at this point in the history
* Fixed footer links
Created Funging section
Moved Members to Fundings
Moved Local groups to Comunity
Added gifs to Product overview page
Fixed some broken links

* fixed links to members and donors

* srating thankyou page

* minor changes
  • Loading branch information
atarakanovdes authored Feb 27, 2024
1 parent 78e70a3 commit 655339c
Show file tree
Hide file tree
Showing 40 changed files with 306 additions and 238 deletions.
66 changes: 36 additions & 30 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down Expand Up @@ -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"
Expand All @@ -341,14 +316,45 @@ sectionPagesMenu = 'main'
name = "Download"
url = "/download/"
#pre = "<i class='fa-solid fa-circle-down mr-1'></i>"
weight = 30 # Sets the menu order
weight = 60 # Sets the menu order

[[menu.main]]
name = "Funding"
url = "/funding/donate"
#pre = "<i class='fa-solid fa-circle-down mr-1'></i>"
weight = 50 # Sets the menu order

[[menu.main]]
parent = "Funding"
name = "Donate"
url = "/donate/"
url = "/funding/donate"
#pre = "<i class='fa-solid fa-circle-down mr-1'></i>"
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]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ showcase: "planet"



<p>All this has been possible thanks to the QGIS&#8217;s <a href="https://qgis.org/en/site/about/sustaining_members.html">sustaining members</a> and contributors.</p>
<p>All this has been possible thanks to the QGIS&#8217;s <a href="{{< ref "/funding/membership.md" >}}">sustaining members</a> and contributors.</p>



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ showcase: "planet"
<li class="task-list-item enabled position-relative border-right-0"><strong><span class="reference"><a class="issue-link js-issue-link" href="https://github.com/qgis/QGIS-Enhancement-Proposals/issues/245">QGIS setting registry follow-up<span class="issue-shorthand"> (#245)</span></a></span>&nbsp;</strong>&#8211;&nbsp;<a href="https://github.com/qgis/QGIS-Enhancement-Proposals/issues/245#issuecomment-1482535685">Report</a><br>The work can mainly be seen here PR&nbsp;<a class="issue-link js-issue-link" href="https://github.com/qgis/QGIS/pull/51295">qgis/QGIS#51295</a> 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.<br>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.</li>
<li class="task-list-item enabled position-relative border-right-0"><strong><span class="reference"><a class="issue-link js-issue-link" href="https://github.com/qgis/QGIS-Enhancement-Proposals/issues/247">Fix handling of provider default value clauses/Autogenerate/nextval(&#8230;) handling<span class="issue-shorthand"> (#247)</span></a></span>&nbsp;</strong>&#8211;&nbsp;<a href="https://lists.osgeo.org/pipermail/qgis-psc/2022-October/009884.html" rel="nofollow">Report</a><br>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&#8217;t save the edits, then right click the edited layer and try to save it to a different file. On older QGIS releases you&#8217;ll be spammed with a number of error messages because we tried to write a string value of &#8220;Autogenerate&#8221; into a number field for all the newly created features. On QGIS 3.28 this all just works as expected, with no errors encountered.</li>
</ol>
<p>Thank you to everyone who participated and made this round of grants a great success and thank you to all our <a href="https://qgis.org/en/site/about/sustaining_members.html">sustaining members</a> and donors who make this initiative possible!</p>
<p>Thank you to everyone who participated and made this round of grants a great success and thank you to all our <a href="{{< ref "/funding/membership.md" >}}">sustaining members</a> and donors who make this initiative possible!</p>


<p></p>
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ showcase: "planet"



<p><strong>Become a <a href="https://qgis.org/en/site/getinvolved/governance/sustaining_members/management.html">sustaining member</a> or <a href="https://donate.qgis.org">donor</a>. Every contribution counts.</strong></p>
<p><strong>Become a <a href="{{< ref "/funding/membership.md" >}}">sustaining member</a> or <a href="{{< ref "/funding/donate.md" >}}">donor</a>. Every contribution counts.</strong></p>



Expand Down
File renamed without changes.
7 changes: 4 additions & 3 deletions content/community/involve.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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 >}}
Expand Down
2 changes: 1 addition & 1 deletion content/community/organisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [[email protected]](mailto:[email protected]) 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 [[email protected]](mailto:[email protected]) if you have registered a new country user group, or have changed your user group representative.

### Community Voting Members

Expand Down
2 changes: 1 addition & 1 deletion content/community/organisation/meetings/reimbursements.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
--------------------------------------------------------------------------------------------------
Expand Down
71 changes: 0 additions & 71 deletions content/donate/index.md

This file was deleted.

20 changes: 10 additions & 10 deletions content/download/index.md → content/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 >}}

Expand Down Expand Up @@ -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 >}}

Expand Down
26 changes: 26 additions & 0 deletions content/download/thank-you.md
Original file line number Diff line number Diff line change
@@ -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.
<a href="resources/installation-guide">
{{< /rich-content >}}
{{< /rich-box >}}


ADD CONTENT

{{< content-end >}}
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Loading

0 comments on commit 655339c

Please sign in to comment.