FSFE/fsfe-website
25
31
Fork 91
Code Issues 65 Pull Requests 12 Wiki Activity

revert r35623

Browse Source 
svn path=/trunk/; revision=35624
This commit is contained in:
Max Mehl
2017-07-14 12:23:34 +00:00
parent 5d0e428515
commit 2eee45d076
15 changed files with 32 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contribute/promoitems/.directory
View File

@@ -1,4 +0,0 @@
[Dolphin]
Timestamp=2017,7,14,12,59,58
Version=4
ViewMode=1

20
contribute/promoitems/active-items.en.xml
View File

@@ -49,11 +49,6 @@ Such an item doesn't need an image!
imgsmall="/contribute/promopics/drm_thumb.png"/>
</item>
<item type="hackingforfreedom" id="hacking-for-freedom-sticker-v2" year="2017" order="4">
<image
imgsmall="/contribute/promopics/hacking-for-freedom-sticker-v2-thumb.png"/>
</item>
<!-- Document Freedom Day -->
<item introduction="yes" type="dfd" id="dfd-introduction" order="1" /> <!-- introduction item with just text, doesn't need a picture -->
@@ -103,11 +98,6 @@ Such an item doesn't need an image!
imgsmall="/contribute/promopics/ilovefs_poster_A1_thumb.png"/>
</item>
<item type="ilovefs" id="ilovefs-balloon" year="2015" order="5">
<image
imgsmall="/contribute/promopics/ilovefs-balloon-combined-thumb.png"/>
</item>
<!-- No cloud -->
<item type="nocloud" id="nocloud-sticker" year="2015" order="1">
@@ -128,6 +118,14 @@ Such an item doesn't need an image!
<item type="nocloud" id="nocloud-poster-2sided" year="2015" order="4">
<image
imgsmall="/contribute/promopics/thereisnocloud-poster-thumb.png"/>
</item>
</item>
<!-- Hacking for Freedom -->
<item type="hackingforfreedom" id="hacking-for-freedom-sticker-v2" year="2017" order="1">
<image
imgsmall="/contribute/promopics/hacking-for-freedom-sticker-v2-thumb.png"/>
</item>
</itemset>

14
contribute/promoitems/info-dfd-announcement-dummy.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<infoset>
<info id="dfd-announcement-dummy">
<!-- Leave a tag like <printready> blank or erase it if you don't
want to appear it -->
<!-- Translations for "Type", "Size" etc. can be found in
/tools/texts-**.xml -->
<name>Take note:</name>
<description>
<p>After eight years of running our <a href="http://documentfreedom.org/">Document Freedom Day</a> campaign, <a href="https://fsfe.org/news/2016/news-20160126-01">in 2016 the FSFE handed over</a> the organisation of the campaign to the Digital Freedom Foundation. We still have, however, some stock material that we send out. It will not be reproduced. Get yours before it is too late.</p>
</description>
</info>
</infoset>

3
contribute/promoitems/info-dfd-chance-poster.en.xml
View File

@@ -7,9 +7,6 @@
/tools/texts-**.xml -->
<name>Document Freedom Day - Poster</name>
<description>
<i>Notice: The <a href="http://documentfreedom.org/">Document Freedom Day campaign</a> is now run by the Digital Freedom Foundation. Our DFD items will not be reproduced once we are out of stock.</i><br />
<br />
The poster of our <a href="http://documentfreedom.org/">Document Freedom
Day</a> campaign. The poster is two-sided with one side in English only and
the other side in multiple languages.

2
contribute/promoitems/info-dfd-open-formats-poster.en.xml
View File

@@ -7,8 +7,6 @@
/tools/texts-**.xml -->
<name>Document Freedom Day: Open formats poster</name>
<description>
<i>Notice: The <a href="http://documentfreedom.org/">Document Freedom Day campaign</a> is now run by the Digital Freedom Foundation. Our DFD items will not be reproduced once we are out of stock.</i><br />
<br />
A poster to explain how Open Standards are crucial for the interoperability of
data between different software programs as well as for the longevity of
documents and the sustainability of data.

3
contribute/promoitems/info-dfd-wcryd.en.xml
View File

@@ -7,9 +7,6 @@
/tools/texts-**.xml -->
<name>We Cannot Read Your Documents - Sticker</name>
<description>
<i>Notice: The <a href="http://documentfreedom.org/">Document Freedom Day campaign</a> is now run by the Digital Freedom Foundation. Our DFD items will not be reproduced once we are out of stock.</i><br />
<br />
The "We cannot read your documents" sticker used to be part of our Document
Freedom Day campaign. The slogan highlights the problem in the use of
proprietary file formats, as they exclude all people not using the same

23
contribute/promoitems/info-ilovefs-balloon.en.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<infoset>
<info id="ilovefs-balloon">
<!-- Leave a tag like <printready> blank or erase it if you don't
want to appear it -->
<!-- Translations for "Type", "Size" etc. can be found in
/tools/texts-**.xml -->
<name>I love Free Software - Balloon</name>
<description>
Hand out these balloons on conferences, parties or decorate your local hackerspace! The balloons are printed on both sides.
</description>
<type>Balloon</type>
<context><a href="https://fsfe.org/campaigns/ilovefs/ilovefs.en.html">I love Free Software campaign</a></context>
<printed>
English
</printed>
<license>CC0</license>
<author>Markus Meier</author>
<printready></printready>
</info>
</infoset>

4
contribute/promopics/.directory
View File

@@ -1,4 +0,0 @@
[Dolphin]
Timestamp=2017,7,7,11,32,19
Version=4
ViewMode=1

BIN
contribute/promopics/dfd_dummyitem.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
contribute/promopics/thereisnocloud-v2-preview.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

14
contribute/spreadtheword.en.xhtml
View File

@@ -65,12 +65,13 @@
<p><strong>Available promotion material</strong></p>
<ul>
<li><a href="#fsfe-and-fellowship-material">FSFE and the Fellowship</a></li>
<li><a href="#freedom">Free Software and User Freedom</a></li>
<li><a href="#fsfe-and-fellowship-material">About the FSFE</a></li>
<li><a href="#freedom">About Free Software</a></li>
<li><a href="#f-droid">"Free Your Android" - campaign</a></li>
<li><a href="#ilovefs">"I love Free Software" - campaign</a></li>
<li><a href="#nocloud">"There is no cloud ..." - campaign</a></li>
<li><a href="#dfd">"Document Freedom Day"- campaign</a></li>
<li><a href="#hackingforfreedom">Free Software and User Freedom</a></li>
</ul>
<p><strong>Behind the scenes</strong></p>
@@ -139,14 +140,13 @@ No focus; just send me the default package. That means we will try to ensure tha
<!-- START ITEMIZE TESTING -->
<h3 id="fsfe-and-fellowship-material" class="left break">FSFE and the Fellowship</h3>
<h3 id="fsfe-and-fellowship-material" class="left break">About FSFE and the Fellowship</h3>
<dynamic-content type="fsfe"/>
<h3 id="freedom" class="left break">Free Software and User Freedom</h3>
<h3 id="freedom" class="left break">Free Software and users' freedom</h3>
<dynamic-content type="freedom"/>
<dynamic-content type="hackingforfreedom"/>
<h3 id="f-droid" class="left break">Free Your Android</h3>
@@ -163,6 +163,10 @@ No focus; just send me the default package. That means we will try to ensure tha
<h3 id="dfd" class="left break">Document Freedom Day</h3>
<dynamic-content type="dfd"/>
<h3 id="hackingforfreedom" class="left break">Free Software and User Freedom</h3>
<dynamic-content type="hackingforfreedom"/>

205
contribute/spreadtheword.en.xhtml~
View File

@@ -1,205 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<html>
<head>
<title>Spread the word</title>
<meta content="FSFE's Promotion Material" name="description" />
<meta content="FSFE Graphics Buttons Logo Promotion Sticker Poster Leaflets Flyer Campaigns Free Your Android I cannot read your documents Fellowship Plussy Gnu" name="keywords" />
<style type="text/css">
div.two-column {
float: left;
width: 40%;
}
h1, h2, h3 {
clear: both;
}
.noclear {
clear: none;
}
div#toc {
float: right;
clear: right;
border: solid 1px;
margin: .5em;
background: rgb(240,240,240);
width: 40%;
padding: 1em 1.5em 1.5em 1.5em;
margin: 1.5em;
}
div#toc p {
text-indent: 0.5em;
margin-top: 1.5em;
}
div#toc p.head {
font-size: 1.15em;
text-align: center;
margin-top: 0;
text-indent: 0;
}
form#orderpromo {
clear: both;
margin: 2em 0 3em 0;
width: 70%;
}
</style>
</head>
<body>
<p id="category"><a href="/contribute/">Contribute</a></p>
<h1 id="spread-the-word">Spread the word!</h1>
<div id="toc">
<p class="head"><strong><a href="#how-to-order">Order now</a></strong></p>
<p><strong>Available promotion material</strong></p>
<ul>
<li><a href="#fsfe-and-fellowship-material">About FSFE and the Fellowship</a></li>
<li><a href="#freedom">About Free Software and User Freedom</a></li>
<li><a href="#f-droid">"Free Your Android" - campaign</a></li>
<li><a href="#ilovefs">"I love Free Software" - campaign</a></li>
<li><a href="#nocloud">"There is no cloud ..." - campaign</a></li>
<li><a href="#dfd">"Document Freedom Day"- campaign</a></li>
</ul>
<p><strong>Behind the scenes</strong></p>
<ul>
<li><a href="#feedback">Any Feedback?</a></li>
<li><a href="#archives">Our Archive</a></li>
<li><a href="#upcoming">Upcoming promotion and campaigns</a></li>
</ul>
</div>
<h2 id="promo-material" class="noclear">FSFE Promotion Material</h2>
<p>
Are you going to a Free Software meeting or are you even organising one? Maybe you like to promote Free Software and the work of the FSFE around your friends and colleagues or at some public event? There are various reasons why and when you might like to receive promotion material for Free Software and the FSFE. Whatever it might be, we will be happy to send you our printed promotion material for <strong>no cost</strong>.<br /> On this page, you find an overview about our material and details about each product.</p>
<h2 id="how-to-order" class="noclear">How to order</h2>
<p>
To order promotion material please use the following order form. You can order our default package or individual quantities and tell us explicitly what kind of promotion material you need or prefer. Feel free to decide for yourself. However, please keep in mind, that for postal reasons, in general we just send packages up to 1kg. If you need more, please ask in advance.
</p>
<form class="highlight labeledform" id="orderpromo" method="post" action="/cgi-bin/promotion.php" accept-charset="utf-8">
<!-- Translators: please set the value for the language to your language code -->
<input type="hidden" name="language" value="en" />
<h3>Please send promotional material to:</h3>
<span class="formlabel">First name, Last name:</span>
<input type="text" name="firstname" placeholder="First Name" size="20" />
<input type="text" name="lastname" placeholder="Last Name" size="20" /><br/>
<span class="formlabel">Email:</span>
<input type="text" name="email" placeholder="Email" size="40" /><br/>
<span class="formlabel">Company/Organisation (if any):</span>
<input type="text" name="org" placeholder="Organisation" size="40" /><br/>
<span class="formlabel">Street, No.:</span>
<input type="text" name="street" size="40" /><br/>
<span class="formlabel">Zip, City:</span>
<input type="text" name="city" size="40" /><br/>
<span class="formlabel">Country:</span>
<input type="text" name="country" size="40" /><br/>
<!-- span class="formlabel">Address:</span>
<textarea name="address" rows="4" cols="40"></textarea><br/ -->
<span class="formlabel">I would like the promotion package to focus on:</span>
<textarea name="specifics" rows="6" cols="40">
No focus; just send me the default package. That means we will try to ensure that you receive something from everything listed here. If you have any preferences, please delete this text and state them here.
</textarea><br/>
<span class="formlabel">I would like to use the material for (short description):</span>
<textarea name="usage" rows="4" cols="40"></textarea><br/>
<span class="formlabel">Any comment:</span>
<textarea name="comment" rows="4" cols="40"></textarea><br/>
<input type="submit" name="url" value="I am a spam robot" style="display:none;" />
<span class="formlabel">Support our work with a donation of 10€ or more: </span>
<input type="number" name="donate" value="0" min="0" step="5"/>€
<!-- Translators: please translate the label of this button (the value field) -->
<input type="submit" name="dothis" value="Order now!"/>
<input type="submit" name="url" value="I am a spam robot" style="display:none;" /><br/>
</form>
<h1 id="available-promotion-material" style="margin-top:3em;">Available promotion material</h1>
<!-- START ITEMIZE TESTING -->
<h3 id="fsfe-and-fellowship-material" class="left break">About FSFE and the Fellowship</h3>
<dynamic-content type="fsfe"/>
<h3 id="freedom" class="left break">Free Software and User Freedom</h3>
<dynamic-content type="freedom"/>
<dynamic-content type="hackingforfreedom"/>
<h3 id="f-droid" class="left break">Free Your Android</h3>
<dynamic-content type="f-droid"/>
<h3 id="ilovefs" class="left break">I love Free Software</h3>
<dynamic-content type="ilovefs"/>
<h3 id="nocloud" class="left break">There is no cloud</h3>
<dynamic-content type="nocloud"/>
<h3 id="dfd" class="left break">Document Freedom Day</h3>
<dynamic-content type="dfd"/>
<h3 id="hackingforfreedom" class="left break">Free Software and User Freedom</h3>
<dynamic-content type="hackingforfreedom"/>
<!-- END ITEMIZE TESTING -->
<h2 id="feedback" class="left break">Any feedback?</h2>
<p class="left break">
Did you experience any trouble with your order, found a typo in our text, you have a remark or an idea for upcoming promotion material? Or you just like to send us a motivating message? Please <a href="mailto:contact@fsfe.org">share your feedback</a> with us.</p>
<p class="left break">We are always eager to hear some nice stories or to see pictures that you have with our promotion material. Many people also share their experience and pictures via social media with us. </p>
<h2 id="archives" class="left break">Promotion Material Archive</h2>
<p class="left break">
Sometimes, parts of our promotion material section get outdated. This might be
the case, for example, when specific campaign runs out. However, you can find
and still download older material in our <a
href="/contribute/promotion-materials-archive.en.html">promotion material
archive.</a></p>
<h2 id="upcoming" class="left break">Upcoming promotion and campaigns</h2>
<p class="left break">From time to time, have a look at this page again for new promotional material - we will continue to update it. If you would like to help making new designs or improve old ones, join the <a href="/contribute/designers/designers">designers team</a>. Or if you would like to add translations of pages or materials, join the <a href="/contribute/translators/translators">translators team</a>.
</p>
</body>
</html>
<!--
Local Variables: ***
mode: xml ***
End: ***
-->

