[GNUnet-SVN] [taler-www] branch master updated: re-add news

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new d795d82  re-add news
d795d82 is described below

commit d795d82ec18a8e90b6c8ba559ea7c55a672d391d
Author: Florian Dold <address@hidden>
AuthorDate: Mon Mar 6 15:10:27 2017 +0100

    re-add news
---
 index.html.j2 | 208 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 109 insertions(+), 99 deletions(-)

diff --git a/index.html.j2 b/index.html.j2
index e996d8d..14efe85 100644
--- a/index.html.j2
+++ b/index.html.j2
@@ -21,118 +21,128 @@
 
 </div>
 
-  <div class="contianer-fluid c_acronym adorn_h3_bracket">
-  <div class="container">
+<div class="contianer-fluid c_acronym adorn_h3_bracket">
+<div class="container">
 
-    <h2>Design goals of Taler</h2>
+  <h2>Design goals of Taler</h2>
 
-    <div class="row">
-      <div class="col-lg-4">
-        <h3>{{ _("Taxable") }}</h3>
+  <div class="row">
+    <div class="col-lg-4">
+      <h3>{{ _("Taxable") }}</h3>
 
-        <p>
-          {% trans %}
-          When using Taler, merchants can't hide their income from tax
-          collection authorities.  Unlike cash and most digital currencies,
-          Taler helps preventing black markets.
-          {% endtrans %}
-        </p>
+      <p>
+        {% trans %}
+        When using Taler, merchants can't hide their income from tax
+        collection authorities.  Unlike cash and most digital currencies,
+        Taler helps preventing black markets.
+        {% endtrans %}
+      </p>
 
-      </div>
-      <div class="col-lg-4">
-        <h3>{{ _("Privacy-friendly") }}</h3>
-        <p>
-          {% trans %}
-          When you pay with Taler, your identity does not
-          have to be revealed to the merchant. Just like
-          payments in cash, nobody else can track how you
-          spent your electronic money. However, you obtain a
-          legally valid proof of payment.
-          {% endtrans %}
-        </p>
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Privacy-friendly") }}</h3>
+      <p>
+        {% trans %}
+        When you pay with Taler, your identity does not
+        have to be revealed to the merchant. Just like
+        payments in cash, nobody else can track how you
+        spent your electronic money. However, you obtain a
+        legally valid proof of payment.
+        {% endtrans %}
+      </p>
 
-      </div>
-      <div class="col-lg-4">
-        <h3>{{ _("Libre") }}</h3>
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Libre") }}</h3>
 
-        <p>
-          {% trans %}
-          Taler provides protocols and reference implementations that in
-          principle enables anybody to run their own payment infrastructure,
-          be it individuals, organizations or whole countries.  Since the
-          reference implementation is a <a href="http://www.gnu.org/";>GNU</a>
-          package, it will always remain free software.
-          {% endtrans %}
-        </p>
+      <p>
+        {% trans %}
+        Taler provides protocols and reference implementations that in
+        principle enables anybody to run their own payment infrastructure,
+        be it individuals, organizations or whole countries.  Since the
+        reference implementation is a <a href="http://www.gnu.org/";>GNU</a>
+        package, it will always remain free software.
+        {% endtrans %}
+      </p>
 
-      </div>
     </div>
-    <div class="row">
-      <div class="col-lg-4">
-        <h3>{{ _("Practical") }}</h3>
-        
-        <p>
-          {% trans %}
-          Taler is easy to integrate with existing Web
-          applications. Payments are cryptographically
-          secured and are confirmed within milliseconds with
-          extremely low transaction costs.
-          {% endtrans %}
-        </p>
+  </div>
+  <div class="row">
+    <div class="col-lg-4">
+      <h3>{{ _("Practical") }}</h3>
+      
+      <p>
+        {% trans %}
+        Taler is easy to integrate with existing Web
+        applications. Payments are cryptographically
+        secured and are confirmed within milliseconds with
+        extremely low transaction costs.
+        {% endtrans %}
+      </p>
 
-      </div>
-      <div class="col-lg-4">
-        <h3>{{ _("Stable") }}</h3>
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Stable") }}</h3>
 
