FSFE/fsfe-website
30
33
Fork 97
Code Issues 65 Pull Requests 21 Wiki Activity

merch: add 3 new items #5647

Merged
tobiasd merged 23 commits from merch-add-new-items into master 2026-02-05 13:52:46 +00:00
Conversation 6 Commits 23 Files Changed 30
+132 -38
hl commented 2026-01-27 15:32:23 +00:00
Contributor
Copy Link
Copy Source

retro hoodies, pmpc tshirts, cool kids tshirts

not tested due to build system bugs

using webp due to very broad compatibility and better compression than JPG (all the small images are a bit over 300kb, the large ones are 1,4MB!)

missing

  • prices?
  • measurements?
  • available sizes
  • descriptions need to be translated, currently they will be empty
retro hoodies, pmpc tshirts, cool kids tshirts not tested due to build system bugs using webp due to very broad compatibility and better compression than JPG (all the small images are a bit over 300kb, the large ones are 1,4MB!) missing - prices? - measurements? - available sizes - descriptions need to be translated, currently they will be empty
hl added 3 commits 2026-01-27 15:32:25 +00:00
merch: add new merch images 2642b4518e
merch: separate small and large images 3e74a4ac9d
merch: add 2 tshirts and 1 hoodie to the merch items
continuous-integration/drone/pr Build is passing
Details
eb00a7a5a8
hl added 1 commit 2026-01-27 15:32:35 +00:00
Merge branch 'master' into merch-add-new-items
continuous-integration/drone/pr Build is passing
Details
6f2494baea
hl added 2 commits 2026-01-27 17:02:07 +00:00
merch: add xml info texts dcb50ee6e5
Merge branch 'merch-add-new-items' of git.fsfe.org:FSFE/fsfe-website into merch-add-new-items
continuous-integration/drone/pr Build is passing
Details
3a6394ff4f
hl added 3 commits 2026-01-27 17:21:15 +00:00
merch: show hoodies on all websites again afe70945b8
merch: small fixes ba102fe534
merch: shorten info texts
continuous-integration/drone/pr Build is passing
Details
0991935016
hl commented 2026-01-27 17:22:39 +00:00
Author
Contributor
Copy Link
Copy Source

commits are pretty clean, did some fixes afterwards.

I tested it in a local build, everything is fine.

commits are pretty clean, did some fixes afterwards. I tested it in a local build, everything is fine.
tobiasd requested changes 2026-01-28 09:47:25 +00:00
Dismissed
fsfe.org/order/data/info/tshirt-cool-kids.en.xml
@@ -0,0 +5,4 @@
<name>Cool Kids use Free Software (purple)</name>
<description>
<p>
And they have cool T-Shirts ;D
tobiasd commented 2026-01-28 09:40:48 +00:00
Owner
Copy Link
Copy Source

Is the text intended that way @fi @anaghz @hl

Is the text intended that way @fi @anaghz @hl
hl commented 2026-01-28 15:44:06 +00:00
Author
Contributor
Copy Link
Copy Source

they are kind of all in that way

they are kind of all in that way
tobiasd commented 2026-02-05 12:56:16 +00:00
Owner
Copy Link
Copy Source

At the moment, none has a textual emoticon in the text. For me this looks out of touch, hence my question if this text was coordinated / intended.

At the moment, none has a textual emoticon in the text. For me this looks out of touch, hence my question if this text was coordinated / intended.
hl marked this conversation as resolved
fsfe.org/order/data/info/tshirt-cool-kids.en.xml
@@ -0,0 +9,4 @@
</p>
<p>
<strong>Note:</strong>
Please have a look at the<a href="size.html">size chart</a>.
tobiasd commented 2026-01-28 09:41:15 +00:00
Owner
Copy Link
Copy Source

Space missing after at the.

