FSFE/fsfe-website
25
30
Fork 87
Code Issues 62 Pull Requests 9 Wiki Activity

Adds the promo image to the home page and updates the sidebar layout
All checks were successful
the build was successful
Details

Browse Source
This commit is contained in:
Michael Weimann 2018-11-25 14:10:03 +01:00
parent 892282a701
commit 6888d3cd59
Signed by: mweimann
GPG Key ID: 34F0524D4DA694A1
9 changed files with 119 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pr-material.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 KiB

BIN
graphics/t-shirt-promo-v2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 KiB

42
index.en.xhtml
View File

@ -19,26 +19,24 @@
<h2>
<a href="/news/news.html"><news-label /></a>
<a class="rss-feed" href="/news/news.rss" title="news RSS feed"><i class="fa fa-rss"></i></a>
<a class="ical" href="https://mastodon.social/@fsfe" title="follow FSFE on Mastodon" rel="me"><i class="fa fa-comments-o"></i></a>
<a class="ical" href="https://mastodon.social/@fsfe" title="follow FSFE on Mastodon" rel="me">
<i class="fa fa-comments-o"></i>
</a>
</h2>
<all-news />
<div class="more-news">
<a href="/news/news.html" class="learn-more">See all news</a>
<a href="https://planet.fsfe.org/en" class="learn-more community-blog-link">Read the Community blog</a>
</div>
</div>
<div id="newsletter" class="section">
<a class="big-donate" href="https://my.fsfe.org/support">Become a supporter</a>
<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">See all news</a></li>
<li><a href="http://planet.fsfe.org/en" class="learn-more">Read FSFE blogs</a></li>
</ul>
<static-element id="video" />
<h2 class="home-newsletter-label">
<newsletter-label/>
</h2>
<subscribe-nl/>
Read <a href="/news/newsletter.html"> the archive</a>
</div>
<hr />
@ -54,11 +52,19 @@
</div>
<div id="shop-promo" class="section">
<a href="/order/order.html?ref-frontpage"><img src="/graphics/tshirt-promo.jpg" alt="" /></a>
<div class="home-shop-block">
<a href="/order/order.html?ref-frontpage" class="home-order-image-container">
<img src="/graphics/t-shirt-promo-v2.png" alt="" class="home-order-image" />
</a>
<a class="big-donate" href="/order/order.html?ref-frontpage">Shop</a>
</div>
<div class="home-shop-block">
<a href="/order/order.html?ref-frontpage" class="home-order-image-container">
<img src="/graphics/pr-material.png" alt="" class="home-order-image" />
</a>
<a class="big-donate" href="/order/order.html?ref-frontpage">Promotion material</a>
</div>
</div>
</div>
</body>

1
index.sources
View File

