Merge branch 'master' of ssh://gnunet.org/www into master

3 files changed, 136 insertions, 156 deletions

diff --git a/template/index.html.j2 b/template/index.html.j2
index 52d6a25..fb0ac82 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -9,16 +9,9 @@
       </div>
     </div>
 
-      <div>
-        <img src="{{ url_static('images/gnunet-logo-dark-text.png') }}"  alt="GNUnet" />
-      </div>
-    <div class="row">
-      <div class="container text-center">
-        <a class="link" href="news/{{newsdata[0]['page']}}">{{ newsdata[0]['date'] }}: {{ newsdata[0]['title'] }}</a>
-      </div>
+    <div>
+      <img src="{{ url_static('images/gnunet-logo-dark-text.png') }}"  alt="GNUnet" />
     </div>
-
-
   </div>
 </div>
 <div class="container-fluid greybox">
@@ -259,6 +252,20 @@
       </div>
     </div>
   </div>
+
+  <div class="row mt-5">
+  </div>
+  <div class="container">
+    <div class="col-8">
+      <h2><a href="{{ url_localized('news/index.html')}}">{{ _("News") }}</a></h2>
+    </div>
+    {% for item in newsdata[:3] %}
+    <div class="col-8">
+      <a href="news/{{ item['page'] }}" title="{{ item['date']}}">{{ item['date'] }}: {{ item['title'] }}</a>
+    </div>
+   {% endfor %}
+  </div>
+
 </div>
 <hr style="padding: 2em;"/>
 <div class="container-fluid">
@@ -279,31 +286,4 @@
     </div>
   </div>
 </div>
-
-
-
-<!--<div class="container-fluid">
-  <div class="container">
-    <div class="row">
-      <div class="container text-center">
-        <h1>{{ _("News") }}<a name="news"></a></h1>
-      </div>
-    </div>
-    {% for item in newsdata[:4] %}
-    <div class="row">
-        <div class="col-lg-12">
-          <a href="news/{{ item['page'] }}" title="{{ item['date']}}">{{ item['date'] }}: {{ item['title'] }}</a>
-        </div>
-    </div>
-    {% endfor %}
-    <div class="row">
-      <div class="container text-center">
-        <p>
-          <a class="btn btn-primary btn-lg" href="{{ url_localized('news') }}">{{ _("News Archive") }}</a>
-        </p>
-      </div>
-    </div>
-  </div>
-</div>
--->
 {% endblock body_content %}
diff --git a/template/install-on-debian9.html.j2 b/template/install-on-debian9.html.j2
index 2e3ee95..2a3cde0 100644
--- a/template/install-on-debian9.html.j2
+++ b/template/install-on-debian9.html.j2
@@ -35,7 +35,7 @@
   </p>
 
   <code>
-      $ sudo apt install git libtool autoconf autopoint libargon2-dev\<br>
+      $ sudo apt install git libtool autoconf autopoint libargon2-dev \<br>
       build-essential libgcrypt-dev libidn11-dev zlib1g-dev \<br>
       libunistring-dev libglpk-dev miniupnpc libextractor-dev \<br>
       libjansson-dev libcurl4-gnutls-dev gnutls-bin libsqlite3-dev \<br>
diff --git a/www.yml b/www.yml
index b5386f8..519450f 100644
--- a/www.yml
+++ b/www.yml
@@ -232,11 +232,11 @@ videoslist:
     authors:
       - Christian Grothoff
     location: IETF
-    description: 
+    description:
     name: GNU Name System
     sources:
       - https://git.gnunet.org/gnunet-videos-2019.git/plain/IETF104/GNU_Name_System_-_2019_Edition_IETF104__Christian_Grothoff.webm
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/IETF104/slides-104-dinrg-gnu-name-system-00.pdf
     comment:
@@ -244,265 +244,265 @@ videoslist:
     authors:
       - t3sserakt
     location: Datenspuren 2018
-    description: 
+    description:
     name: State of the GNUnet
     sources:
       - https://git.gnunet.org/gnunet-videos-2018.git/plain/Datenspuren2018/DS2018-9337-deu-State_of_the_GNUnet_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2018
     authors:
       - sva
     location: hack.lu
-    description: 
+    description:
     name: You Broke The Internet - Let's Make a GNU One
     sources:
       - https://git.gnunet.org/gnunet-videos-2018.git/plain/hack.lu/Hack.lu_2018_LT_-_GNUnet_-_You_Broke_The_Internet_Lets_Make_A_GNU_One__sva.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2018
     authors:
       - Christian Grothoff
-    location: 
-    description: 
+    location:
+    description:
     name: GNS - The GNU Name System - Overview
     sources:
       - https://git.gnunet.org/gnunet-videos-2018.git/plain/GNS_-_The_GNU_Name_System_-_Overview.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2017
     authors:
       - Christian Grothoff
     location: Technische Universitaet Muenchen
