feat: add infomaterial and merch items (#5383)
All checks were successful
continuous-integration/drone/push Build is passing

Co-authored-by: Tobias Diekershoff <tobiasd@fsfe.org>
Reviewed-on: #5383
This commit is contained in:
hl
2025-10-09 14:39:38 +00:00
parent 7b56abfd67
commit 7c5bdebdbc
16 changed files with 73 additions and 3 deletions

View File

@@ -30,6 +30,10 @@ Such an item doesn't need an image!
<image imgsmall="/contribute/promopics/fsfe-since-2001-sticker-thumb.png" />
</item>
<item type="fsfe" id="fsfe-blue-balloon" year="2025" order="02">
<image imgsmall="/contribute/promopics/fsfe-blue-balloon.jpg" />
</item>
<item type="fsfe" id="jtsfm-poster" year="2022" order="03">
<image imgsmall="/contribute/promopics/jtfsm-poster-thumb.png" />
</item>
@@ -53,7 +57,6 @@ Such an item doesn't need an image!
<image imgsmall="/contribute/promopics/fsfe-modernize-your-it-thumb.png" />
</item>
<!-- Free Software multilanguage -->
<item type="fsfe" id="multilanguage-free-software-logocolours" year="2019" order="08">
@@ -159,7 +162,7 @@ Such an item doesn't need an image!
<image imgsmall="/contribute/promopics/ilovefs_poster_A2_thumb.png" />
</item>
<item type="ilovefs" id="ilovefs-balloon" year="2015" order="5">
<item type="ilovefs" id="ilovefs-balloon" year="2015" order="2">
<image imgsmall="/contribute/promopics/ilovefs-balloon-combined-thumb.png" />
</item>
@@ -200,7 +203,7 @@ Such an item doesn't need an image!
<item type="childrensbook" id="childrensbook-sticker-zangemann-2022" year="2022" order="4">
<image imgsmall="/contribute/promopics/childrensbook-sticker-zangemann-2022-thumb.png" />
</item>
<!-- Device neutrality -->
<item type="device-neutrality" id="rf-sticker" year="2022" order="1">

View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<infoset>
<version>1</version>
<info id="fsfe-blue-balloon">
<name>FSFE blue balloon</name>
<description>
Our logo on a blue balloon with a slogan on the back.
</description>
<type>Balloon</type>
<context><a href="/about/graphics/">Variations of the FSFE logo</a></context>
<printed>
English
</printed>
<license>The logo of the FSFE must never be used in a way that could be understood as endorsing certain activities, home pages, products or entities without prior consent of the FSFE. </license>
<author>Free Software Foundation Europe</author>
<source><a href="https://download.fsfe.org/advocacy/promomaterial/FSFE/FSFElogo/">fsfe-logo* in download.fsfe.org</a></source>
</info>
</infoset>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 568 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 400 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 860 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 734 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<infoset>
<version>1</version>
<info id="ada-zangemann-tattoos">
<name>Ada &amp; Zangemann Tattoos (non-permanent)</name>
<description>
<p>Tattoos von unserem Märchen über Software, Skateboards und Himbeereis.</p>
</description>
</info>
</infoset>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<infoset>
<version>1</version>
<info id="ada-zangemann-tattoos">
<name>Ada &amp; Zangemann Tattoos (non-permanent)</name>
<description>
<p>Tattoos of our tale about software, skateboards and raspberry ice cream.</p>
</description>
</info>
</infoset>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<infoset>
<version>1</version>
<info id="fsfe-tattoos">
<name>FSFE Tattoos (non-permanent)</name>
<description>
<p>Tattoos von unseren bekanntesten Aktivitäten.</p>
</description>
</info>
</infoset>

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<infoset>
<version>1</version>
<info id="fsfe-tattoos">
<name>FSFE Tattoos (non-permanent)</name>
<description>
<p>Tattoos of our most popular activities.</p>
</description>
</info>
</infoset>

View File

@@ -118,6 +118,14 @@
<image small="data/pictures/bag-since2001-blue-front-small.jpg" large="data/pictures/bag-since2001-blue-front-large.jpg"/>
<image small="data/pictures/bag-since2001-blue-back-small.jpg" large="data/pictures/bag-since2001-blue-back-large.jpg"/>
</item>
<item type="other" id="ada-zangemann-tattoos" price="4.00" date="2025-10-07">
<available size="#"/>
<image small="data/pictures/ada-zangemann-tattoos.jpg" large="data/pictures/ada-zangemann-tattoos.jpg"/>
</item>
<item type="other" id="fsfe-tattoos" price="4.00" date="2025-10-07">
<available size="#"/>
<image small="data/pictures/fsfe-tattoos.jpg" large="data/pictures/fsfe-tattoos.jpg"/>
</item>
<!-- item type="other" id="pin-fsfe-white" price="5.00" date="2019-11-22">
<available size="#"/>
<image

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB