fix #5522

3 files changed, 66 insertions, 2 deletions

diff --git a/news/index.html.j2 b/news/index.html.j2
index ae8f5e3b..6db6600e 100644
--- a/news/index.html.j2
+++ b/news/index.html.j2
@@ -19,9 +19,11 @@
           </div>
         </div>
         <div class="row">
+          {% for year, yitem in newsdata|selectattr('date.year', 'gt', 2019)|groupby('date.year') %}
+          <b>{{ year }}</b>
           <ul class="timeline">
-          {% for item in newsdata %}
-            <li>
+          {% for item in yitem %}
+          <li>
               <section class="item-preview">
                <header>
                   <h3>{{ item['title']|e }}</h3>
@@ -37,7 +39,18 @@
             </li>
           {% endfor %}
           </ul>
+          {% endfor %}
         </div>
+        <h2>
+          {% trans %}
+          News archives:
+          {% endtrans %}
+        </h2>
+        <ul>
+        {% for year, yitem in newsdata|selectattr('date.year', 'lt', 2020)|groupby('date.year')|reverse %}
+          <li><a href="{{ 'oldnews-' + year|string + '.html' }}">{{ year }} ({{yitem|length}})</a></li>
+        {% endfor %}
+        </ul>
       </article>
     </div>
   </div>
diff --git a/news/oldnews-2018.html.j2 b/news/oldnews-2018.html.j2
new file mode 100644
index 00000000..b5833a31
--- /dev/null
+++ b/news/oldnews-2018.html.j2
@@ -0,0 +1,50 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<!-- Simply link to or copy this file as-is (no modifications required)
+     news/oldnews-::year::. This will generate a new news archive page.
+     Note that you may still have to modify the currently displayed
+     year ranges in the index.html.j2.
+-->
+  <div class="container-fluid">
+    <div class="container">
+      <article>
+        <div class="row">
+          <div class="container text-center">
+            <h1>{{ _("News") + " " + self._TemplateReference__context.name[13:17] }}<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>{{ self._TemplateReference__context.name[13:17] }}</b>
+          <ul class="timeline">
+          {% for item in newsdata|selectattr('date.year', 'eq', self._TemplateReference__context.name[13:17]|int) %}
+          <li>
+              <section class="item-preview">
+               <header>
+                  <h3>{{ item['title']|e }}</h3>
+                  <p class="item-date">
+                    {{ item['date'] }}
+                  </p>
+                </header>
+                <p class="item-abstract">
+                  {{ item['abstract'] }} <br/>
+                  [<a href="{{ item['page'] }}" title="{{ item['date']}}">{{ _("read more") }}</a>]
+                </p>
+              </section>
+            </li>
+          {% endfor %}
+          </ul>
+        </div>
+      </article>
+    </div>
+  </div>
+{% endblock body_content %}
diff --git a/news/oldnews-2019.html.j2 b/news/oldnews-2019.html.j2
new file mode 120000
index 00000000..ef5fcbee
--- /dev/null
+++ b/news/oldnews-2019.html.j2
@@ -0,0 +1 @@
+oldnews-2018.html.j2
\ No newline at end of file