merge new website generation.

3 files changed, 20 insertions, 15 deletions

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index bce2b9a1..0d5be467 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -8,27 +8,29 @@
     <div class="row">
       <div class="col-12 col-sm-4">
         <ul class="footer-list">
-          <li><p><a href="contact.html">{{ _("Contact") }}</a></p></li>
+          <li><a href="{{ url_localized('contact.html') }}">{{ _("Contact") }}</a></li>
         </ul>
       </div>
       <div class="col-12 col-sm-4">
         <ul class="footer-list">
-          <li><p><a href="faq.html">{{ _("FAQ") }}</a></p></li>
+          <li><a href="{{ url_localized('faq.html') }}">{{ _("FAQ") }}</a></li>
         </ul>
       </div>
       <div class="col-12 col-sm-4">
         <ul class="footer-list">
-          <li><p><a href="bibliography.html">{{ _("Bibliography") }}</a></p></li>
+          <li><a href="{{ url_localized('bibliography.html') }}">{{ _("Bibliography") }}</a></li>
         </ul>
       </div>
     </div>
   </div>
   <div class="text-center mt-5">
-    <p>&copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
+    <p>
+      &copy; <a href="https://gnunet.org/en/ev.html">GNUnet e.V.</a> {{_("and") }}
               Taler Systems SA 2015-2019
        <br>
        {{ _("We are grateful for support and free hosting of this site by <a href='http://www.bfh.ch/'>BFH</a>") }}.
        <br>
-       {{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}</p>
+       {{ _("This page was created using <a href='https://www.gnu.org/'>Free Software</a> only.") }}
+    </p>
   </div>
 </footer>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index e75a9433..53320ced 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -37,15 +37,17 @@
     <!--    <link rel="icon" href="../../favicon.ico"> -->
 
     <!-- Bootstrap core CSS -->
-    <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet">
+    <link href="{{ url_dist('css/bootstrap.min.css') }}" rel="stylesheet">
     <!-- Custom styles for this template -->
-    <link href="{{ url('styles.css') }}" rel="stylesheet">
+    <link href="{{ url_static('styles.css') }}" rel="stylesheet">
 
-    <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script>
-    <script src="{{ url('dist/js/bootstrap.min.js') }}"></script>
+    <script src="{{ url_dist('js/jquery-1.11.1.min.js') }}"></script>
+    <script src="{{ url_dist('js/bootstrap.min.js') }}"></script>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
+
+    <link rel="alternate" type="application/rss+xml" title="Taler.net rss" href="{{ url_localized('news/rss.xml') }}" />
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index c8a645bd..3e353737 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -1,12 +1,12 @@
 {% macro navlink(site, text) -%}
-   <a class="nav-link {{ 'active' if filename == site else '' }}"
-      href="/{{ lang }}/{{ site }}">
-    {{ text }}
-   </a>
+  <a class="nav-link {{ 'active' if filename == site else '' }}"
+     href="{{ url_localized(site) }}">
+     {{ text }}
+  </a>
 {%- endmacro %}
 
 <nav class="navbar navbar-expand-lg navbar-light">
-  <a class="navbar-brand taler_home" href="/{{ lang }}/index.html">Taler</a>
+  <a class="navbar-brand taler_home" href="{{ url_localized('index.html') }}">Taler</a>
   <button class="navbar-toggler"
           type="button"
           data-toggle="collapse"
@@ -21,6 +21,7 @@
       {{ navlink('features.html', _('Features')) }}
       {{ navlink('principles.html', _('Principles')) }}
       {{ navlink('docs.html', _('Docs')) }}
+      {{ navlink('news/index.html', _('News')) }}
     </div>
 
     <div class="nav-item dropdown">
@@ -30,7 +31,7 @@
               data-toggle="dropdown"
               aria-haspopup="true"
               aria-expanded="true">
-              <img src="{{ url('images/languageicon.svg') }}"
+              <img src="{{ url_static('images/languageicon.svg') }}"
                     height="35"
                     alt="[{{lang}}]" />
                     {{ lang_full }} [{{ lang }}]