-    description: 
+    description:
     name: Big Data, Little Data, No Data
     sources:
       - https://git.gnunet.org/gnunet-videos-2017.git/plain/Big_Data-Little_Data-No_Data.mp4
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/grothoff/grothoff_bigdata-littledata-nomoredata_tum2017.pdf
-    comment: 
+    comment:
   - year: 2017
     authors:
       - lynX
     location: 34C3
-    description: 
+    description:
     name: Three Ways to Enhance Metadata Protection Beyond Tor
     sources:
       - https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-1-eng-Three_Ways_to_Enhance_Metadata_Protection_Beyond_Tor_-_secushareorg_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2017
     authors:
       - t3sserakt
     location: 34C3
-    description: 
+    description:
     name: Modeling Trust in a Distributed Private Social Network
     sources:
       - https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-2-eng-Modeling_Trust_in_a_Distributed_Private_Social_Network_-_secushareorg_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2017
     authors:
       - lynX
     location: 34C3
-    description: 
+    description:
     name: Scalable and privacy-respectful distributed systems - Our chance to avoid cloud computing
     sources:
       - https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-7-eng-Scalable_and_privacy-respectful_distributed_systems_-_Our_chance_to_avoid_cloud_computing_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2017
     authors:
       - lynX
       - Christian Grothoff
     location: 34C3
-    description: 
+    description:
     name: Privacy-Oriented Distributed Networking for an Ethical Internet
     sources:
       - https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-6-eng-Privacy-Oriented_Distributed_Networking_for_an_Ethical_Internet_-_including_50_subsystems_of_GNUnet_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2016
     authors:
       - Daniel Golle
     location: Battlemesh v9 (Porto, Portugal)
-    description: 
+    description:
     name: GNUnet For Mesh Communities
     sources:
       - https://git.gnunet.org/gnunet-videos-2016.git/plain/Battlemeshv9/Gnunet%20For%20Mesh%20Communities%20-%20Battlemesh%20v9%20(Porto%20Portugal).mp4
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/GNUnet_For_Mesh_Communities-Daniel_Golle-Battlemeshv9_Portugal.pdf
-    comment: 
+    comment:
   - year: 2016
     authors:
       - Jeff Burdges
     location: GNU Hacker Meeting 2016
-    description: 
+    description:
     name: Xolotl - A compact mixnet format with stronger forwared secrecy and hybrid anonymity
     sources:
       - https://git.gnunet.org/gnunet-videos-2015.git/plain/GHM%202015/expose-GNUJeffBurdges19aout2016.mp4
     mirror_sources:
       - http://videos.rennes.inria.fr/Workshop-GNUHackersMeetings2016/expose-GNUJeffBurdges19aout2016.mp4
-    slides: 
-    comment: 
+    slides:
+    comment:
   - year: 2016
     authors:
       - t3sserakt
       - xrs
     location: Datenspuren 2016
-    description: 
+    description:
     name: secushare
     sources:
       - https://git.gnunet.org/gnunet-videos-2016.git/plain/Datenspuren2016/DS2016-7775-deu-Secushare_webm-hd.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2015
     authors:
       - Christian Grothoff
     location: PSC 2015
-    description: 
+    description:
     name: "The Architecture of the GNUnet: 45 Subsystems in 45 Minutes"
     sources:
       - https://git.gnunet.org/gnunet-videos-2015.git/plain/psc2015/grothoff.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2015
     authors:
       - t3sserakt
       - demos
     location: Datenspuren 2015
-    description: 
+    description:
     name: Echt Dezentrales Netzwerk
     sources:
       - https://git.gnunet.org/gnunet-videos-2015.git/plain/Datenspuren2015/datenspuren15-7069-de-EDN_-_Echt_Dezentrales_Netzwerk_webm.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2015
     authors:
       - Florian Dold
     location: 32C3
-    description: 
+    description:
     name: Byzantine Fault Tolerance Set Consensus with Efficient Set Reconciliation
     sources:
       - https://git.gnunet.org/gnunet-videos-2015.git/plain/32c3/byzantine-fault-tolerant-set-consensus-with-efficient-set-reconciliation.mp4
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2015
     authors:
       - Daniel Golle
     location: BattleMesh 2015
-    description: 
+    description:
     name: GNUnet in Community Networks
     sources:
       - https://git.gnunet.org/gnunet-videos-2015.git/plain/BattleMeshV8/GNUnet%20in%20Community%20Mesh%20Networks%20+%20Slides%20-%20BattleMeshV8.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Florian Dold
     location: 31C3
-    description: 
+    description:
     name: Electronic Voting and Key Generation in Distributed Systems
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/voting-voting.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Markus Sabadello
       - Suhin Mohan Adapa
     location: 31C3
-    description: 
+    description:
     name: FreedomBox Status Update
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/freedombox-freedombox.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Lucas Fulchir
     location: 31C3
