Skip to content

Commit 88656cd

Browse files
anushka-codes1anushka-codes1
authored
Merge branch 'main' into fix-footer-url-hyperlink-191
2 parents c00f979 + 72300af commit 88656cd

6 files changed

Lines changed: 379 additions & 16 deletions

File tree

‎.well-known/funding-manifest-urls‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://plone.org/funding.json

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 1.0.21 (unreleased)
22

3-
- Hyperlink URL in site footer trademark text. Fixes #191 [stevepiercy]
3+
4+
- Fix event info block: Move Website URL to separate section with its own heading. [#175]
45
- Update to Relstorage 4.2.1
56
- Simplify and make mxdev config explicit
67
- Add collective.casestudy to mxdev, pin 1.0.0b1 for testing/production.
@@ -10,6 +11,7 @@
1011
- Deployment fixes for frontend, use newer linux base image for frontend.
1112
- Fix several frontend jsx template issues and warnings.
1213
- Updated Volto to 16.34.1
14+
- Create a `funding.json` manifest file and a `wellKnown` file. See https://github.com/plone/plone.org/issues/222. [stevepiercy]
1315

1416

1517
## 1.0.20 (2025-06-25)

‎frontend/public/.well-known/funding-manifest-urls‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://plone.org/funding.json

‎frontend/public/funding.json‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
{
2+
"$schema": "https://fundingjson.org/schema/v1.1.0.json",
3+
"version": "v1.1.0",
4+
"entity": {
5+
"type": "organisation",
6+
"role": "owner",
7+
"name": "Plone Foundation",
8+
"email": "board@plone.org",
9+
"phone": "+18055075663",
10+
"description": "The Foundation is a 501(c)(3) non-profit organization that exists to protect and promote Plone. We provide support for development and marketing, and are modelled after similar ventures, such as the Apache Software Foundation. We are the legal owner of the Plone code base, trademarks, and domain names. Our goal is to ensure Plone remains the premier open-source content management system to broaden its acceptance and visibility. The Foundation is governed by an elected Board of Directors and supported by Members, Sponsors, Plone Teams, and the global community.",
11+
"webpageUrl": {
12+
"url": "https://plone.org/foundation/about",
13+
"wellKnown": "https://plone.org/.well-known/funding-manifest-urls"
14+
}
15+
},
16+
"projects": [
17+
{
18+
"guid": "plone",
19+
"name": "Plone",
20+
"description": "Plone is an open source content management system (CMS) that is used to create, edit, and manage digital content, like websites, intranets and custom solutions. It comes with over 20 years of growth, optimisations, and refinements. The result is a system trusted by governments, universities, businesses, and other organisations all over the world.",
21+
"webpageUrl": {
22+
"url": "https://plone.org/why-plone/what-is-plone",
23+
"wellKnown": ""
24+
},
25+
"repositoryUrl": {
26+
"url": "https://github.com/plone",
27+
"wellKnown": "https://github.com/plone/plone.org/.well-known/funding-manifest-urls"
28+
},
29+
"licenses": [
30+
"spdx:GPL-2.0-only",
31+
"spdx:MIT",
32+
"spdx:ZPL-2.1",
33+
"spdx:CC-BY-4.0"
34+
],
35+
"tags": [
36+
"api",
37+
"development",
38+
"documentation",
39+
"information-management",
40+
"programming",
41+
"publishing",
42+
"software-engineering",
43+
"user-experience",
44+
"web-design",
45+
"web-development"
46+
]
47+
}
48+
],
49+
"funding": {
50+
"channels": [
51+
{
52+
"guid": "wise-account",
53+
"type": "payment-provider",
54+
"address": "https://wise.com/pay/business/theplonefoundation1",
55+
"description": "Requires a Wise account. Through Wise, we accept payments by Wise account balance, credit and debit cards, and bank transfer."
56+
},
57+
{
58+
"guid": "wise-bank-us",
59+
"type": "bank",
60+
"address": "Name: The Plone Foundation. Routing number: 084009519. Account number: 496441645260729. Account type: Deposit. Swift/BIC: TRWIUS35XXX. Address: Wise US Inc, 108 W 13th St, Wilmington, DE, 19801, United States.",
61+
"description": "For transferring USD directly from your bank account into our US bank account."
62+
},
63+
{
64+
"guid": "wise-bank-eu",
65+
"type": "bank",
66+
"address": "Name: The Plone Foundation. IBAN: BE31 9056 7395 1155. Swift/BIC: TRWIBEB1XXX. Bank name and address: Wise, Rue du Trône 100, 3rd floor, Brussels, 1050, Belgium.",
67+
"description": "For transferring EUR directly from your bank account into our EU bank account from SEPA and most other countries."
68+
},
69+
{
70+
"guid": "github-sponsors",
71+
"type": "payment-provider",
72+
"address": "https://github.com/sponsors/plone",
73+
"description": "Requires a GitHub account. Through GitHub Sponsors, we accept payment by credit card or invoice, either one-time or monthly."
74+
}
75+
],
76+
"plans": [
77+
{
78+
"guid": "one-time-donation",
79+
"status": "active",
80+
"name": "One-time donation",
81+
"description": "",
82+
"amount": 0,
83+
"currency": "USD",
84+
"frequency": "one-time",
85+
"channels": [
86+
"wise-account",
87+
"wise-bank-us",
88+
"wise-bank-eu",
89+
"github-sponsors"
90+
]
91+
},
92+
{
93+
"guid": "annual-platinum-sponsor",
94+
"status": "active",
95+
"name": "Plone Foundation Platinum Sponsor",
96+
"description": "https://plone.org/foundation/sponsorship",
97+
"amount": 7200,
98+
"currency": "USD",
99+
"frequency": "yearly",
100+
"channels": ["wise-account", "wise-bank-us", "wise-bank-eu"]
101+
},
102+
{
103+
"guid": "annual-premium-sponsor",
104+
"status": "active",
105+
"name": "Plone Foundation Premium Sponsor",
106+
"description": "https://plone.org/foundation/sponsorship",
107+
"amount": 3600,
108+
"currency": "USD",
109+
"frequency": "yearly",
110+
"channels": ["wise-account", "wise-bank-us", "wise-bank-eu"]
111+
},
112+
{
113+
"guid": "annual-standard-sponsor",
114+
"status": "active",
115+
"name": "Plone Foundation Standard Sponsor",
116+
"description": "https://plone.org/foundation/sponsorship",
117+
"amount": 1200,
118+
"currency": "USD",
119+
"frequency": "yearly",
120+
"channels": ["wise-account", "wise-bank-us", "wise-bank-eu"]
121+
},
122+
{
123+
"guid": "annual-basic-sponsor",
124+
"status": "active",
125+
"name": "Plone Foundation Basic Sponsor",
126+
"description": "https://plone.org/foundation/sponsorship",
127+
"amount": 600,
128+
"currency": "USD",
129+
"frequency": "yearly",
130+
"channels": ["wise-account", "wise-bank-us", "wise-bank-eu"]
131+
},
132+
{
133+
"guid": "monthly-donation",
134+
"status": "active",
135+
"name": "Monthly donation",
136+
"description": "",
137+
"amount": 0,
138+
"currency": "USD",
139+
"frequency": "monthly",
140+
"channels": [
141+
"wise-account",
142+
"wise-bank-us",
143+
"wise-bank-eu",
144+
"github-sponsors"
145+
]
146+
}
147+
],
148+
"history": [
149+
{
150+
"year": 2021,
151+
"income": 31083,
152+
"expenses": 20758,
153+
"taxes": 0,
154+
"currency": "USD",
155+
"description": ""
156+
},
157+
{
158+
"year": 2022,
159+
"income": 21691,
160+
"expenses": 25499,
161+
"taxes": 0,
162+
"currency": "USD",
163+
"description": ""
164+
},
165+
{
166+
"year": 2023,
167+
"income": 31891,
168+
"expenses": 40557,
169+
"taxes": 0,
170+
"currency": "USD",
171+
"description": ""
172+
},
173+
{
174+
"year": 2024,
175+
"income": 50656,
176+
"expenses": 70605,
177+
"taxes": 0,
178+
"currency": "USD",
179+
"description": ""
180+
},
181+
{
182+
"year": 2025,
183+
"income": 67623,
184+
"expenses": 74511,
185+
"taxes": 0,
186+
"currency": "USD",
187+
"description": "Year to date"
188+
}
189+
]
190+
}
191+
}

‎frontend/src/components/Blocks/InfoBox/Body.jsx‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ const Body = (props) => {
6868
</>
6969
)}
7070

