finally merge new layout

17 files changed, 16 insertions, 32 deletions

diff --git a/news/2014-11.html.j2 b/news/2014-11.html.j2
index aabb301b..0280963e 100644
--- a/news/2014-11.html.j2
+++ b/news/2014-11.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2014-11: Launching taler.net</h1>
 <p>
   Welcome to our new site about the Taler electronic payment system.
diff --git a/news/2014-12.html.j2 b/news/2014-12.html.j2
index adff6e64..6542cc9e 100644
--- a/news/2014-12.html.j2
+++ b/news/2014-12.html.j2
@@ -1,14 +1,13 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2014-12: Watch Christian Grothoff&#39;s FOSSA talk on Taler</h1>
 <p>
-  <video id="video" poster="/images/fossa2014.png" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/fossa2014.png') }}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/grothoff2014fossa.webm" type="video/webm">
       <source src="/videos/grothoff2014fossa.ogv" type="video/ogv">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('/images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2015-02.html.j2 b/news/2015-02.html.j2
index 0880a591..efdcf375 100644
--- a/news/2015-02.html.j2
+++ b/news/2015-02.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2015-02x: Taler becomes an official GNU package</h1>
 <p>
   Taler was accepted into the GNU project today.  GNU will offer advice,
diff --git a/news/2015-11.html.j2 b/news/2015-11.html.j2
index b45a2b05..9a633c9f 100644
--- a/news/2015-11.html.j2
+++ b/news/2015-11.html.j2
@@ -1,14 +1,13 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2015-11: Christian Grothoff explains the goals behind Taler</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/inria2015interview.webm" type="video/webm">
       <source src="/videos/inria2015interview.ogv" type="video/ogv">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png') }}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png') }}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2015-12.html.j2 b/news/2015-12.html.j2
index 506b07dd..f443e614 100644
--- a/news/2015-12.html.j2
+++ b/news/2015-12.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2015-12: Taler Demo for Chrome/Chromium online</h1>
 <p>
   We finally have a first simple demo for Taler online. The Firefox-variant
diff --git a/news/2016-06.html.j2 b/news/2016-06.html.j2
index f79421f9..0a19549f 100644
--- a/news/2016-06.html.j2
+++ b/news/2016-06.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2016-06: GNU Taler 0.0.0 released</h1>
 <p>
   We have reached our first big milestone, the 0.0.0 release!
diff --git a/news/2016-08.html.j2 b/news/2016-08.html.j2
index f2a7d342..e0e303d9 100644
--- a/news/2016-08.html.j2
+++ b/news/2016-08.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2016-08: Taler Systems S.A. created</h1>
 <p>
   We now have a business entity for Taler.  Potential investors may
diff --git a/news/2016-09.html.j2 b/news/2016-09.html.j2
index 24046a89..c1a91513 100644
--- a/news/2016-09.html.j2
+++ b/news/2016-09.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2016-09: Taler Web Payments paper published</h1>
 <p>
   We just finished the camera-ready version of our paper on how to use Taler
diff --git a/news/2016-10.html.j2 b/news/2016-10.html.j2
index f21d9338..3f381df0 100644
--- a/news/2016-10.html.j2
+++ b/news/2016-10.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2016-10: Taler Wallet for Firefox online</h1>
 <p>
   We now have a first version of the Taler wallet for Firefox.
diff --git a/news/2016-12.html.j2 b/news/2016-12.html.j2
index 25aa3857..418d8bc7 100644
--- a/news/2016-12.html.j2
+++ b/news/2016-12.html.j2
@@ -1,14 +1,13 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2016-12: Christian Grothoff explains Taler at hasgeek in Bangalore</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="720" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="720" controls="controls">
     <source src="/videos/grothoff2016bangalore.webm" type="video/webm">
       <source src="/videos/grothoff2016bangalore.ogv" type="video/ogv">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by hasgeek</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by hasgeek</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-01.html.j2 b/news/2017-01.html.j2
index b44bff45..6708b3c6 100644
--- a/news/2017-01.html.j2
+++ b/news/2017-01.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-01: Taler Documentation pages updated</h1>
 <p>
   <a href="https://docs.taler.net/">docs.taler.net</a> is now
diff --git a/news/2017-02.html.j2 b/news/2017-02.html.j2
index 1a5ab1d7..a7e02c75 100644
--- a/news/2017-02.html.j2
+++ b/news/2017-02.html.j2
@@ -1,14 +1,13 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-02: Florian Dold explains Taler at 50p in Bangalore</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/dold50p.webm" type="video/webm">
       <source src="/videos/dold50p.ogv" type="video/ogv">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Florian Dold, produced by 50p</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Florian Dold, produced by 50p</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-03.html.j2 b/news/2017-03.html.j2
index 605010ed..84f87baa 100644
--- a/news/2017-03.html.j2
+++ b/news/2017-03.html.j2
@@ -1,14 +1,13 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-03: Sva explains GNU Taler at FOSSASIA in Singapore</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/taler2017fossasia.webm" type="video/webm">
       <source src="/videos/taler2017fossasia.ogv" type="video/ogv">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by Engineers.SG</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by Engineers.SG</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-04.html.j2 b/news/2017-04.html.j2
index 1d1f5fb1..f02c80d5 100644
--- a/news/2017-04.html.j2
+++ b/news/2017-04.html.j2
@@ -1,15 +1,14 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child&#39;s play</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/taler2017eh.webm" type="video/webm">
       <source src="/videos/taler2017eh.ogv" type="video/ogv">
         <source src="/videos/taler2017eh.mp4" type="video/mp4">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Sva, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-08.html.j2 b/news/2017-08.html.j2
index 50e82505..3eb78841 100644
--- a/news/2017-08.html.j2
+++ b/news/2017-08.html.j2
@@ -1,15 +1,14 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-08: We explain GNU Taler at SHA 2017</h1>
 <p>
-  <video id="video" poster="{{ url('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
+  <video id="video" poster="{{ url_static('images/logo-2018-dold.svg')}}" autobuffer="" height="360" width="640" controls="controls">
     <source src="/videos/sha2017taler.webm" type="video/webm">
       <source src="/videos/sha2017taler.ogv" type="video/ogv">
         <source src="/videos/sha2017taler.mp4" type="video/mp4">
   </video>
 </p>
 <p>
-  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+  <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="{{ url_static('images/ccby.png')}}"></a><br>"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Jeff Burdges, Christian Grothoff and Sereni-T, produced by c3voc.de</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
 </p>
 {% endblock body_content %}
diff --git a/news/2017-10.html.j2 b/news/2017-10.html.j2
index 726c612b..e9d847ea 100644
--- a/news/2017-10.html.j2
+++ b/news/2017-10.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2017-10: GNU Taler v0.4.0 released</h1>
 <p>
   We are happy to announce the release GNU Taler v0.4.0 with support for customer
diff --git a/news/2018-04.html.j2 b/news/2018-04.html.j2
index edf91b94..4fdba8dc 100644
--- a/news/2018-04.html.j2
+++ b/news/2018-04.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/news.j2" %}
 {% block body_content %}
-
 <h1>2018-04: GNU Taler v0.5.0 released</h1>
 <p>
   We are happy to announce the release of GNU Taler v0.5.0.
@@ -11,7 +10,8 @@
   API for merchants that also enables the implementation of
   GNU Taler wallets on platforms that do not support
   WebExtensions.
-  <br>
+</p>
+<p>
   The Chrome and Chromium wallets are available for download
   via the App store.  The exchange, merchant backend and bank
   components are on the GNU FTP mirrors.