feat: link the merchandise shop from the Funding section
Add a Shop subsection to the services page in English and Italian: what the shop is, where the proceeds go, that it ships to most countries and that a purchase gives no say in decisions. State plainly that Spreadshop is a third-party site with its own cookies, payment and privacy rules. Text and one link only, no JavaScript or embeds. The address is shop_url in site.json. Closes #1
This commit is contained in:
parent
972647b416
commit
61ad847882
5 changed files with 26 additions and 3 deletions
|
|
@ -5,7 +5,7 @@ Sources of the kmalloc.org website: plain static HTML, no JavaScript, valid HTML
|
||||||
## Layout
|
## Layout
|
||||||
|
|
||||||
- `build.py` generates the site: `python3 build.py [output-dir]` (default `preview/`). Standard library only.
|
- `build.py` generates the site: `python3 build.py [output-dir]` (default `preview/`). Standard library only.
|
||||||
- `site.json` holds what every language shares: the language list, contact address, Bitcoin address, manifesto version, services and people.
|
- `site.json` holds what every language shares: the language list, contact address, Bitcoin address, shop address, manifesto version, services and people.
|
||||||
- `lang/<lang>.json` holds every text of one language (`en`, `it`, `es`, `de`, `fr`): the menu, the footer and one entry per page. The texts are plain text and the build escapes them.
|
- `lang/<lang>.json` holds every text of one language (`en`, `it`, `es`, `de`, `fr`): the menu, the footer and one entry per page. The texts are plain text and the build escapes them.
|
||||||
- `templates/` holds the chrome (`base.html`, `header.html`, `footer.html`), one body per page type in `templates/pages/` and repeated blocks in `templates/parts/`.
|
- `templates/` holds the chrome (`base.html`, `header.html`, `footer.html`), one body per page type in `templates/pages/` and repeated blocks in `templates/parts/`.
|
||||||
- `static/style.css` is the one stylesheet, inlined into every page.
|
- `static/style.css` is the one stylesheet, inlined into every page.
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,11 @@
|
||||||
"abuse_p2": "No GPG needed.",
|
"abuse_p2": "No GPG needed.",
|
||||||
"funding_h": "Funding",
|
"funding_h": "Funding",
|
||||||
"funding_p1": "The server costs EUR 37.50 a month. Today squid pays for it.",
|
"funding_p1": "The server costs EUR 37.50 a month. Today squid pays for it.",
|
||||||
"funding_p2": "Donations help keep it running. They give no say in decisions. Bitcoin address:"
|
"funding_p2": "Donations help keep it running. They give no say in decisions. Bitcoin address:",
|
||||||
|
"shop_h": "Shop",
|
||||||
|
"shop_p1": "A shop sells t-shirts, mugs and other items with the kmalloc.org logos. It is there to help support the project and to make it known. The proceeds go to the project costs: about a quarter of the price you pay reaches the project, the rest covers production, shipping, taxes and the platform. It ships to most countries. A purchase, like a donation, gives no say in decisions, and the services stay free of charge either way.",
|
||||||
|
"shop_p2": "The shop is run by Spreadshop, a commercial platform, not by us: it sets its own cookies and handles payment and your personal data under its own rules. What this site promises about privacy does not apply there.",
|
||||||
|
"shop_a": "open the shop on Spreadshop, outside kmalloc.org"
|
||||||
},
|
},
|
||||||
"news": {
|
"news": {
|
||||||
"path": "/news/",
|
"path": "/news/",
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,11 @@
|
||||||
"abuse_p2": "Non serve GPG.",
|
"abuse_p2": "Non serve GPG.",
|
||||||
"funding_h": "Fondi",
|
"funding_h": "Fondi",
|
||||||
"funding_p1": "Il server costa 37,50 euro al mese. Oggi lo paga squid.",
|
"funding_p1": "Il server costa 37,50 euro al mese. Oggi lo paga squid.",
|
||||||
"funding_p2": "Le donazioni aiutano a tenerlo acceso. Non danno potere decisionale. Indirizzo Bitcoin:"
|
"funding_p2": "Le donazioni aiutano a tenerlo acceso. Non danno potere decisionale. Indirizzo Bitcoin:",
|
||||||
|
"shop_h": "Negozio",
|
||||||
|
"shop_p1": "C'è un negozio con magliette, tazze e altri oggetti con i loghi di kmalloc.org: serve a sostenere il progetto e a farlo conoscere. Il ricavato va ai costi del progetto: circa un quarto del prezzo che paghi arriva al progetto, il resto copre produzione, spedizione, tasse e piattaforma. Spedisce nella maggior parte dei paesi. Un acquisto, come una donazione, non dà potere decisionale, e i servizi restano gratuiti in ogni caso.",
|
||||||
|
"shop_p2": "Il negozio è gestito da Spreadshop, una piattaforma commerciale, non da noi: imposta i propri cookie e gestisce il pagamento e i tuoi dati personali con le proprie regole. Quello che questo sito promette sulla privacy lì non vale.",
|
||||||
|
"shop_a": "apri il negozio su Spreadshop, fuori da kmalloc.org"
|
||||||
},
|
},
|
||||||
"history": {
|
"history": {
|
||||||
"path": "/it/cronologia-manifesto.html",
|
"path": "/it/cronologia-manifesto.html",
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
"issues_url": "https://git.kmalloc.org/squid/kmalloc.org/issues",
|
"issues_url": "https://git.kmalloc.org/squid/kmalloc.org/issues",
|
||||||
"license_url": "https://creativecommons.org/licenses/by-sa/4.0/",
|
"license_url": "https://creativecommons.org/licenses/by-sa/4.0/",
|
||||||
"btc": "bc1qsj5qadrzlqmfwcru4fwuqvftg833te5f9mja2c",
|
"btc": "bc1qsj5qadrzlqmfwcru4fwuqvftg833te5f9mja2c",
|
||||||
|
"shop_url": "https://kmalloc.myspreadshop.it/",
|
||||||
"home_order": [
|
"home_order": [
|
||||||
"git",
|
"git",
|
||||||
"social",
|
"social",
|
||||||
|
|
|
||||||
|
|
@ -157,6 +157,20 @@
|
||||||
<a href="bitcoin:{{btc}}"><code>{{btc}}</code></a>
|
<a href="bitcoin:{{btc}}"><code>{{btc}}</code></a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<h3 id="shop">{{shop_h}}</h3>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
{{shop_p1}}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
{{shop_p2}}
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<a href="{{shop_url}}" rel="noreferrer">{{shop_a}}</a>.
|
||||||
|
</p>
|
||||||
|
|
||||||
<h2 id="terms">{{terms_h}}</h2>
|
<h2 id="terms">{{terms_h}}</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue