FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

Merge branch 'fellowship2supporter' of FSFE/fsfe-website into master

This commit is contained in:
Max Mehl 2017-11-21 11:20:27 +01:00 committed by Gogs
parent 1fadbdfdc6 697a8e92ae
commit 32dbc27b93
30 changed files with 3795 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
build/xslt/footer_sitenav.xsl
View File

@ -58,8 +58,8 @@
<xsl:element name="li">
<xsl:attribute name="class">support</xsl:attribute>
<xsl:element name="a">
<xsl:attribute name="href">/donate/donate.html#ref-fullmenu</xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/donate'" /></xsl:call-template>
<xsl:attribute name="href">/join?ref-fullmenu</xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/support'" /></xsl:call-template>
</xsl:element>
<xsl:element name="ul">
@ -90,42 +90,7 @@
</xsl:for-each>
</xsl:element>
<!--/ul-->
<!-- Fellowship portal menu -->
<xsl:element name="ul">
<xsl:attribute name="class">fellowship</xsl:attribute>
<xsl:element name="li">
<xsl:attribute name="class">fellowship</xsl:attribute>
<xsl:element name="a">
<xsl:attribute name="href">/fellowship/</xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/fellowship'" /></xsl:call-template>
</xsl:element>
<xsl:element name="ul">
<xsl:variable name="menu"><xsl:value-of select="@id" /></xsl:variable>
<xsl:for-each select="/buildinfo/menuset/menu[@parent='fellowship']">
<!--<xsl:sort select="@id"/>-->
<xsl:sort select="@priority" />
<xsl:variable name="id"><xsl:value-of select="@id" /></xsl:variable>
<xsl:element name="li">
<xsl:choose>
<xsl:when test="not(string(.))">
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
</xsl:when>
<xsl:when test=". = concat(/buildinfo/@filename ,'.html')">
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="$id" /></xsl:call-template>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:element> <!-- /li -->
</xsl:for-each>
</xsl:element><!-- end ul -->
</xsl:element>
</xsl:element>
</xsl:element> <!-- /li -->
<!-- Planet portal menu -->

8
build/xslt/fsfe_followupsection.xsl
View File

@ -53,13 +53,13 @@
<xsl:when test="/buildinfo/document/followup = 'join'">
<xsl:attribute name="class">join</xsl:attribute>
<xsl:element name="h2">
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-fellowship'" /></xsl:call-template>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/become'" /></xsl:call-template>
</xsl:element>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join-paragraph'" /></xsl:call-template>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support-paragraph'" /></xsl:call-template>
<xsl:element name="a">
<xsl:attribute name="href">/fellowship/join.html?ref-followupbox</xsl:attribute>
<xsl:attribute name="href">/join?ref-followupbox</xsl:attribute>
<xsl:attribute name="class">btn</xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join'" /></xsl:call-template>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support'" /></xsl:call-template>
</xsl:element>
</xsl:when>
<xsl:when test="/buildinfo/document/followup = 'no'">

17
build/xslt/fsfe_pageheader.xsl
View File

@ -46,11 +46,20 @@
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'page-info'" /></xsl:call-template>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">/join?fsfe-header</xsl:attribute>
<xsl:attribute name="id">direct-to-join</xsl:attribute>
<xsl:element name="i">
<xsl:attribute name="class">fa fa-user-plus fa-lg</xsl:attribute>
</xsl:element>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'support/become'" /></xsl:call-template>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">/fellowship/login.html</xsl:attribute>
<xsl:attribute name="id">direct-to-login</xsl:attribute>
<xsl:element name="i">
<xsl:attribute name="class">fa fa-user fa-lg</xsl:attribute>
<xsl:attribute name="class">fa fa-sign-in fa-lg</xsl:attribute>
</xsl:element>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fellowship/login'" /></xsl:call-template>
</xsl:element>
@ -110,12 +119,6 @@
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'fsfe/press'" /></xsl:call-template>
</xsl:element>
</xsl:element>
<xsl:element name="li">
<xsl:element name="a">
<xsl:attribute name="href">/join</xsl:attribute>
<xsl:call-template name="fsfe-gettext"><xsl:with-param name="id" select="'join'" /></xsl:call-template>
</xsl:element>
</xsl:element>
</xsl:element>
<!--/ul#menu-list-->

2
build/xslt/fsfe_sidebar.xsl
View File

