remove macro

2 files changed, 22 insertions, 9 deletions

diff --git a/news/index.html.j2 b/news/index.html.j2
index 9d9f9ff0..f121b910 100644
--- a/news/index.html.j2
+++ b/news/index.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-  {% import 'inc/news.macro.j2' as news %}
   <div class="container-fluid">
     <div class="container">
       <article>
@@ -9,8 +8,12 @@
             <h1>{{ _("News") }}<a name="news"></a></h1>
             <section>
               <p>
-                News posts published by GNUnet about changes related to
-                GNUnet, releases, and events &#8211; <a href="{{ url_localized('rss.xml')}}">subscribe to our RSS feed</a>
+                {% trans %}
+                News posts about changes related to
+                GNU Taler such as releases and events
+                {% endtrans %}
+                &#8211;
+                <a href="{{ url_localized('rss.xml') }}">{{ _("subscribe to our RSS feed") }}</a>
               </p>
             </section>
           </div>
@@ -19,7 +22,18 @@
           <ul class="timeline">
           {% for item in newsdata %}
             <li>
-              {{ news.newspreview(item) }}
+              <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>
diff --git a/template/index.html.j2 b/template/index.html.j2
index acc3c358..fa9e68f8 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -1,6 +1,5 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
-  {% import 'inc/news.macro.j2' as news %}
 <!-- Jumbotron -->
 <div>
   <div class="container text-center">
@@ -32,7 +31,7 @@
           your items (data) to use it against you and sell it to
           others - while you can&#39;t even notice the thievery nor
           accuse and hold the scroungers accountable.
-        <!-- 
+        <!--
           Proposal from Fabian Gerlach: The conventional Internet is currently like a system of roads
           with deep potholes and surveillance cameras all over the place.
           Even if you still can use the roads (e.g. send emails, or browse
@@ -132,7 +131,7 @@
           content distribution</a> in a technically robust manner - as
           opposed to ad-hoc designs in place today.
         <!--
-          Proposal from fabian gerlach: GNUnet is built 
+          Proposal from fabian gerlach: GNUnet is built
           <a href="https://www.w3.org/2014/strint/papers/65.pdf">"privacy by design"</a> and
           "distributed by design". This improves addressing, routing, naming and
           content distribution in a technically robust manner.
@@ -208,7 +207,7 @@
         <p>
           {% trans %}
           <!--
-            replaced with Proposal from Fabian Gerlach: 
+            replaced with Proposal from Fabian Gerlach:
             It seems as if every other distributed or P2P project
             develops its own library stack, covering transports, stream
             muxing, discovery and others. This divides effort and
@@ -286,7 +285,7 @@
     {% for item in newsdata[:4] %}
     <div class="row">
         <div class="col-lg-12">
-          {{ news.newspreview(item, prefix="news/") }}
+          <a href="news/{{ item['page'] }}" title="{{ item['date']}}">{{ item['date'] }}: {{ item['title'] }}</a>
         </div>
     </div>
     {% endfor %}