move news to /news/

3 files changed, 3 insertions, 55 deletions

diff --git a/template/index.html.j2 b/template/index.html.j2
index f92642af..945435df 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -247,11 +247,7 @@
   <div class="container">
     <div class="row">
       <div class="container text-center">
-        <h1>
-          {% trans %}
-            Featured Applications
-          {% endtrans %}
-        </h1>
+        <h1>{{ _("Featured Applications") }}</h1>
       </div>
     </div>
     <div class="row">
@@ -337,11 +333,7 @@
   <div class="container">
     <div class="row">
       <div class="container text-center">
-        <h1>
-          {% trans %}
-          Upcoming Applications
-          {% endtrans %}
-        </h1>
+        <h1>{{ _("Upcoming Applications") }}</h1>
       </div>
     </div>
     <div class="row">
@@ -387,7 +379,7 @@
   </div>
   <div class="row">
     <div class="col-lg-12">
-      {% include "template/news.html.j2.inc" %}
+      Read our recent news postings <a href="news/index.html">here</a>.
     </div>
   </div>
 </div> <!-- /container -->
diff --git a/template/news.html.j2.inc b/template/news.html.j2.inc
deleted file mode 100644
index 10c0a130..00000000
--- a/template/news.html.j2.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-{% include "news/2019-0.11.8.inc" %}
-{% include "news/2019-0.11.7.inc" %}
-{% include "news/2019-10-ICANNPanel.inc" %}
-{% include "news/2019-10-GNSSpec1.inc" %}
-{% include "news/2019-0.11.6.inc" %}
-{% include "news/2019-07-GHM_Aug_2019.inc" %}
-{% include "news/2019-06-DSTJ.inc" %}
-{% include "news/2019-06.inc" %}
-{% include "news/2019-0.11.5.inc" %}
-{% include "news/2019-0.11.4.inc" %}
-{% include "news/2019-0.11.3.inc" %}
-{% include "news/2019-0.11.2.inc" %}
-{% include "news/2019-0.11.1.inc" %}
-{% include "news/2019-0.11.0.inc" %}
-{% include "news/2019-02.inc" %}
-<a href="old-news.html"><h3>{{ _("More news")}}</h3></a>
diff --git a/template/old-news.html.j2 b/template/old-news.html.j2
deleted file mode 100644
index ebee3239..00000000
--- a/template/old-news.html.j2
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "common/base.j2" %}
-{% block body_content %}
-
-<div class="jumbotron">
-  <div class="container text-center">
-    <h1>{{ _("Older News") }}</h1>
-    <div class="col-lg-12">
-      <p>
-        {% trans %}
-          This page documents the GNUnet history.
-        {% endtrans %}
-      </p>
-    </div>
-  </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-lg-12">
-{% include "news/2018-07.inc" %}
-{% include "news/2018-06.inc" %}
-{% include "news/2018-08.inc" %}
-{% include "news/2017-10.inc" %}
-    </div>
-  </div>
-</div> <!-- /container -->
-
-{% endblock body_content %}