Space missing after `at the`.
hl marked this conversation as resolved
fsfe.org/order/data/items.en.xml Outdated
@@ -37,2 +37,4 @@
large="data/pictures/tshirt-nocloud-black-back-large.jpg"/>
</item -->
<item type="tshirt" id="tshirt-cool-kids" price="25.00" date="2026-01-27">
<available size="XS" a="48" b="68"/>
tobiasd commented 2026-01-28 09:41:50 +00:00
Owner
Copy Link
Copy Source

Are there other sizes then XS? Please add them before merging the PR.

Are there other sizes then XS? Please add them before merging the PR.
hl commented 2026-01-28 15:44:19 +00:00
Author
Contributor
Copy Link
Copy Source

this is a placeholder

this is a placeholder
hl marked this conversation as resolved
fsfe.org/order/data/items.en.xml Outdated
@@ -38,1 +38,4 @@
</item -->
<item type="tshirt" id="tshirt-cool-kids" price="25.00" date="2026-01-27">
<available size="XS" a="48" b="68"/>
<image small="data/pictures/tshirt-cool-kids-1-small.webp" large="data/pictures/tshirt-cool-kids-1-large.webp"/>
tobiasd commented 2026-01-28 09:46:37 +00:00
Owner
Copy Link
Copy Source

Please reduce the resolution of the "large" images. There is no need to distribute them in that high quality.

Please reduce the resolution of the "large" images. There is no need to distribute them in that high quality.
hl commented 2026-01-28 15:46:24 +00:00
Author
Contributor
Copy Link
Copy Source

should I also shrink images that are 30kb? the compression is really good and they are only loaded on demand

should I also shrink images that are 30kb? the compression is really good and they are only loaded on demand
hl marked this conversation as resolved
fsfe.org/order/data/items.en.xml Outdated
@@ -39,0 +42,4 @@
<image small="data/pictures/tshirt-cool-kids-2-small.webp" large="data/pictures/tshirt-cool-kids-2-large.webp"/>
</item>
<item type="tshirt" id="tshirt-pmpc" price="25.00" date="2026-01-27">
<available size="XS" a="48" b="68"/>
tobiasd commented 2026-01-28 09:42:30 +00:00
Owner
Copy Link
Copy Source

Are there other sizes then XS? Please add them before merging the PR.

Are there other sizes then XS? Please add them before merging the PR.
hl marked this conversation as resolved
fsfe.org/order/data/items.en.xml Outdated
@@ -60,2 +71,4 @@
<image small="data/pictures/tshirt-nocloud-petrol-back-small.jpg" large="data/pictures/tshirt-nocloud-petrol-back-large.jpg"/>
</item>
<item type="hoodie" id="hoodie-retro" price="60.00" date="2026-01-27">
<available size="XS" a="49" b="68"/>
tobiasd commented 2026-01-28 09:42:38 +00:00
Owner
Copy Link
Copy Source

Are there other sizes then XS? Please add them before merging the PR.

Are there other sizes then XS? Please add them before merging the PR.
hl marked this conversation as resolved
hl added 1 commit 2026-01-28 10:13:37 +00:00
merch: item description: remove size chart note
continuous-integration/drone/pr Build is passing
Details
e6a8345414
hl added 1 commit 2026-01-28 16:30:57 +00:00
merch: shrink small and large images
continuous-integration/drone/pr Build is passing
Details
cbe7fb6808
hl added 1 commit 2026-01-29 10:26:05 +00:00
Merge branch 'master' into merch-add-new-items
continuous-integration/drone/pr Build is passing
Details
93ec5881ea
hl commented 2026-01-29 10:26:19 +00:00
Author
Contributor
Copy Link
Copy Source

merging to get delliots patch for the build system

