diff options
author | ng0 <ng0@taler.net> | 2019-12-10 00:47:36 +0000 |
---|---|---|
committer | ng0 <ng0@taler.net> | 2019-12-10 00:47:36 +0000 |
commit | ca901e4b99a037553a5afe1beeb50255aeecb27c (patch) | |
tree | 0be1261a10486902002a73215dee1572912ebda7 /template | |
parent | 7bf827948000a632667a7664f7e4cc9953acdd7f (diff) | |
download | www-ca901e4b99a037553a5afe1beeb50255aeecb27c.tar.gz www-ca901e4b99a037553a5afe1beeb50255aeecb27c.tar.bz2 www-ca901e4b99a037553a5afe1beeb50255aeecb27c.zip |
merge new website generation.
Diffstat (limited to 'template')
-rw-r--r-- | template/bibliography.html.j2 | 92 | ||||
-rw-r--r-- | template/docs.html.j2 | 32 | ||||
-rw-r--r-- | template/features.html.j2 | 14 | ||||
-rw-r--r-- | template/index.html.j2 | 20 | ||||
-rw-r--r-- | template/news.html.j2 | 20 | ||||
-rw-r--r-- | template/old-news.html.j2 | 44 | ||||
-rw-r--r-- | template/principles.html.j2 | 18 |
7 files changed, 90 insertions, 150 deletions
diff --git a/template/bibliography.html.j2 b/template/bibliography.html.j2 index af91b8d6..10654830 100644 --- a/template/bibliography.html.j2 +++ b/template/bibliography.html.j2 @@ -1,48 +1,50 @@ {% extends "common/base.j2" %} {% block body_content %} -<div class="container"> -<h1>{{ _("GNU Taler Bibliography")}}</h1> - -<h2>The GNU Taler System: Practical and Provably Secure Electronic Payments</h2> -<p> -<a href="{{ url('papers/thesis-dold-phd-2019.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} Florian Dold<br> -PhD Thesis, 2019<br> -</p> - -<h2>Blind Signatures for Untraceable Payments</h2> -<p> -<a href="{{ url('papers/chaum-blind-signatures.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} David Chaum<br> -CRYPTO '82<br> -</p> - -<h2>The One-More-RSA-Inversion Problems and the Security of Chaum's Blind Signature Scheme</h2> -<p> -<a href="{{ url('papers/bellare_blindsigs_proof.pdf') }}"><img border=0 align=right alt="PDF" width=32 height=32 src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} M. Bellare, C. Namprempre, D. Pointcheval {{ _("and") }} M. Semanko<br> -Financial Cryptography '01<br> -</p> - -<h2>Enabling Secure Web Payments with GNU Taler</h2> -<p> -<a href="{{ url('papers/taler2016space.pdf') }}"><img border=0 align=right width=32 height=32 alt="PDF" src="{{ url('images/pdf.svg') }}"></a> -{{_("by")}} Jeff Burdges, Florian Dold, Christian Grothoff {{ _("and") }} Marcello Stanisci<br> -SPACE 2016<br> -</p> - -<h2>Digital cash and privacy: What are the alternatives to Libra?</h2> -<p> -<a href="https://www.media.mit.edu/posts/digital-cash-and-privacy-what-are-the-alternatives-to-libra/"><img border=0 align=right alt="HTML" width=32 height=32 src="{{ url('images/html.svg') }}"></a> -{{_("by")}} Christian Grothoff {{ _("and") }} Alex Pentland<br> -MIT Media Lab, 2019<br> -</p> - -<h2>Refreshing Coins for Giving Change and Refunds in Chaum-style Anonymous Payment Systems</h2> -<p> -{{_("by")}} Florian Dold, Sree Harsha Totakura, Benedikt Müller, Jeff Burdges {{ _("and") }} Christian Grothoff<br> -<em>{{_("available upon request")}}</em><br> -</p> - -</div> + <article class="container"> + <header> + <h1>{{ _("GNU Taler Bibliography")}}</h1> + </header> + <div class="row"> + <div class="col-lg-12"> + {% for item in conf["paperslist"] %} + <section> + <header> + <h2>{{ item['name']|e }}</h2> + </header> + <div class="row container"> + <div class="col"> + <p> + {% if item['url_pdf'] %} + <a href="{{ url(item['url_pdf']) }}"> + <img border=0 align=right alt="PDF" width=32 height=32 src="{{ url_static('images/pdf.svg') }}"> + </a> + {% endif %} + {% if item['url_html'] %} + <a href="{{ item['url_html'] }}"> + <img border=0 align=right alt="HTML" width=32 height=32 src="{{ url_static('images/html.svg') }}"> + </a> + {% endif %} + {{_("by")}} + {% if item['authors'] %} + {% for name in item['authors'] %} + {{ name|e }} + {% if not loop.last %} + , + {% elif loop.revindex0 == 1 %} + {{ _("and") }} + {% endif %} + {% endfor %} + {% endif %} + <br> + {% if item['kind'] %} {{ item['kind']|e }} {% endif %} + {% if item['year'] %} ({{ item['year'] }}) {% endif %} + {% if item['comment'] %}<br>{{ item['comment'] }} {% endif %} + </p> + </div> + </div> + </section> + {% endfor %} + </div> + </div> + </article> {% endblock body_content %} diff --git a/template/docs.html.j2 b/template/docs.html.j2 index 83fa2e53..2b9c1b0e 100644 --- a/template/docs.html.j2 +++ b/template/docs.html.j2 @@ -1,6 +1,6 @@ {% extends "common/base.j2" %} {% block body_content %} - +{% for siteconfitem in siteconf %} <div class="container"> <div class="row"> <div class="col"> @@ -33,7 +33,7 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-merchant-manual.html"> + <a href="https://{{ siteconfitem["docshost"] }}/taler-merchant-manual.html"> <img src="../icons/icon-backend.svg" height=60> <h3>{{ _("Merchant Backend Administration")}}</h3> </a> @@ -41,11 +41,11 @@ Tutorial and manual for operating a merchant. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-merchant-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/taler-merchant-manual.pdf">PDF</a>. </div> <div class="col-3"> - <a href="https://{{ docshost }}/taler-merchant-api-tutorial.html"> + <a href="https://{{ siteconfitem["docshost"] }}/taler-merchant-api-tutorial.html"> <img src="../icons/icon-market.svg" height=60> <h3>{{ _("Merchant API Tutorial") }}</h3> </a> @@ -53,23 +53,23 @@ Tutorial for processing Taler payments using the merchant backend API. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/taler-merchant-api-tutorial.pdf">PDF</a>. </div> <div class="col-3"> - <a href="https://{{ docshost }}/taler-exchange-manual.html"> + <a href="https://{{ siteconfitem["docshost"] }}/taler-exchange-manual.html"> <img src="../icons/icon-exchange.svg" height=60> <h3>{{ _("Exchange")}}</h3> </a> {% trans %} - Operator's manual for the GNU Taler exchange. + Operator's manual for the GNU Taler exchange. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-exchange-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/taler-exchange-manual.pdf">PDF</a>. </div> <div class="col-3"> - <a href="https://{{ docshost }}/taler-bank-manual.html"> + <a href="https://{{ siteconfitem["docshost"] }}/taler-bank-manual.html"> <img src="../icons/icon-bank.svg" height=60> <h3>{{ _("Bank Integration") }}</h3> </a> @@ -77,7 +77,7 @@ Manual for tightly integrating Taler with banking applications. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-bank-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/taler-bank-manual.pdf">PDF</a>. </div> </div> @@ -87,7 +87,7 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-backoffice-manual.html"> + <a href="https://{{ siteconfitem["docshost"] }}/taler-backoffice-manual.html"> <img src="../icons/icon-backoffice.svg" height=60> <h3>{{ _("Back office") }}</h3> </a> @@ -95,7 +95,7 @@ Manual to run the back-office Web application. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/taler-backoffice-manual.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/taler-backoffice-manual.pdf">PDF</a>. </div> </div> @@ -113,7 +113,7 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/core/index.html"> + <a href="https://{{ siteconfitem["docshost"] }}/core/index.html"> <img src="../icons/icon-api.svg" height=60> <h3>{{ _("HTTP API")}}</h3> </a> @@ -123,7 +123,7 @@ </div> <div class="col-3"> - <a href="https://{{ docshost }}/onboarding.html"> + <a href="https://{{ siteconfitem["docshost"] }}/onboarding.html"> <img src="../icons/icon-developers.svg" height=60> <h3>{{ _("Onboarding")}}</h3> </a> @@ -131,7 +131,7 @@ Description of our taler.net setup and how to contribute. Also available as {% endtrans %} - <a href="https://{{ docshost }}/pdf/onboarding.pdf">PDF</a>. + <a href="https://{{ siteconfitem["docshost"] }}/pdf/onboarding.pdf">PDF</a>. </div> </div> @@ -199,5 +199,5 @@ </div> </div> - +{% endfor %} {% endblock body_content %} diff --git a/template/features.html.j2 b/template/features.html.j2 index e4c44485..c97517ee 100644 --- a/template/features.html.j2 +++ b/template/features.html.j2 @@ -42,7 +42,7 @@ When making a payment, customers only need a charged wallet. A merchant can accept payments <span class="tlr">without making their customers register</span> - on the merchant's Website. + on the merchant's Website. {% endtrans %} </p> @@ -57,7 +57,7 @@ </p> </div> <div class="col"> - <img class="img-fluid" src="../images/diagram-simple.png"> + <img class="img-fluid" src="{{ url_static('images/diagram-simple.png') }}"> </div> </div> </div> @@ -71,7 +71,7 @@ {% trans %} To pay with Taler, customers install an electronic wallet on their device. Before the first payment, the desired currency - must be added to the wallet's balance + must be added to the wallet's balance by some other means of payment. {% endtrans %} </p> @@ -97,8 +97,8 @@ To receive Taler payments, a merchant needs a bank account in the desired currency. We provide supporting software in various programming languages to make the integration painless. - The merchant's backend for Taler transaction processing can run - on the merchant's premises or be hosted by a third party. + The merchant's backend for Taler transaction processing can run + on the merchant's premises or be hosted by a third party. {% endtrans %} </p> <p> @@ -144,7 +144,7 @@ Taler does not introduce a new currency. Taler uses a digital wallet storing coins and payment service providers with escrow accounts in existing currencies. - Thus, Taler's cryptographic coins correspond to existing + Thus, Taler's cryptographic coins correspond to existing currencies, such as US Dollars, Euros or even Bitcoins. {% endtrans %} </p> @@ -170,7 +170,7 @@ <p> {% trans %} - When using Taler, merchant's revenue is transparent for tax + When using Taler, merchant's revenue is transparent for tax collection authorities. Unlike cash and most digital currencies, Taler helps prevent black markets. Taler is not suitable for illegal activities. diff --git a/template/index.html.j2 b/template/index.html.j2 index 59937c6a..e74f82cd 100644 --- a/template/index.html.j2 +++ b/template/index.html.j2 @@ -1,17 +1,19 @@ {% extends "common/base.j2" %} {% block body_content %} - + {% import 'inc/news.macro.j2' as news %} <div class="container"> <div class="row justify-content-center"> <div class="col-8"> - <img src="../images/logo-2018-dold.svg"> + <img src="{{ url_static('images/logo-2018-dold.svg') }}"> </div> </div> <div class="row justify-content-center text-center"> <div class="col-8"> - <a href="news.html">2018-04: GNU Taler v0.5.0 released</a> + {% for item in newsdata[:1] %} + {{ news.tinylinkpreview(item, prefix="news/") }} + {% endfor %} </div> </div> @@ -23,23 +25,23 @@ <h2>{{ _("We provide a payment system that makes <span class='tlr'>privacy-friendly</span> online transactions <span class='tlr'>fast and easy</span>.")}}</h2> <ul class="checklist"> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Payments without registration")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Data protection by default")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Fraud eliminated by design")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Not a new currency!")}} </li> <li> - <img class="checkmark" src="../images/checkmark.png"> + <img class="checkmark" src="{{ url_static('images/checkmark.png') }}"> {{ _("Empowers communities to run their own payment infrastructure")}} </li> </ul> @@ -47,7 +49,7 @@ <form action="https://docs.taler.net/" style="display:inline;"><button type="submit" class="btn btn-secondary">{{ _("Read Docs")}}</button></form> </div> <div class="col align-self-center"> - <img class="img-fluid" src="../images/stock1s.jpg" style="border-radius: 1cm;" /> + <img class="img-fluid" src="{{ url_static('images/stock1s.jpg') }}" style="border-radius: 1cm;" /> </div> </div> </div> diff --git a/template/news.html.j2 b/template/news.html.j2 deleted file mode 100644 index 311f4c15..00000000 --- a/template/news.html.j2 +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "common/base.j2" %} -{% block body_content %} - - <div class="container"> - <div class="col"> - <h1>{{ _("News")}}</h1> - - {% include "news/2018-04.inc" %} - {% include "news/2017-10.inc" %} - {# include "news/2017-08.inc" #} - {# include "news/2017-04.inc" #} - {# include "news/2017-03.inc" #} - {# include "news/2017-02.inc" #} - {% include "news/2017-01.inc" %} - - <a href="old-news.html"><h3>{{ _("More news")}}</h3></a> - </div> - </div> - -{% endblock body_content %} diff --git a/template/old-news.html.j2 b/template/old-news.html.j2 deleted file mode 100644 index 611b4ae8..00000000 --- a/template/old-news.html.j2 +++ /dev/null @@ -1,44 +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 GNU Taler history. - {% endtrans %} - </p> - </div> - </div> - </div> - - <div class="container"> - <div class="row"> - <div class="col-lg-12"> - - {# - {% include "news/2016-12.inc" %} - #} - {% include "news/2016-10.inc" %} - {% include "news/2016-09.inc" %} - {% include "news/2016-08.inc" %} - {% include "news/2016-06.inc" %} - {% include "news/2015-12.inc" %} - - {# - {% include "news/2015-11.inc" %} - #} - - {% include "news/2015-02.inc" %} - {# - {% include "news/2014-12.inc" %} - #} - {% include "news/2014-11.inc" %} - - </div> - </div> - </div> <!-- /container --> - -{% endblock body_content %} diff --git a/template/principles.html.j2 b/template/principles.html.j2 index f81c01b8..d16a8fb6 100644 --- a/template/principles.html.j2 +++ b/template/principles.html.j2 @@ -30,7 +30,7 @@ <div class="col-lg-12"> <h2>{{ _("1. Free Software implementation") }}</h2> <a href="https://www.gnu.org/graphics/freedom.html"> - <img style="width:20vw;float:right" src="../images/stallman.medium.png" alt="{{ _("... in the area of computing, freedom means not using proprietary software") }}"> + <img style="width:20vw;float:right" src="{{ url_static('images/stallman.medium.png') }}" alt="{{ _("... in the area of computing, freedom means not using proprietary software") }}"> </a> <p> {% trans %} @@ -55,7 +55,7 @@ <div class="col-lg-12"> <h2>{{ _("2. Protect the privacy of buyers") }}</h2> <!-- From https://www.pixabay.com/ --> - <img style="width:20vw;float:left;padding:15px" src="../images/anonymous.jpg" alt="{{_("You deserve some privacy")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/anonymous.jpg') }}" alt="{{_("You deserve some privacy")}}"> <p> {% trans %} Privacy should be guaranteed via technical measures, as opposed to mere @@ -80,7 +80,7 @@ <div class="col-lg-12"> <h2>{{ _("3. Enable the state to tax income and crack down on illegal business activities") }}</h2> <!-- From https://www.pxhere.com/ --> - <img style="width:20vw;float:right;padding:15px" src="../images/money-laundering.medium.jpg" alt="{{_("Money laundering")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/money-laundering.medium.jpg') }}" alt="{{_("Money laundering")}}"> <p> {% trans %} As a payment system must still be legal to operate and use, it must comply @@ -94,7 +94,7 @@ <div class="col-lg-12"> <h2>{{ _("4. Prevent payment fraud") }}</h2> <!-- From https://www.maxpixel.net/ --> - <img style="width:20vw;float:left;padding:15px" src="../images/fraud.medium.jpg" alt="{{_("Phishing attack")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/fraud.medium.jpg') }}" alt="{{_("Phishing attack")}}"> <p> {% trans %} This imposes requirements on the security of the system, as well as on the @@ -107,7 +107,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("5. Only disclose the minimal amount of information necessary") }}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/gdpr.medium.jpg" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/gdpr.medium.jpg') }}" alt="{{_("Privacy by design, privacy by default, General Data Protection Regulation (GDPR) compliant")}}"> <p> {% trans %} The reason behind this goal is similar to (2). The privacy of buyers is given @@ -120,7 +120,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("6. Be usable") }}</h2> - <img style="width:20vw;float:left;padding:15px" src="../images/buy.medium.jpg" alt="{{_("Buy with one click")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/buy.medium.jpg') }}" alt="{{_("Buy with one click")}}"> <p> {% trans %} Specifically it must be usable for non-expert customers. Usability also @@ -134,7 +134,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("7. Be efficient")}}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/efficient.png" alt="{{_("Energy efficiency")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/efficient.png') }}" alt="{{_("Energy efficiency")}}"> <p> {% trans %} Approaches such as proof-of-work are ruled out by this @@ -147,7 +147,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("8. Fault-tolerant design")}}</h2> - <img style="width:20vw;float:left;padding:15px" src="../images/life-safer.medium.jpg" alt="{{_("Life Safers")}}"> + <img style="width:20vw;float:left;padding:15px" src="{{ url_static('images/life-safer.medium.jpg') }}" alt="{{_("Life Safers")}}"> <p> {% trans %} Taler should tolerate failure of individual components and systems, @@ -161,7 +161,7 @@ <div class="row"> <div class="col-lg-12"> <h2>{{ _("9. Foster competition")}}</h2> - <img style="width:20vw;float:right;padding:15px" src="../images/market.medium.jpg" alt="{{_("A competitive market")}}"> + <img style="width:20vw;float:right;padding:15px" src="{{ url_static('images/market.medium.jpg') }}" alt="{{_("A competitive market")}}"> <p> {% trans %} It must be relatively easy for competitors to join the systems. While the |