@ -61,7 +61,7 @@
<xsl:if test="string(/buildinfo/document/@newsdate)">
<a href="/donate/index.html" class="small-donate">
<xsl:call-template name="fsfe-gettext">
<xsl:with-param name="id" select="'donate'" />
<xsl:with-param name="id" select="'support/become'" />
</xsl:call-template>
</a>
</xsl:if>

BIN
fonts/FontAwesome.otf Normal file
View File

Binary file not shown.

BIN
fonts/fontawesome-webfont.470.eot Normal file
View File

Binary file not shown.

2671
fonts/fontawesome-webfont.470.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 434 KiB

BIN
fonts/fontawesome-webfont.470.ttf Normal file
View File

Binary file not shown.

BIN
fonts/fontawesome-webfont.470.woff Normal file
View File

Binary file not shown.

BIN
fonts/fontawesome-webfont.470.woff2 Normal file
View File

Binary file not shown.

2
index.de.xhtml
View File

@ -23,7 +23,7 @@
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Der FSFE beitreten</a>
<a class="big-donate" href="/join?ref-frontpage">Werde ein Unterstützer</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

2
index.en.xhtml
View File

@ -26,7 +26,7 @@
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Join the FSFE</a>
<a class="big-donate" href="/join?ref-frontpage">Become a supporter</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

2
index.fr.xhtml
View File

@ -26,7 +26,7 @@
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Rejoignez la FSFE</a>
<a class="big-donate" href="/join?ref-frontpage">Devenez un soutien</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
<subscribe-nl/>

2
index.nl.xhtml
View File

@ -28,7 +28,7 @@ evenementen en campagnes." />
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Join the FSFE</a>
<a class="big-donate" href="/join?ref-frontpage">Word een supporter</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

2
index.pl.xhtml
View File

@ -26,7 +26,7 @@
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Dołącz do FSFE</a>
<a class="big-donate" href="/join?ref-frontpage">Zostań naszym darczyńcą</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

2
index.pt.xhtml
View File

@ -26,7 +26,7 @@
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="/join?ref-frontpage">Junte-se à FSFE</a>
<a class="big-donate" href="/join?ref-frontpage">Torne-se um apoiante</a>
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>

68
index.ru.xhtml
View File

@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<title>ЕФСПО - Европейский фонд свободного программного обеспечения</title>
<script src="/scripts/jquery.cycle2.min.js" type="text/javascript"></script>
<meta name="description" content="Некоммерческая организация,
популяризующая и поддерживающая свободу программного обеспечения.
Новости, события, кампании." />
<meta name="keywords" content="ефспо свободные программы открытый
исходный текст foss floss фспо публичный сектор государства gpl" />
</head>
<body class="frontpage" id="index-html">
<campaigns />
<h1 class="hide">Европейский фонд свободного программного обеспечения</h1>
<div id="feeds">
<div id="news" class="section">
<h2>
<a href="/news/news.html"><news-label /></a>
<a class="rss-feed" href="/news/news.rss" title="Новостная лента RSS"><i class="fa fa-rss"></i></a>
<a class="ical" href="http://identi.ca/fsfe" title="Следите за ЕФСПО на identi.ca"><i class="fa fa-comments-o"></i></a>
</h2>
<all-news />
</div>
<div id="newsletter" class="section">
<h2><a href="/news/newsletter.html"><newsletter-label /></a></h2>
<subscribe-nl />
<ul id="more-news-list">
<li><a href="/news/news.html" class="learn-more">Архив новостей</a></li>
<li><a href="http://planet.fsfe.org/en" class="learn-more">Блоги «Планета»</a></li>
</ul>
<a class="big-donate" href="donate/donate.html#ref-frontpage">Пожертвования</a>
</div>
<hr />
<div id="events" class="section">
<h2>
<a href="/events/events.html"><events-label /></a>
<a class="rss-feed" href="/events/events.rss" title="Лента RSS событий"><i class="fa fa-rss"></i></a>
<a class="ical" href="webcal://fsfe.org/events/events.ics" title="События ЕФСПО в виде ленты iCal"><i class="fa fa-calendar-o"></i></a>
</h2>
<all-events />
</div>
</div>
</body>
<!--Do not translate this ↓-->
<followup>join</followup>
<timestamp>$Date$ $Author$</timestamp>
</html>
<!--
Local Variables: ***
mode: xml ***
End: ***
-->

6
look/fellowship.min.css vendored
View File

File diff suppressed because one or more lines are too long

1141
look/fonts.less
View File

File diff suppressed because it is too large Load Diff

6
look/fsfe.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
look/style.less
View File

@ -167,7 +167,7 @@ div#subpages, .grid-row {
padding: .5em;
}
#direct-to-menu-list, #direct-to-translations, #direct-to-home, #direct-to-login {
#direct-to-menu-list, #direct-to-translations, #direct-to-home, #direct-to-login, #direct-to-join {
visibility: visible;
display: inline-block;
@ -297,7 +297,7 @@ div#subpages, .grid-row {
box-shadow: 0 .4em 1em rgb(200,200,200);
@media (min-width: @screen-sm) {
padding: 3em;
padding: 3em 3em 3em 2em;
}
}
@ -870,6 +870,7 @@ div#subpages, .grid-row {
p {
.make-sm-column(8);
padding: 0;
padding-top: 1em;
}
a.btn {
.make-sm-column(2);

6
look/valentine.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
tools/menu-global.xml
View File

@ -10,9 +10,10 @@
<menu id="fsfe/contact" priority="5" parent="fsfe">/contact/contact.html</menu>
<menu id="support" />
<menu id="support/support" priority="0" parent="support">/support/support.html</menu>
<menu id="support/order" priority="1" parent="support">/order/order.html</menu>
<menu id="support/thankgnus" priority="2" parent="support">/donate/thankgnus.html</menu>
<menu id="support/become" priority="0" parent="support">/join?ref-fullmenu</menu>
<menu id="support/donate" priority="1" parent="support">/donate/donate.html</menu>
<menu id="support/order" priority="2" parent="support">/order/order.html</menu>
<menu id="support/thankgnus" priority="3" parent="support">/donate/thankgnus.html</menu>
<!--menu id="support/funds" priority="3" parent="support">/about/funds/funds.html</menu-->
<menu id="fellowship" />

2
tools/texts-de.xml
View File

@ -82,6 +82,7 @@
<text id="support/support">Unterstützen</text>
<text id="support/order">Fanartikel</text>
<text id="support/thankgnus">Unsere Spender</text>
<text id="support/become">Werde ein Unterstützer</text>
<text id="fellowship/fellowship">Fellowship</text>
<text id="fellowship/login">Login</text>
<text id="fellowship/join">Beitreten</text>
@ -199,6 +200,7 @@
<p>FSFE benötigt Deine Unterstützung, um gehört zu werden! Jeder Treffer zählt!</p>
</text>
<text id="support-fsfe">Ich unterstütze die FSFE!</text>
<text id="support-paragraph"><p>Wenn du uns unterstützt, stärkst du unsere Arbeit und hilfst dabei, unsere finanzielle Unabhängigkeit zu sichern.</p></text>
<text id="donate">Spenden</text>
<text id="donate-paragraph">
<p>

2
tools/texts-en.xml
View File

@ -84,6 +84,7 @@
<text id="support/support">Support</text>
<text id="support/order">Shop</text>
<text id="support/thankgnus">Donors</text>
<text id="support/become">Become a supporter</text>
<text id="fellowship/fellowship">Fellowship</text>
<text id="fellowship/login">Login</text>
<text id="fellowship/join">Join</text>
@ -205,6 +206,7 @@
<p>FSFE needs your support to get its voice heard! Every hit counts!</p>
</text>
<text id="support-fsfe">I support the FSFE!</text>
<text id="support-paragraph"><p>By becoming a supporter of the FSFE you empower our work and help to assure our financial independence.</p></text>
<text id="donate">Donate</text>
<text id="donate-paragraph">

2
tools/texts-fr.xml
View File

@ -84,6 +84,7 @@ permise sur tout support, pourvu que cette notice soit préservée.
<text id="support/support">Nous soutenir</text>
<text id="support/order">Boutique</text>
<text id="support/thankgnus">Nos donateurs</text>
<text id="support/become">Devenez un soutien</text>
<text id="fellowship/fellowship">La Fellowship</text>
<text id="fellowship/login">Connexion</text>
<text id="fellowship/join">Adhérer</text>
@ -206,6 +207,7 @@ permise sur tout support, pourvu que cette notice soit préservée.
<p>La FSFE a besoin de voutre soutien pour que sa voix soit entendue&#160;! Chaque soutien est important&#160;!</p>
</text>
<text id="support-fsfe">Je soutiens la FSFE !</text>
<text id="support-paragraph"><p>En devenant un soutien de la FSFE vous nous donnez les moyens de faire notre travail et vous aidez à assurer notre indépendance financière.</p></text>
<text id="donate">Faire un don</text>
<text id="donate-paragraph">
<p>

2
tools/texts-nl.xml
View File

@ -84,6 +84,7 @@ worden hier bewaard voor archiefdoeleinden. </text>
<text id="support/support">Steun</text>
<text id="support/order">Winkel</text>
<text id="support/thankgnus">Donoren</text>
<text id="support/become">Word een supporter</text>
<text id="fellowship/fellowship">Fellowship</text>
<text id="fellowship/login">Login</text>
<text id="fellowship/join">Meedoen</text>
@ -210,6 +211,7 @@ toegang tot onze infrastructuur.</p>
<p>FSFE heeft uw steun nodig om haar stem gehoord te krijgen! Iedere klik telt!</p>
</text>
<text id="support-fsfe">Ik steun de FSFE!</text>
<text id="support-paragraph"><p>Door een supporter van de FSFE te worden stelt u ons in staat om te werken en helpt u onze financiële onafhankelijkheid zeker te stellen.</p></text>
<text id="donate">Doneer</text>
<text id="donate-paragraph">

2
tools/texts-pl.xml
View File

@ -62,6 +62,7 @@
<!-- !! MISSING TRANSLATION --> <text id="support/support">Support</text>
<!-- !! MISSING TRANSLATION --> <text id="support/order">Shop</text>
<!-- !! MISSING TRANSLATION --> <text id="support/thankgnus">Donors</text>
<text id="support/become">Zostań naszym darczyńcą</text>
<!-- !! MISSING TRANSLATION --> <text id="fellowship/fellowship">Fellowship</text>
<!-- !! MISSING TRANSLATION --> <text id="fellowship/login">Login</text>
<!-- !! MISSING TRANSLATION --> <text id="fellowship/join">Join</text>
@ -175,6 +176,7 @@
<p>FSFE needs your support to get its voice heard! Every hit counts!</p>
</text>
<!-- !! MISSING TRANSLATION --> <text id="support-fsfe">I support the FSFE!</text>
<text id="support-paragraph"><p>Zostając darczyńcą FSFE wspierasz naszą pracę i zapewniasz nam niezależność finansową.</p></text>
<text id="donate">Darowizny</text>
<!-- !! MISSING TRANSLATION --> <text id="donate-paragraph">
<p>

2
tools/texts-pt.xml
View File

@ -52,6 +52,7 @@
<text id="support/support">Apoie</text>
<text id="support/order">Loja</text>
<text id="support/thankgnus">Doadores</text>
<text id="support/become">Torne-se um apoiante</text>
<text id="fellowship/fellowship">Junte-se</text>
<text id="fellowship/login">Login</text>
<text id="fellowship/join">Junte-se</text>
@ -166,6 +167,7 @@
<p>A FSFE precisa do seu apoii para que a sua voz seja ouvida! Todos os hits contam!</p>
</text>
<text id="support-fsfe">Eu apoio a FSFE!</text>
<text id="support-paragraph"><p>Tornando-se um apoiante da FSFE, você irá potenciar o nosso trabalho e ajudar a assegurar a nossa independência financeira.</p></text>
<text id="donate">Doações</text>
<text id="donate-paragraph">
<p>

2
tools/texts-ru.xml
View File

@ -82,6 +82,7 @@
<text id="support/support">Поддержка</text>
<text id="support/order">Магазин</text>
<text id="support/thankgnus">Благодарности</text>
<text id="support/become">Стань сторонником</text>
<text id="fellowship/fellowship">Содружество</text>
<text id="fellowship/login">Авторизоваться</text>
<text id="fellowship/join">Присоединяйтесь</text>
@ -200,6 +201,7 @@
нуждается в вашей поддержке. Важен каждый ваш голос!</p>
</text>
<text id="support-fsfe">Я поддерживаю ЕФСПО!</text>
<text id="support-paragraph"><p>Становясь сторонником ЕФСПО, вы поддерживаете наш труд и укрепляете нашу финансовую независимость.</p></text>
<text id="donate">Пожертвования</text>
<text id="donate-paragraph">
<p>