71-
{/* Contatcss */}
72-
{(properties.contact_name ||
73-
properties.event_url ||
74-
properties.contact_phone) && (
71+
{/* Contacts */}
72+
{(properties.contact_name || properties.contact_phone) && (
7573
<div className="info-box-contacts">
7674
<h4>{intl.formatMessage(messages.contact)}</h4>
7775

@@ -97,20 +95,25 @@ const Body = (props) => {
9795
{}
9896
</p>
9997
)}
100-
{properties.event_url && (
101-
<p>
102-
<a
103-
href={properties.event_url}
104-
target="_blank"
105-
rel="noopener noreferrer"
106-
>
107-
{intl.formatMessage(messages.website)}
108-
</a>
109-
</p>
110-
)}
11198
</div>
11299
)}
113100

101+
{/* Website */}
102+
{properties.event_url && (
103+
<>
104+
<h4>{intl.formatMessage(messages.website)}</h4>
105+
<p>
106+
<a
107+
href={properties.event_url}
108+
target="_blank"
109+
rel="noopener noreferrer"
110+
>
111+
{properties.event_url}
112+
</a>
113+
</p>
114+
</>
115+
)}
116+
114117
{/* Attendees */}
115118
{properties.attendees.length > 0 && (
116119
<>

0 commit comments

Comments
 (0)