look/elements/figure.less

@@ -7,6 +7,10 @@ figure {
   max-width: 100%;
   position: relative;
 
+  &--no-shadow {
+    box-shadow: none;
+  }
+
   video {
     width: 100%;
 
@@ -42,6 +46,14 @@ figure {
     margin: 30px auto 40px;
     max-width: 90%;
 
+    &--w50 {
+      max-width: 50%;
+    }
+
+    &--w75 {
+      max-width: 75%;
+    }
+
     &.float-left,
     &.float-right {
       margin: 0;

look/elements/toc.less

@@ -0,0 +1,23 @@
+.toc {
+  background: rgb(240, 240, 240);
+  border: 1px solid #a2a9b1;
+  padding: @spacing-2;
+
+  &__title {
+    font-weight: bold;
+    margin-bottom: @spacing-1;
+   }
+
+  &__content {
+    font-size: .9em;
+    line-height: 1.5;
+    margin-bottom: 0;
+  }
+}
+
+@media screen and (min-width: @screen-md-min) {
+  .toc {
+    display: inline-block;
+    width: 80%;
+  }
+}

look/fsfe.less

@@ -1,7 +1,9 @@
+@import "variables";
 @import "style";
 @import "elements/figure";
 @import "elements/podcast";
 @import "elements/sharebuttons";
+@import "elements/toc";
 @import "pages/interview";
 @import "pages/spreadtheword";
 
@@ -842,3 +844,25 @@ video#freeyourandroid {
 .home-newsletter-label {
     margin-top: 30px;
 }
+
+// utilities
+
+.mb-0 {
+    margin-bottom: 0 !important;
+}
+
+.mb-1 {
+    margin-bottom: @spacing-1 !important;
+}
+
+.mb-2 {
+    margin-bottom: @spacing-2 !important;
+}
+
+.mb-3 {
+    margin-bottom: @spacing-3 !important;
+}
+
+.m-3 {
+    margin: @spacing-3 !important;
+}

look/style.less

@@ -554,6 +554,14 @@ div#subpages, .grid-row {
         }
     }
 
+    blockquote .blockquote__name {
+        display: inline-block;
+        font-style: italic;
+        padding-top: @spacing-1;
+        padding-left: @spacing-2;
+        width: 100%;
+    }
+
     pre, pre code {
         white-space: pre;
     }

look/variables.less

@@ -0,0 +1,3 @@
+@spacing-1: .75em;
+@spacing-2: 1.5em;
+@spacing-3: 3em;

news/2019/news-20191022-01.en.xhtml

@@ -6,15 +6,12 @@
 	<title>Annual report of the Free Software Foundation Europe 2019</title>
 
 	<style type="text/css">
-		div#toc {
+		h2 {
-			float: left;
+			margin-top: 1.5em;
-			border: solid 1px;
+		}
-			border-color: blue;
+
-			margin: .5em;
+		h3 {
-			margin-top: 1em;
+			margin-top: .75em;
-			margin-bottom: 2em;
-			background: rgb(240, 240, 240);
-			width: 80%;
 		}
 	</style>
 </head>
@@ -28,7 +25,7 @@
 
 		<p><strong>But this short introduction can only give you some brief ideas and so we invite you to find out your personal favourite of the FSFE's activities in 2019. Please enjoy your reading and if you are not a supporter yet, consider <a href="https://my.fsfe.org/donate">supporting software freedom in Europe</a>.</strong></p>
 
-  <blockquote>
+  <blockquote class="mb-3">
 	  <div class="with-image-right">
 		  <img
 				  class="img-circle"
@@ -37,16 +34,14 @@
 		  <p>
 			  "In a world where software influences virtually every single aspect of our lives, Free Software is a
 			  precondition for a free society."
-		  </p>
+			  <span class="blockquote__name">Reinhard Müller</span>
-		  <p class="source">
-			  Reinhard Müller
 		  </p>
 	  </div>
   </blockquote>
 
-  <div id="toc">
+  <div class="toc">
-	  <p style="text-indent:1em; font-size:150%; padding-top:0.5em; font-weight: bold;">Table of contents</p>
+      <div class="toc__title">Table of contents</div>
-	  <ul style="margin: 1em; font-size:120%; font-weight: bold;">
+      <ul class="toc__content">
           <li><a href="#routerfreedom">ISP's infrastructure ends where Router Freedom begins!</a></li>
           <li><a href="#pmpc">Europeans demand: "Public Money? Public Code!"</a></li>
           <li><a href="#foss4smes">Explaining Free Software to business: Our FOSS4SMEs-project</a></li>
@@ -74,7 +69,7 @@
 			<p><a href="/activities/routers/">Router Freedom</a> is the right for customers of any Internet Service Provider (ISP) to choose and use their private modem and router instead of those that the ISP forces them to use - for example by contract. Such an enforcement comes with a series of problems and it essentially denies freedom of choice, taking away control of technology from users. </p>
 
 			<p>Some years ago, the FSFE has successfully fought for router freedom in Germany. While in 2013 the legal situation in Germany was unclear, some ISPs were using this to already infringing Router Freedom. The FSFE stepped in as early as possible into the public debate with a statement towards the Federal Network Agency and <a href="/activities/routers/timeline.html">from then on</a> started coordinating with other organisations to safeguard users&#39; freedom of choice. Finally, <a href="/news/2016/news-20160725-01.html">a law comes into effect</a>: From August 1st in 2016 on, all Internet Service Providers in Germany have to enable new clients to use alternative modems and routers to connect to the internet. </p>
-
+			
 				<figure>
 					 <img src="/picturebase/booths/201908-booth-at-cccamp-800px.jpg" alt="Participants at a FSFE web-a-thon." />
 					 <figcaption>FSFE booth in the cluster about:freedom during the Chaos Communication Camp.</figcaption>
@@ -84,20 +79,20 @@
 		<h3 id="routerfreedomineurope">Router Freedom in Europe</h3>
 
 			<p>Now, the same debate reaches the European level, with Internet Service Providers (ISP) wanting to impose direct access to their modems and routers even after its selling to end costumers.  The problematic steppingstone for the implementation of Router Freedom in Europe relates to legal and technical aspects around the "Network Termination Point" (NTP) - a definition of where the ISP's infrastructure ends and the user's begins. If the NTP would be defined as behind the router, the user might not have the right to use their own equipment because it belongs to the ISP and would be covered by contract. This position subjugates users to contract restrictions that would effectively undermine their freedom to choose and use their own routers. To counteract this freedom limitation and <strong>to protect users' control of technology, the FSFE has started monitoring the status of router freedom in several countries and has been preparing an <a href="https://wiki.fsfe.org/Activities/CompulsoryRouters/">"activity package"</a></strong> for people and organisations willing to advocate for router freedom. The package compiles information about how to raise awareness among people, ideas how to build alliances with organisations, the (counter-)arguments to be used in the discussions, as well how to demand controlling and supervision from the National Regulatory Agencies (NRA).</p>
-
+			
-
+				
 
 
 	<h2 id="pmpc">Europeans demand: "Public Money? Public Code!"</h2>
 
 			<p>At the FSFE, we want legislation requiring that publicly financed software developed for the public sector be made publicly available under a Free Software licence. In 2017, we started a campaign to demand that software which is created using taxpayers’ money is published as public code as well. <strong>Code paid by the people should be available to the people!</strong></p>
-
+			
 				<figure>
 					<a href="https://my.fsfe.org/donate"><img src="/picturebase/fundraising/2019-Francesca-Bria-1200x630.en.png" alt="Francesca Bria supports the FSFE's campaign Public Money? Public Code!" /></a>
 				</figure>
 
 			<p>The <a href="https://publiccode.eu/">Public Money? Public Code! campaign</a> (PMPC) aims to set Free Software as the standard for publicly financed software. Public administrations following this principle can benefit from collaboration with other public bodies, independence from single vendors, potential tax savings, increased innovation, and a better foundation for IT security. <strong>Backed by more than 150 organisations</strong>, we have run and seen a mix of different awareness activities demanding public code this year.</p>
-
+					
 
 		<h3 id="parliamentasturias">Parliament of Asturias demands public code</h3>
 
@@ -111,9 +106,7 @@
 				  alt="Iyán Méndez Veiga" />
 		  <p>
 			  "The idea behind was that they are totally different parties but we want them all to vote the same thing. So we tried to emphasise different benefits of Free Software to the different parties. [... Now] the proposal of the Parliament has three main items and the very first one is that the Parliament of Asturias supports the international "Public Money? Public Code!" initiative. [...] I think for the first time, a lot of politicians understood what Free Software is."
-		  </p>
+			  <span class="blockquote__name">Iyán Méndez Veiga</span>
-		  <p class="source">
-			  Iyán Méndez Veiga
 		  </p>
 	  </div>
   </blockquote>
@@ -168,7 +161,7 @@
 			<p>Thanks to our efforts, in a last minute action back in September 2018, <strong>the European Parliament adopted an amendment to <a href="/news/2019/news-20190326-01">at least protect Free Software developing platforms</a> from having to install upload filters.</strong> This can be seen as a success of our campaign to <a href="https://savecodeshare.eu/">“Save Code Share”</a> that we started in 2017. More than 14,000 people supported our <a href="https://savecodeshare.eu/#research">open letter</a> which requests EU legislators to preserve the ability to collaboratively build software online under the new EU Copyright Directive proposal.</p>
 
 			<p>We are glad we were able to raise awareness and understanding of what drives software development in Europe nowadays among many policy makers. The exclusion of Free Software code hosting and sharing providers from this directive is a sign showing that the EU wants to keep Free Software development in Europe healthy, solid and alive. Yet, we are dismayed that the EU missed the opportunity to reform copyright to a reasonable extent.</p>
-
+			
 				<figure>
 					 <img src="/picturebase/onstage/201907-Alex-Sander-Church-Day_800pxl.JPG" alt="FSFE Booth at Veganmania in Vienna, Austria" />
 					 <figcaption>Our EU Policy Advisor Alexander Sander speaking at the protestant church assembly.</figcaption>
@@ -206,7 +199,7 @@
 			<p>The FSFE assists these software projects with any Free Software copyright and licensing issues that they may run into, checks their repository for license compliance, as well as recommends their adoption of the <a href="https://reuse.software">REUSE specifications</a>. With over 150 software projects expected to be involved in NGI Zero, <strong>the FSFE can  ensure that a large number of developing software funded by the EC will be made available as Free Software</strong>, a goal also shared by the NGI Initiative. Compliance with REUSE standards will ensure that code from these projects can be easily reused and shared among the community.</p>
 
 			<p>2019 was an important year for the FSFE and the NGI Initiative. The NGI programs officially began accepting software projects in January, and the FSFE has developed for these projects <a href="https://download.fsfe.org/NGI0/">educational documents</a> on Free Software legal and licensing issues. Since August, we have also begun checking their repositories for compliance with licensing best practices, and giving them recommendations on how to do so. With more projects being accepted into these programs every 2 months, this endeavor is an ongoing one which the FSFE expects to be involved with until 2021.</p>
-
+			
 				<figure>
 					 <img src="/picturebase/booths/201904-booth-at-linuxwochen-wien-800px.jpg" alt="FSFE Booth at Linuxwochen Wien" />
 					 <figcaption>FSFE Booth at Linuxwochen Wien</figcaption>
@@ -282,23 +275,21 @@
 			<p>Every day, we are happy to see that our community becomes stronger. In the last years, we exceeded some ten thousand people from Europe and beyond who are supporting our cause by <a href="/contribute/spreadtheword">spreading our word</a>, signing our open letters, subscribing to our <a href="https://lists.fsfe.org/mailman/listinfo/newsletter-en">newsletter</a> or joining our <a href="https://lists.fsfe.org/mailman/listinfo/discussion">public discussions</a>. But as impressive as numbers are, they cannot  speak for the creative and engaged individual people behind them. And so we had the idea to <strong>let our community members speak for themselves</strong> and created a dedicated <a href="/about/people/testimonials">testimonials page</a>.</p>
 
 
-  <blockquote>
+  <blockquote class="mb-2">
 	  <div class="with-image-right">
 		  <img
 				  class="img-circle"
 				  src="/picturebase/people/2018-alexandra-busch-300px.jpg"
-				  alt="Busch"/>
+				  alt="Busch" />
 		  <p>
 			  "I believe that Free Software can help us change our society fundamentally for the better and I believe
 			  the best way to do so is together with other volunteers from all over Europe!"
-		  </p>
+			  <span class="blockquote__name">Alexandra Busch</span>
-		  <p class="source">
-			  Alexandra Busch
 		  </p>
 	  </div>
   </blockquote>
 
-  <blockquote>
+  <blockquote class="mb-2">
 	  <div class="with-image-right">
 		  <img
 				  class="img-circle"
@@ -308,16 +299,14 @@
 			  "The Free Software Foundation Europe (FSFE) brings together dedicated and engaged activists from all over
 			  Europe to seize the opportunities to secure our rights to use, share, study, and improve software because
 			  without Free Software, technology subjugates us instead of enhancing our freedom."
-		  </p>
+			  <span class="blockquote__name">Hugo Roy</span>
-		  <p class="source">
-			  Hugo Roy
 		  </p>
 	  </div>
   </blockquote>
 
 			<div class="text-center">
 				<a
-						class="btn btn-lg btn-success"
+						class="btn btn-lg btn-success mb-3"
 						href="/about/people/testimonials">
 					See more testimonials
 				</a>
@@ -342,7 +331,7 @@
 			<p>In the recent months we have seen prominent people apologising, taking a break, resigning or being removed for their behaviour. Without talking about individual cases, in sum there is probably one thing that can be taken out of it: That there is an ever growing importance for many members inside larger Free Software communities towards a proper behaviour safeguarded by a proper code of conduct.</p>
 
 			<p>While at the FSFE it was always our goal to offer a safe and welcoming environment for everyone. Since more than two years we have an official <a href="about/codeofconduct">Code of Conduct</a> in place "to offer a friendly and peaceful environment for every participant at the FSFE's events, online and offline". </p>
-
+			
 				<figure>
 					 <img src="/picturebase/events/201905-webathon-group-picture-800px.jpg" alt="Participants at a FSFE web-a-thon." />
 					 <figcaption>Participants at a FSFE web-a-thon.</figcaption>
@@ -369,7 +358,7 @@
 
 			<p>One of the FSFE's goals is to help individuals and organisations to understand how Free Software contributes to freedom, transparency, and self-determination. To this end we reach out to the public by participating in events. Since our last annual report <strong>we participated in over 60 events in 11 European countries</strong> (Austria, Belgium, Bulgaria, France, Germany, Italy, Portugal, Serbia, Spain, Switzerland, The Netherlands), many of which we gave public presentations and talks, most prominently about "Public Money? Public Code!", Sustainability of (Free) Software, Security with Free Software and Free Your Android. With the help of our local volunteers, we have even been able to also set up an information-booth in more than 20 of these events.</p>
 
-
+				
 
 			<p>Then we also self-organize a lot of events, that we like to shed light on some of them:</p>
 
@@ -377,8 +366,8 @@
 
 			<p>In January, we invited key Free Software groups of Europe to share public policy-related actions with each other - at both the EU and the national levels. And by the end of September we organised another policy meeting in order to discuss the goals of the Free Software movement during the next European Parliament term. This event was also attend by the Vice President of the European Parliament, Marcel Kolaja, and many European Commission officials. <strong>As an important milestone, we commonly agreed on an open letter with <a href="/news/2019/news-20191002.html">“Free and Open Source EU Policy Recommendations”</a>.</strong></p>
 
-
+				
-
+				
 				<figure>
 					 <img src="/picturebase/events/201904-llw-team-800px.jpg" alt="The team organising and running the FSFE's Legal Licensing Workshop." />
 					 <figcaption>The team organising and running the FSFE's Legal Licensing Workshop.</figcaption>
@@ -389,7 +378,7 @@
 
 			<p>The FSFE continued organising its <a href="/activities/ftf/legal-conference.html">Free Software Legal and Licensing Workshop</a> (LLW), over the course of three days in Barcelona. In its 12th iteration of the event, <strong>the LLW served again as a meeting point for eligible legal experts in the field of Free Software licensing</strong> to discuss current issues and best practices. For this year, the loose theme of the LLW was "The Long Term View: Looking Back and Planning Ahead", to allow participants to reflect on the histories that have forged the current legal landscape, and provide opportunities to discuss the way forward to tackle the issues facing Free Software licensing.</p>
 
-
+				
 
 			<p>As with the years before, the LLW 2019 took place under the <a href="https://www.chathamhouse.org/chatham-house-rule">Chatham House Rule</a>, allowing the 135 attendees to voice their viewpoints unencumbered. Some speakers waived their rights under the Chatham House Rule, which allowed journalist Jake Edge from LWN.net to write about a number of discussions that took place during the event. You can read more in <a href="https://lwn.net/Archives/ConferenceByYear/#2019-Free_Software_Legal__Licensing_Workshop">Jake Edge’s articles</a>.</p>
 
@@ -398,8 +387,8 @@
 
 			<p>This year we have seen our <a href="https://wiki.fsfe.org/Events/2018/1124-fsfe-hackathon">first</a> and <a href="https://wiki.fsfe.org/Events/2019/0525-fsfe-web-a-thon">second</a> web-a-thon. <strong>These web-a-thons are happenings in that we bring together technologically interested volunteers from all around Europe</strong> with the intend to spend a weekend together, have a great time with each other and to collectively work on our homepage. You can see our achievements in the respective milestones in our git (<a href="https://git.fsfe.org/FSFE/fsfe-website/milestone/9?state=closed">milestone 1</a>, <a href="https://git.fsfe.org/FSFE/fsfe-website/milestone/10?state=closed">milestone 2</a>) but what you cannot see in there is the good mood and spirit that we experience on these occasions. That is why herewith we bring another big thank you to everyone who participated and if you feel motivated now, don't miss to join the next one! </p>
 
-
+				
-
+				
 				<figure>
 					 <img src="/picturebase/events/201905-webathon-800px.jpg" alt="Participants in our second web-a-thon, May 2019" />
 					 <figcaption>Participants in our second web-a-thon, May 2019</figcaption>
@@ -411,7 +400,7 @@
 
 			<p>Another major event has been our participation at the Chaos Communication Camp where we aligned with other digital rights and sustainability groups to form together a cluster <a href="https://events.ccc.de/camp/2019/wiki/Village:About:freedom">"about:freedom"</a>, our participation at FOSDEM and of course all the others : )</p>
 
-
+				
 
 
 
@@ -429,9 +418,7 @@
 				  alt="Lasota" />
 		  <p>
 			  "Legal and policy interns at the FSFE have an important role helping the team accomplishing a wide variety of tasks, campaigns and events. They are responsible for creating legal and policy documents, conducting researches, organizing events, collaborating with volunteers and backing up the team in daily organizational life. It is a great way to start a professional career in the Free Software world!"
-		  </p>
+			  <span class="blockquote__name">Lucas Lasota</span>
-		  <p class="source">
-			  Lucas Lasota
 		  </p>
 	  </div>
   </blockquote>
@@ -445,13 +432,13 @@
 
 			<p><strong>The FSFE empowers users to promote digital freedom in the real world</strong> by offering a large set of promotion material. You can find inspiration about the <a href="/contribute/spreadtheword#100-freedoms-black-sticker">100 freedoms of Free Software</a> and why <a href="/contribute/spreadtheword#nocloud-sticker">There is no Cloud, just other people's computers</a>, or leaflets to help you explain <a href="/contribute/spreadtheword#freedom">Free Software</a>, <a href="/contribute/spreadtheword#gnupg-leaflet">Email encryption</a>, the dangers of <a href="/contribute/spreadtheword#drm-leaflet">DRM</a> and how to <a href="/contribute/spreadtheword#f-droid-leaflet">Free Your Android</a>. You can also find postcards, posters and stickers of our <a href="/contribute/spreadtheword.html#pmpc">Public Money? Public Code!</a> and <a href="/contribute/spreadtheword.html#ilovefs">I love Free Software campaign</a>. Order your own material now and help us to spread the word!</p>
 
-				<figure>
+				<figure class="figure--no-shadow">
 					 <a href="/contribute/spreadtheword"><img src="/graphics/infomaterial-450px.png" alt="Picture of FSFE's info material" /></a>
 				</figure>
 
   <div class="text-center">
 	  <a
-			  class="btn btn-lg btn-success"
+			  class="btn btn-lg btn-success mb-3"
 			  href="/contribute/spreadtheword">
 		  Order our info material
 	  </a>
@@ -464,7 +451,7 @@
 
 			<p>Next to our promotion material, we also offer to show your love for Free Software by using and wearing some of our <a href="/order/">merchandise items</a>. Free Software clothing is a great way of raising awareness within your local community, and each sale helps to fund critical FSFE projects. </p>
 
-  <figure>
+  <figure class="figure--w50">
 	  <a href="/order/">
 		  <img src="/order/2017/kidstshirt-fork-red-front-large.jpg" alt="Kid's shirt"/>
 	  </a>
@@ -474,9 +461,9 @@
 			<p>In the last 12 months we sold over 1100 shirts and hoodies among which our  <a href="https://fsfe.org/order#tshirt-nocloud-black">"There is NO CLOUD"</a>, our <a href="https://fsfe.org/order#tshirt-pmpc-black">“Public Money? Public Code!”</a> and our <a href="https://fsfe.org/order#zipped-fsfs-black">zipped Hoodies</a> have been the most popular items. </p>
 
 		<h2 id="outlook">Looking forward</h2>
-
+		
-
+		
-			<p>New European Commission President Ursula von der Leyen announced to concretise her European digital agenda after her first 100 days in office, in particular "legislation on the human and ethical implications of artificial intelligence". Also we expect an Open Source Strategy by the European Commission. The FSFE will keep a close eye on these proposals to guarantee a safe environment for Free Software in Europe. We will further focus on advocating for router freedom in Europe to help people stay in control of their technology and explain European decision makers the dangers of locking down devices with the European Radio Lockdown Directive.</p>
+			<p>New European Commission President Ursula von der Leyen announced to concretise her European digital agenda after her first 100 days in office, in particular "legislation on the human and ethical implications of artificial intelligence". Also we expect an Open Source Strategy by the European Commission. The FSFE will keep a close eye on these proposals to guarantee a safe environment for Free Software in Europe. We will further focus on advocating for router freedom in Europe to help people stay in control of their technology and explain European decision makers the dangers of locking down devices with the European Radio Lockdown Directive.</p>	
 
 			<p>To <strong>help decision-makers better understand the impact Free Software has</strong> on security and digital sustainability, we are preparing analyses of these topics and their connection with Free Software. To help with our research you can already take part in a limesurvey regarding <a href="https://survey.fsfe.org/853518">Free Software and IT security</a>. For our research on digital sustainability we will keep working together with the German ministry of environment and other organisations that will help us addressing this issue on European level.</p>
 
@@ -492,14 +479,14 @@
 
 			<p><strong>Your Free Software Foundation Europe</strong></p>
 
-
+			
 				<figure>
 					 <img src="/picturebase/events/201910-fsfe-ga-meeting-participants.jpg" alt="Participants at the FSFE's General Assembly 2019" />
 					 <figcaption>Participants at the FSFE's General Assembly 2019</figcaption>
 				</figure>
+			
 
-
+			
-
 
 		<h2 id="about">About the Free Software Foundation Europe</h2>