FSFE/fsfe-website
27
32
Fork 93
Code Issues 63 Pull Requests 18 Wiki Activity

Gathering leaflets in one FS and users freedom section

Browse Source 
svn path=/trunk/; revision=31595
This commit is contained in:
mjammes
2015-07-29 12:52:35 +00:00
parent dfd32218e2
commit cb0e84a786
5 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
contribute/promoitems/info-drm-leaflet.en.xml → contribute/promoitems/info-freedom-drm-leaflet.en.xml
View File

0
contribute/promoitems/info-fs-and-tools-leaflet.en.xml → contribute/promoitems/info-freedom-fstools-leaflet.en.xml
View File

0
contribute/promoitems/info-gnupg-leaflet.en.xml → contribute/promoitems/info-freedom-gnupg-leaflet.en.xml
View File

36
contribute/promoitems/item.en.xml
View File

@@ -22,6 +22,23 @@ to every item in this file -->
imgsmall="/contribute/promopics/joinfellowship-poster_thumb.png"/>
</item>
<!-- FS and users freedoms -->
<item type="freedom" id="fs-and-tools" year="2014" order="1">
<image
imgsmall="/contribute/promopics/freiheit-thumb.png"/>
</item>
<item type="freedom" id="gnupg-leaflet" year="2014" order="2">
<image
imgsmall="/contribute/promopics/gnupg-leaflet-en-thumb.png"/>
</item>
<item type="freedom" id="drm-leaflet" year="2012" order="3">
<image
imgsmall="/contribute/promopics/drm_thumb.png"/>
</item>
<!-- Document Freedom Day -->
<item type="dfd" id="dfd-leaflet" year="2014" order="1">
<image
@@ -67,12 +84,6 @@ to every item in this file -->
<image
imgsmall="/contribute/promopics/dfd-robots-postcard_thumb.png"/>
</item>
<!-- Digital Restrictions Management -->
<item type="drm" id="drm-leaflet" year="2012" order="1">
<image
imgsmall="/contribute/promopics/drm_thumb.png"/>
</item>
<!-- F-droid -->
<item type="f-droid" id="f-droid-leaflet" year="2014" order="1">
@@ -80,19 +91,6 @@ to every item in this file -->
imgsmall="/contribute/promopics/fdroid-flyer_thumb.png"/>
</item>
<!-- FSTools -->
<item type="fstools" id="fs-and-tools" year="2014" order="">
<image
imgsmall="/contribute/promopics/freiheit-thumb.png"/>
</item>
<!-- Email self-defense -->
<item type="gnupg" id="gnupg-leaflet" year="2014" order="1">
<image
imgsmall="/contribute/promopics/gnupg-leaflet-en-thumb.png"/>
</item>
<!-- I love Free Software -->
<item type="ilovefs" id="ilovefs-postcard" year="2014" order="1">
<image

30
contribute/spreadtheword.en.xhtml
View File

@@ -34,19 +34,17 @@
<h1 id="spread-the-word">Spread the word!</h1>
<h2 id="promo-material">FSFE's Promotion Material</h2>
<h2 id="promo-material">FSFE Promotion Material</h2>
<div id="toc">
<p style="text-indent:1em;">Available promotion material</p>
<ul style="margin-bottom: 1em;">
<li><a href="#fsfe-and-fellowship-material">About FSFE and the Fellowship</a></li>
<li><a href="#dfd">Document Freedom Day</a></li>
<li><a href="#drm-leaflet">DRM leaflet</a></li>
<li><a href="#freedom">Free Software &amp; users freedom</a></li>
<li><a href="#f-droid">"Free Your Android" campaign</a></li>
<li><a href="#fstools">Free Software &amp; tools leaflet</a></li>
<li><a href="#gnupg-leaflet">Email self-defense leaflet</a></li>
<li><a href="#ilovefs">"I Love FS" campaign</a></li>
<li><a href="#nocloud">"There is no cloud" campaign</a></li>
<li><a href="#dfd">Document Freedom Day</a></li>
<li><a href="#tdwyt">"They Don't Want You To ..." campaign</a></li>
</ul>
</div>
@@ -65,7 +63,7 @@
Feel free to decide for yourself.
</p>
<h2 id="id-how-and-what-to-order">How and what to order</h2>
<h2 id="id-how-and-what-to-order">How to order</h2>
<p>
To order promotion material please use the following order form. You might either order our default package or tell us explicitly what kind of promotion material you need or prefer. For example, if you plan to support a special FSFE`s campaign. Please keep in mind, that for postal reasons, in general we just send packages up to 1kg. If you need more, please ask.
@@ -115,26 +113,14 @@ No focus, just send me the default package. That means we will try to ensure tha
<dynamic-content type="fsfe"/>
<h3 id="dfd" class="left break">Document Freedom Day</h3>
<h3 id="freedom" class="left break">Free Software and users freedom</h3>
<dynamic-content type="dfd"/>
<h3 id="drm-leaflet" class="left break">Digital Restrictions Management</h3>
<dynamic-content type="drm"/>
<dynamic-content type="freedom"/>
<h3 id="f-droid" class="left break">Free Your Android</h3>
<dynamic-content type="f-droid"/>
<h3 id="fstools" class="left break">Free Software and users freedom</h3>
<dynamic-content type="fstools"/>
<h3 id="gnupg-leaflet" class="left break">Email self-defense</h3>
<dynamic-content type="gnupg"/>
<h3 id="ilovefs" class="left break">I love Free Software</h3>
<dynamic-content type="ilovefs"/>
@@ -143,6 +129,10 @@ No focus, just send me the default package. That means we will try to ensure tha
<dynamic-content type="nocloud"/>
<h3 id="dfd" class="left break">Document Freedom Day</h3>
<dynamic-content type="dfd"/>
<h3 id="tdwyt" class="left break">The Don't Want You To</h3>
<dynamic-content type="tdwyt"/>