merging to get delliots patch for the build system
hl added 5 commits 2026-02-05 11:03:55 +00:00
merch: add correct sizes for tshirts 30b7b13846
merch: add ilovefs socks images and links 7a887e7558
merch: show the socks dynamic content and header 43544df7af
merch: remove duplicate image link ed4ba64faf
merch: items.xml: add hoodies, sizes missing 22cec09e9d
hl force-pushed merch-add-new-items from d3e6b8ede6 to eb63fad0c7 2026-02-05 11:26:42 +00:00 Compare
hl requested review from tobiasd 2026-02-05 12:06:40 +00:00
tobiasd reviewed 2026-02-05 12:19:59 +00:00
fsfe.org/order/order.es.xhtml Outdated
@@ -19,3 +19,3 @@
<li><a href="#slimfit">Camiseta slim fit</a></li>
<!-- li><a href="#hooded">Camisetas con capucha</a></li -->
<li><a href="#hooded">Camisetas con capucha</a></li>
<!-- li><a href="#socks">Calcetines</a></li -->
tobiasd commented 2026-02-05 12:19:59 +00:00
Owner
Copy Link
Copy Source

Don't forget to enable sock in this menu in all languages

Don't forget to enable sock in this menu in all languages
hl marked this conversation as resolved
hl added 2 commits 2026-02-05 12:32:13 +00:00
merch: add socks to the list 4961675e79
merch: remove extra socks image
continuous-integration/drone/pr Build is passing
Details
97cea08cb1
tobiasd reviewed 2026-02-05 12:57:09 +00:00
fsfe.org/order/data/items.en.xml
@@ -39,0 +54,4 @@
<available size="L" a="49" b="63"/>
<available size="XL" a="50.5" b="64.5"/>
<available size="2XL" a="54" b="66"/>\
<!--image small="data/pictures/slimfit-cool-kids-1-small.webp" large="data/pictures/slimfit-cool-kids-1-large.webp"/>
tobiasd commented 2026-02-05 12:57:09 +00:00
Owner
Copy Link
Copy Source

I think you can delete the picture block that is not used here.

I think you can delete the picture block that is not used here.
hl commented 2026-02-05 13:15:31 +00:00
Author
Contributor
Copy Link
Copy Source

that is a placeholder until we have images for the slimfits

that is a placeholder until we have images for the slimfits
👍 1
tobiasd marked this conversation as resolved
tobiasd requested changes 2026-02-05 13:00:33 +00:00
Dismissed
tobiasd left a comment
Owner
Copy Link
Copy Source

Please clarify the comments I made outside of the review system.

Please clarify the comments I made outside of the review system.
👍 1
tobiasd dismissed tobiasd's review 2026-02-05 13:52:39 +00:00
Reason:

clarified in chat

tobiasd merged commit 6fd23e6bcc into master 2026-02-05 13:52:46 +00:00
tobiasd deleted branch merch-add-new-items 2026-02-05 13:52:47 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
tobiasd
Labels
Clear labels
Accessibility
bug
build
cgi Scripting
design
disruptive
Requires careful coordination and documentation changes
 documentation
duplicate
easy
enhancement
Improving what is already there
 feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
albert (Albert Dengg) alex.busch (alex.busch) alex.sander (alex.sander) anaghz (anaghz) annarita.russo (annarita.russo) ao (André Ockers) bonnie (bonnie) ciampix (Marco Ciampa) cryptie (cryptie) dario (dario) delliott (delliott) dfajfer (Damian Fajfer) dmaphy (Dominic Hopf) doczkal (Thomas Doczkal) eal (eal) egnun (Erik Grun) eventregbot (eventregbot) fi (fi) floriansnow (Florian Snow) gabriel.ku (gabriel.ku) guido (guido) hf (hf) hugo (hugo) ineiev (ineiev) jithendra (jithendra) jn (jn) jzarl (jzarl) linus (Linus Sehn) lucabon (Luca Bonissi) lucas.lasota (lucas.lasota) max.mehl (Max Mehl) mk (Matthias Kirschner) monochromec (monochromec) mweimann (Michael Weimann) nico.rikken (nico.rikken) patrick (Patrick Ohnewein) reinhard (Reinhard Müller) renovate-bot (Renovate Bot) repentinus (Heiki Lõhmus) schiessle (Björn Schießle) silviarbgl (Silvia Rbgl) sofiaritz (Sofía Aritz) tobiasd (tobiasd) vincent (vincent)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#5647
Delete Branch "merch-add-new-items"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?