@ -4,3 +4,4 @@ events/*/event:[front-page]
tools/frontpage/:[]
d_day:[]
tools/static-elements/element-:[]

2
index.xsl
View File

@ -29,7 +29,7 @@
<xsl:template match="all-news">
<xsl:call-template name="fetch-news">
<xsl:with-param name="tag">front-page</xsl:with-param>
<xsl:with-param name="nb-items" select="5" />
<xsl:with-param name="nb-items" select="4" />
<xsl:with-param name="show-date" select="'yes'" />
<!--TODO enable a "Read More" link with class "learn-more" at the end of newsteaser-->
</xsl:call-template>

50
look/fsfe.less
View File

@ -471,6 +471,8 @@ img.signatory-logo {
display: block;
margin: .5em 0;
}
margin-bottom: 20px;
}
#feeds {
@ -985,11 +987,6 @@ video#freeyourandroid {
max-width: 500px;
}
.news-supporter-media-title {
display: block;
margin-bottom: 1rem;
}
.news-sidebar {
// there is no sidebar on mobile
display: none;
@ -1005,3 +1002,46 @@ video#freeyourandroid {
display: none;
}
}
.more-news {
display: flex;
justify-content: space-between;
margin-top: 2rem;
a.learn-more {
font-size: 1.3em;
font-weight: bold;
white-space: nowrap;
}
}
#formnl {
#submit {
.btn;
.btn-lg;
.btn-block;
.btn-primary;
font-size: 1.4em;
margin-bottom: 5px;
}
}
.home-order-image-container {
display: block;
margin-bottom: 10px;
text-align: center;
.home-order-image {
width: 80%;
}
}
.home-shop-block {
margin-bottom: 50px;
}
.home-newsletter-label {
margin-top: 30px;
}

45
look/style.less
View File

@ -296,8 +296,6 @@ div#subpages, .grid-row {
#main, #followup {
background: @body-bg;
display: flex;
gap: 20px;
margin: 1em auto;
padding: 1.5em;
font-size: 1.1em;
@ -1095,22 +1093,27 @@ a.learn-more {
border-bottom: 1px dotted @brand-primary;
font-variant: small-caps;
text-transform: lowercase;
}
a.learn-more:hover {
text-decoration: none;
border-bottom-style: solid;
}
a.learn-more:after {
padding-left: 0.3em;
content: " ▸";
opacity: 0.8;
transition: padding-left 0.15s linear 0s, color 0.15s linear 0s, opacity 0.15s linear 0s;
}
a.learn-more:hover:after {
padding-left: 0.6em;
margin-right: -0.3em;
content: " ▸";
opacity: 1;
padding-right: 1em;
position: relative;
&:hover {
text-decoration: none;
border-bottom-style: solid;
}
&:after {
position: absolute;
right: .3em;
content: " ▸";
opacity: 0.8;
transition: all 150ms linear;
}
&:hover:after {
right: 0;
content: " ▸";
opacity: 1;
}
}
.social-link {
@ -1124,8 +1127,12 @@ a.learn-more:hover:after {
.btn-block;
.btn-success;
font-size: 1.4em;
margin-top: 2em;
}
.supporter-text {
margin-top: 5px;
}
.small-donate, .small.donate {
.btn;
.btn-sm;

15
tools/static-elements/element-supportervideo.en.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<elementset>
<element id="video">
<h2>Support the fsfe</h2>
<h2>Support the FSFE</h2>
<video
crossorigin="crossorigin"
@ -18,16 +18,9 @@
src="https://download.fsfe.org/videos/supporter/cryptie_mobile.webm"/>
<track default="default" label="English" srclang="en" kind="subtitles" src="https://download.fsfe.org/videos/supporter/subtitles/cryptie.vtt"/>
</video>
<small class="news-supporter-media-title">
Cryptie fsfe supporter
</small>
<p>
By becoming a supporter of the FSFE you empower our work and help to assure our financial independence.
<p class="supporter-text">
By becoming a FSFE supporter you empower our work and help to assure our financial independence.
</p>
<div class="share-buttons-sidebar">
<a target="_blank" href="https://facebook.com/thefsfe">
<button class="share-button-sidebar share-support">Support us</button>
</a>
</div>
<a class="big-donate" href="https://my.fsfe.org/support">Become a supporter</a>
</element>
</elementset>

32
tools/xsltsl/static-elements.xsl
View File

@ -54,20 +54,24 @@
</xsl:variable>
<form id="formnl" name="formnl" method="POST" action="//lists.fsfe.org/mailman/listinfo/newsletter-{$nl-lang}">
<p>
<select id="language" name="language" onchange="var form = document.getElementById('formnl'); var sel=document.getElementById('language'); form.action='//lists.fsfe.org/mailman/listinfo/newsletter-'+sel.options[sel.options.selectedIndex].value">
<xsl:for-each select="document('')/xsl:stylesheet/nl:langs/nl:lang">
<xsl:element name="option">
<xsl:attribute name="value"><xsl:value-of select="@value" /></xsl:attribute>
<xsl:if test="$nl-lang = @value"><xsl:attribute name="selected" /></xsl:if>
<xsl:value-of select="." />
</xsl:element>
</xsl:for-each>
</select> <!-- select -->
<!--<input id="email" name="email" type="email" placeholder="{$email}"/>-->
<input id="submit" type="submit" value="{$submit}" />
</p>
<select id="language" name="language"
class="form-control form-control-lg input-lg"
onchange="var form = document.getElementById('formnl'); var sel=document.getElementById('language'); form.action='//lists.fsfe.org/mailman/listinfo/newsletter-'+sel.options[sel.options.selectedIndex].value">
<xsl:for-each select="document('')/xsl:stylesheet/nl:langs/nl:lang">
<xsl:element name="option">
<xsl:attribute name="value">
<xsl:value-of select="@value"/>
</xsl:attribute>
<xsl:if test="$nl-lang = @value">
<xsl:attribute name="selected"/>
</xsl:if>
<xsl:value-of select="."/>
</xsl:element>
</xsl:for-each>
</select>
<!--<input id="email" name="email" type="email" placeholder="{$email}"/>-->
<input id="submit" type="submit" value="{$submit}"/>
</form>
</xsl:template>