19
contribute/spreadtheword.it.xhtml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<html>
<head>
<title>Diffondi il messaggio</title>
<meta content="FSFE's Promotion Material" name="description"/>
<meta content="FSFE's Promotion Material" name="description" />
<meta content="FSFE Graphics Buttons Logo Promotion Sticker Poster Leaflets Flyer Campaigns Free Your Android I cannot read your documents Fellowship Plussy Gnu" name="keywords" />
<style type="text/css">
@@ -71,6 +71,8 @@
<li><a href="#ilovefs">Campagna "I love Free Software"</a></li>
<li><a href="#nocloud">Campagna "There is no cloud ..."</a></li>
<li><a href="#dfd">Campagna "Document Freedom Day"</a></li>
<li><a href="#hackingforfreedom">Software Libero e Libertà Utente</a></li>
</ul>
<p><strong>Dietro le quinte</strong></p>
<ul>
@@ -157,12 +159,17 @@ Nessuna personalizzazione, mandatemi il pacco standard. Questo significa che ti
<h3 id="nocloud" class="left break">There is no cloud</h3>
<dynamic-content type="nocloud"/>
<h3 id="dfd" class="left break">Document Freedom Day</h3>
<dynamic-content type="dfd"/>
<h3 id="hackingforfreedom" class="left break">Software Libero e Libertà Utente</h3>
<dynamic-content type="hackingforfreedom"/>
<!-- END ITEMIZE TESTING -->
<h2 id="feedback" style="clear:none">Qualche segnalazione?</h2>
@@ -178,10 +185,10 @@ Nessuna personalizzazione, mandatemi il pacco standard. Questo significa che ti
Alle volte, parte della sezione sul materiale promozionale può non essere aggiornata.
Ciò potrebbe accadere, per esempio, quando termina una campagna specifica.
In ogni caso puoi ancora trovare e scaricare il materiale più datato nel nostro
<a href="/contribute/promotion-materials-archive.html">archivio del materiale promozionale</a>.</p>
<a href="/contribute/promotion-materials-archive.html">archivio del materiale
promozionale</a>.</p>
<h2 id="upcoming" class="left break">Campagne e promozioni in arrivo </h2>
<p class="left break">Di tanto in tanto dai un'occhiata a questa pagina per nuovo materiale promozionale - la aggiorneremo di frequente. Se ti piacerebbe realizzare dei design nuovi o migliorare quelli già esistenti, unisciti al <a href="/contribute/designers/designers">team dei designer</a>. O se volessi aggiungere traduzioni di pagine o materiali, unisciti al <a href="/contribute/translators/translators">team dei traduttori</a>.

5
contribute/translators/.directory
View File

@@ -1,5 +0,0 @@
[Dolphin]
SortRole=modificationtime
Timestamp=2017,6,16,14,42,10
Version=4
ViewMode=1

1
contribute/translators/translators.sources
View File

@@ -4,4 +4,5 @@ about/people/localteams:[]
about/people/functions:[]
about/people/function-:[]
about/people/countries:[]
about/people/groups:[]
about/people/volunteers:[]