4 files changed, 49 insertions, 6 deletions

diff --git a/common/footer.j2.inc b/common/footer.j2.inc
index 07bd219f..b663d6bb 100644
--- a/common/footer.j2.inc
+++ b/common/footer.j2.inc
@@ -27,7 +27,7 @@
     <p>
       Copyright &copy;
       <a href="{{ url_localized('ev.html') }}">GNUnet e.V.</a>
-      2001 &mdash; 2020.
+      2001 &mdash; 2021.
       <a href="https://git.gnunet.org/www.git">{{ _("Source code of this site.") }}</a>
       <a href="{{ url_localized('contact.html') }}">{{ _("Report issues with this website.") }}</a>
     </p>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 9d797fed..b97c9eec 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -55,7 +55,7 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-    <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" href="{{ url_localized('news/rss.xml') }}" />
+    <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" href="{{ url_localized('rss.xml') }}" />
 
     <!-- opengraph -->
     <!--
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index 2237ecf9..5acf913f 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -46,7 +46,7 @@
         <ul class="dropdown-menu" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="{{ url_localized('engage.html') }}">{{ _("Engage") }} </a></li>
           <li><a class="dropdown-item" href="{{ url_localized('gsoc.html') }}">{{ _("GSoC Projects") }}</a></li>
-          <li><a class="dropdown-item" href="{{ url_localized('ev.html') }}">{{ _("GNUnet e.V.") }}</a></li>
+          <li><a class="dropdown-item" href="{{ url_localized('ev.html') }}">GNUnet e.V.</a></li>
           <li><a class="dropdown-item" href="{{ url_localized('copyright.html') }}">{{ _("Copyright for Contributors") }} </a></li>
           <!-- li><a class="dropdown-item" href="https://old.gnunet.org/bot/log/gnunet">{{ _("IRC Archive") }}</a></li -->
         </ul>
@@ -60,9 +60,7 @@
         <ul class="dropdown-menu" aria-labelledby="navbarMain">
           <li><a class="dropdown-item" href="{{ url_localized('architecture.html') }}">{{ _("System Architecture") }}</a></li>
 
-<!-- TODO fill with content
-
-          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') }}">{{ _("Roadmap") }}</a></li>-->
+          <li><a class="dropdown-item" href="{{ url_localized('roadmap.html') }}">{{ _("Roadmap") }}</a></li>
           <li><a class="dropdown-item" href="https://bugs.gnunet.org" target="_blank">{{ _("Bug Tracker") }}</a></li>
           <li><a class="dropdown-item" href="https://git.gnunet.org" target="_blank">{{ _("Source Code") }}</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/doxygen/">{{ _("Source Code Documentation") }}</a></li>
@@ -86,6 +84,7 @@
           <li><a class="dropdown-item" href="{{ url_localized('video.html') }}">{{ _("Videos") }}</a></li>
           <li><a class="dropdown-item" href="{{ url_localized('glossary.html') }}">{{ _("Glossary") }}</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://docs.gnunet.org/handbook/gnunet.html">{{ _("Handbook") }}</a></li>
+    <li><a class="dropdown-item" target="_blank" href="{{ url_localized('livingstandards.html') }}">Living Standards</a></li>
           <li><a class="dropdown-item" target="_blank" href="https://rest.gnunet.org/">{{ _("REST API") }}</a></li>
           <li><a class="dropdown-item" href="{{ url_localized('faq.html') }}">{{ _("FAQ") }}</a></li>
           <li><a class="dropdown-item" href="https://bib.gnunet.org/date.html" target="_blank">{{ _("Bibliography") }}</a></li>
diff --git a/common/old-news.j2.inc b/common/old-news.j2.inc
new file mode 100644
index 00000000..d4d45ef4
--- /dev/null
+++ b/common/old-news.j2.inc
@@ -0,0 +1,44 @@
+{% macro oldnews(year) %}
+  <div class="container-fluid">
+    <div class="container">
+      <article>
+        <div class="row">
+          <div class="container text-center">
+            <h1>{{ _("News") + " " + (year|string) }}<a name="news"></a></h1>
+            <section>
+              <p>
+                {% trans %}
+                News posts about changes related to
+                GNUnet such as releases and events
+                {% endtrans %}
+                &#8211;
+                <a href="{{ url_localized('rss.xml') }}">{{ _("subscribe to our RSS feed") }}</a>
+              </p>
+            </section>
+          </div>
+        </div>
+        <div class="row">
+          <b>{{ year }}</b>
+          <ul class="timeline">
+          {% for item in newsdata|selectattr('date.year', 'eq', year) %}
+          <li>
+              <section class="item-preview">
+               <header>
+                  <h3>{{ item['title']|e }}</h3>
+                  <p class="item-date">
+                    {{ item['date'] }}
+                  </p>
+                </header>
+                <p class="item-abstract">
+                  {{ get_abstract(item['page'], 1000) }} <br/>
+                  [<a href="{{ url_localized(item['page']) }}" title="{{ item['date']}}">{{ _("read more") }}</a>]
+                </p>
+              </section>
+            </li>
+          {% endfor %}
+          </ul>
+        </div>
+      </article>
+    </div>
+  </div>
+{% endmacro %}