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

fixing images + redirect ilovefs.org to current year's page

Browse Source 
svn path=/trunk/; revision=27717
This commit is contained in:
Max Mehl 2014-01-28 12:30:35 +00:00
parent 1b54538726
commit fb83c060ea
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.htaccess
View File

@ -51,8 +51,8 @@ RewriteRule ^campaigns/valentine/2011(/?)$ /campaigns/valentine/2011/valentine-2
RewriteRule ^campaigns/ayc(.*) /campaigns/askyourcandidates$1 [redirect=permanent]
# Redirection for IloveFS campaign. Should always redirect to the most recent year
RewriteRule ^campaigns/ilovefs(/)?$ /campaigns/ilovefs/2013/ilovefs.html
RewriteRule ^campaigns/ilovefs/ilovefs(.*)html$ /campaigns/ilovefs/2013/ilovefs$1html
RewriteRule ^campaigns/ilovefs(/)?$ /campaigns/ilovefs/2014/ilovefs.html
RewriteRule ^campaigns/ilovefs/ilovefs(.*)html$ /campaigns/ilovefs/2014/ilovefs$1html
# Temporary fix unitl we have a /freesoftware dir for contribute/advocacy/cwfs.en.html
RewriteRule ^freesoftware/freesoftware(.*) /about/basics/freesoftware$1 [redirect=temp]

24
campaigns/ilovefs/2014/ilovefs.en.xhtml
View File

@ -37,8 +37,8 @@ some ideas about how you can go public and proclaim your love to Free
Software.</p>
<ul>
<div class="captioned" style="max-width: 600px; width: 30%; float: right;">
<img src="pics/microblog.png" alt="tweet for i love free software" />
<div class="captioned right" style="max-width: 506px; width: 30%;">
<img src="pics/microblog.png" alt="tweet for i love free software" width="100%" />
<footer>
<p>One of the many tweets and dents for #ilovefs 2013</p>
</footer>
@ -71,11 +71,10 @@ Software.</p>
<ul>
<li>
<div style="float: right; width: 20%;" class="captioned">
<img style="width: 100%;" src="pics/hug-a-dev.png" />
<p><a href="https://blogs.fsfe.org/mk/hug-a-developer-today-peter-stuge">Hugging Peter Stuge</a></p>
</div>
Hug a developer (Obviously better to ask permission first ; )</li>
<div class="captioned right" style="max-width: 640px; width: 20%;">
<img src="pics/hug-a-dev.png" alt="Matthias Kirschner hugging Peter Stuge" width="100%" />
</div>
Hug a developer (Obviously better to ask permission first ; )</li>
<li>Buy your favourite developer a drink. Or buy someone else a drink and
while savouring it, tell him/her about your favorite Free Software
@ -95,10 +94,13 @@ Software.</p>
world! </li>
<li>
<div style="float: right; width: 20%;" class="captioned">
<img style="width: 100%;" src="pics/ilovefs-tshirt.png" />
<p>Martin Gollowitzer wearing one of our T-shirts</p>
</div>
<div class="captioned right" style="max-width: 233px; width: 20%;">
<img src="pics/ilovefs-tshirt.png" alt="Martin Gollowitzer wearing one of our T-shirts" width="100%" />
<footer>
<p>Martin Gollowitzer wearing one of our T-shirts</p>
</footer>
</div>
Wear shirts and sweaters showing your support for Free Software. If
you need new stuff, you can <a href="/order/order.html">order some from
us</a>, or from your favourite Free Software project.</li>