-        <p>
-          {% trans %}
-          Taler does not introduce a new currency with
-          fluctuation risks, and instead uses a digital
-          wallet holding coins in reserve. Taler's
-          cryptographic coins correspond to existing
-          currencies, such as US Dollars, Euros or even
-          Bitcoins.
-          {% endtrans %}
-        </p>
-        
-      </div>
-      <div class="col-lg-4">
-        <h3>{{ _("Security-focused") }}</h3>
+      <p>
+        {% trans %}
+        Taler does not introduce a new currency with
+        fluctuation risks, and instead uses a digital
+        wallet holding coins in reserve. Taler's
+        cryptographic coins correspond to existing
+        currencies, such as US Dollars, Euros or even
+        Bitcoins.
+        {% endtrans %}
+      </p>
+      
+    </div>
+    <div class="col-lg-4">
+      <h3>{{ _("Security-focused") }}</h3>
 
-        <p>
-          {% trans %}
-          By design Taler does not suffer from many classes
-          of security problems such as phishing or conterfeit.
-          Despite its security features, Taler never rejects a legitimate
-          customer due to a fraud-detection false positive.
-          {% endtrans %}
-        </p>
-        
-      </div>
+      <p>
+        {% trans %}
+        By design Taler does not suffer from many classes
+        of security problems such as phishing or conterfeit.
+        Despite its security features, Taler never rejects a legitimate
+        customer due to a fraud-detection false positive.
+        {% endtrans %}
+      </p>
+      
     </div>
   </div>
-  </div>
+</div>
+</div>
 
-  <div class="container">
-    <div class="row">
-      <div class="col-lg-6">
-      <h2>Paying with Taler</h2>
-      <p>In order to pay with Taler, users install a wallet browser extension
-      or app on their device.  Before the first payment, the wallet's balance 
must
-      be charged by some other means of payment for the desired currency.</p>
-      <p>Once the wallet is charged, payments on websites take only one click, 
are never falsely rejected
-      by fraud detection and do not post any risk of phishing or identity 
theft.</p>
-      </div>
-      <div class="col-lg-6">
-      <h2>Receiving payments with Taler</h2>
-      <p>To receive Taler payments, a merchant only needs a bank account (or
-      any other kind of payment address) in the desired currency.  We provide 
an
-      SDK in various languages that makes the integration into a merchant's 
store
-      painless.  The merchant's backend for Taler transaction processing can 
run
-      on the mechant's premises or be a hosted backend.</p>
-      <p>When using a hosted backend, setting up a website that accepts taler
-      payments is a matter of minutes.</p>
-      </div>
+<div class="container">
+  <div class="row">
+    <div class="col-lg-6">
+    <h2>Paying with Taler</h2>
+    <p>In order to pay with Taler, users install a wallet browser extension
+    or app on their device.  Before the first payment, the wallet's balance 
must
+    be charged by some other means of payment for the desired currency.</p>
+    <p>Once the wallet is charged, payments on websites take only one click, 
are never falsely rejected
+    by fraud detection and do not post any risk of phishing or identity 
theft.</p>
+    </div>
+    <div class="col-lg-6">
+    <h2>Receiving payments with Taler</h2>
+    <p>To receive Taler payments, a merchant only needs a bank account (or
+    any other kind of payment address) in the desired currency.  We provide an
+    SDK in various languages that makes the integration into a merchant's store
+    painless.  The merchant's backend for Taler transaction processing can run
+    on the mechant's premises or be a hosted backend.</p>
+    <p>When using a hosted backend, setting up a website that accepts taler
+    payments is a matter of minutes.</p>
     </div>
-  </div> <!-- /container -->
+  </div>
+  <div class="row">
+    <div class="col-lg-6">
+      <h2>{{ _("Taler News") }}</h2>
+      {% include "news.html.j2.inc" %}
+    </div>
+    <div class="col-lg-6">
+      <h2>{{ _("Financial News") }}</h2>
+      {% include "financial-news.html.j2.inc" %}
+    </div>     
+  </div>
+</div> <!-- /container -->
 {% endblock body_content %}

-- 
To stop receiving notification emails like this one, please contact
address@hidden