-    description: 
+    description:
     name: why TLS sucks and what I am doing about it
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/fenrir-fenrir.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Nicolas Benes
     location: 31C3
-    description: 
+    description:
     name: Panic! An approach for home routers to securely erase sensitive data
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Christian Grothoff
       - Douwe Korff
       - Jacob Appelbaum
     location: Council of Europe
-    description: 
+    description:
     name: "After Snowden: using law and technology to counter snooping"
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/2014-coe.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Christian Grothoff
       - Florian Dold
     location: 31C3
-    description: 
+    description:
     name: Taler
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/taler-taler.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Markus Benter
     location: 31C3
-    description: 
+    description:
     name: Complex Queries in P2P networks
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/queries-queries.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2014
     authors:
       - Bernd Paysan
     location: 31C3
-    description: 
+    description:
     name: net2o - Reinventing the Internet
     sources:
       - https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/net2o-net2o.webm
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment:
   - year: 2013
     authors:
       - Christian Grothoff
@@ -510,11 +510,11 @@ videoslist:
       - Jacob Appelbaum
       - Richard Stallman
     location: Berlin
-    description: 
+    description:
     name: "You broke the Internet. We're making ourselves a GNU one."
     sources:
       - https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/2013-youbroketheinternet-event/grothoff_slides_berlin.pdf
       - https://git.gnunet.org/presentations.git/plain/2013-youbroketheinternet-event/lynx_slides_secushare.pdf
@@ -523,78 +523,78 @@ videoslist:
     authors:
       - Christian Grothoff
     location: GNU Hacker Meeting 2013
-    description: 
+    description:
     name: The GNU Name System and the Future of Social Networking with GNUnet
-    sources: 
+    sources:
     mirror_sources:
       - https://audio-video.gnu.org/video/ghm2013/Christian_Grothoff-The_GNU_Name_System_and_the_Future_of_Social_Networking_with_GNUnet_.webm
-    slides: 
-    comment: 
+    slides:
+    comment:
   - year: 2013
     authors:
       - Christian Grothoff
     location: 30C3
-    description: 
+    description:
     name: The GNU Name System
-    sources: 
+    sources:
     mirror_sources:
       - https://cdn.media.ccc.de/congress/2013/mp4-lq/30c3-5212-en-The_GNU_Name_System_h264-iprod.mp4
-    slides: 
-    comment: 
+    slides:
+    comment:
   - year: 2013
     authors:
       - Markus Teich
     location: Technische Universitaet Muenchen
-    description: 
+    description:
     name: Monkey - generating Useful Bug Reports Automatically
-    sources: 
+    sources:
     mirror_sources:
       - https://media.net.in.tum.de/videos/standalonevideo/video/491
-    slides: 
+    slides:
     comment: TUM internal access
   - year: 2012
     authors:
       - Martin Schanzenbach
     location: Technische Universitaet Muenchen
-    description: 
+    description:
     name: A Censorship-Resistant and Fully Decentralized Naming System
-    sources: 
+    sources:
     mirror_sources:
       - https://media.net.in.tum.de/videoarchive/SS12/Oberseminar/2012+09+19_1600+Design+and+Implementation+of+a+Censorship+Resist/priv/camera.mp4
-    slides: 
-    comment: 
+    slides:
+    comment:
   - year: 2010
     authors:
       - Matthias Wachs
     location: GNU Hacker Meeting 2010
-    description: 
+    description:
     name: GNUnet - Transport and Transport Selection
     sources:
       - https://git.gnunet.org/gnunet-videos-2010.git/plain/GHM_Hague/GNUnet_-_Transports_and_Transport_Selection.ogv
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/wachs_ghm_presentation.pdf
-    comment: 
+    comment:
   - year: 2010
     authors:
       - Nathan S. Evan
     location: GNU Hacker Meeting 2010
-    description: 
+    description:
     name: GNUnet Distributed Data Storage - DHT and Distance Vector Transport
     sources:
       - https://git.gnunet.org/gnunet-videos-2010.git/plain/GHM_Hague/GNUnet_Distributed_Data_Storage_-_DHT_and_Distance_Vector_Transport.ogv
-    mirror_sources: 
+    mirror_sources:
     slides:
       - https://git.gnunet.org/presentations.git/plain/evans_ghm_presentation.pdf
-    comment: 
+    comment:
   - year: 2010
     authors:
       - Christian Grothoff
     location: GNU Hacker Meeting 2010
-    description: 
+    description:
     name: Introduction to the GNUnet Peer-to-Peer Framework
     sources:
       - https://git.gnunet.org/gnunet-videos-2010.git/plain/GHM_Hague/Introduction_to_The_GNUnet_Peer-to-Peer_Framework.ogv
-    mirror_sources: 
-    slides: 
-    comment: 
+    mirror_sources:
+    slides:
+    comment: