diff options
Diffstat (limited to 'template')
| -rw-r--r-- | template/architecture.html.j2 | 2 | ||||
| -rw-r--r-- | template/bibliography.html.j2 | 92 | ||||
| -rw-r--r-- | template/contact.html.j2 | 2 | ||||
| -rw-r--r-- | template/copyright.html.j2 | 75 | ||||
| -rw-r--r-- | template/developers.html.j2 | 18 | ||||
| -rw-r--r-- | template/docs.html.j2 | 54 | ||||
| -rw-r--r-- | template/faq.html.j2 | 2 | ||||
| -rw-r--r-- | template/features.html.j2 | 14 | ||||
| -rw-r--r-- | template/glossary.html.j2 | 8 | ||||
| -rw-r--r-- | template/governments.html.j2 | 4 | ||||
| -rw-r--r-- | template/gsoc-codeless.html.j2 | 16 | ||||
| -rw-r--r-- | template/index.html.j2 | 20 | ||||
| -rw-r--r-- | template/investors.html.j2 | 15 | ||||
| -rw-r--r-- | template/merchants.html.j2 | 10 | ||||
| -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 | ||||
| -rw-r--r-- | template/wallet.html.j2 | 10 |
18 files changed, 178 insertions, 246 deletions
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2 index d9170b20..27107683 100644 --- a/template/architecture.html.j2 +++ b/template/architecture.html.j2 @@ -1,6 +1,6 @@ {% extends "common/base.j2" %} {% block body_content %} -<!-- Jumbotron --> + <div class="jumbotron"> <div class="container text-center"> <h1>{{ _("Taler System Architecture") }}</h1> 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/contact.html.j2 b/template/contact.html.j2 index 91c7abe8..b6c64cf0 100644 --- a/template/contact.html.j2 +++ b/template/contact.html.j2 @@ -52,7 +52,7 @@ {% trans %} We track open feature requests and bugs in our {% endtrans %} - <a href="https://gnunet.org/bugs/">{{ _("Bug tracker")}}</a>, + <a href="https://gnunet.org/bugs/">{{ _("Bug tracker") }}</a>, {% trans %} which is shared with the GNUnet project. You can also report bugs or feature requests to the diff --git a/template/copyright.html.j2 b/template/copyright.html.j2 index 8ce7357b..3c580c58 100644 --- a/template/copyright.html.j2 +++ b/template/copyright.html.j2 @@ -1,44 +1,39 @@ {% extends "common/base.j2" %} {% block body_content %} -<!-- Jumbotron --> -<div class="jumbotron"> - <div class="container text-center"> - <h1>{{ _("Copyright Assignment") }}</h1> - <!-- Note: source of the pdf/copyright.pdf is in gitolite-admin/ --> - <p> - {% trans %} - Contributors to GNU Taler with Git access must sign the - <a href="/pdf/copyright.pdf">copyright assignment</a> - to ensure that the - {% endtrans %} - <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex"> - GNUnet e.V. --- Taler Systems SA {{ _("agreement on licensing and collaborative development")}} - </a> - {% trans %} - of the GNUnet and GNU Taler projects is satisfied. - {% endtrans %} - </p> + + <div class="jumbotron"> + <div class="container text-center"> + <h1>{{ _("Copyright Assignment") }}</h1> + <p> + {% trans %} + Contributors to GNU Taler with Git access must sign the + <a href="/pdf/copyright.pdf">copyright assignment</a> + to ensure that the + <a href="https://git.gnunet.org/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement on licensing and collaborative development</a> + of the GNUnet and GNU Taler projects is satisfied. + {% endtrans %} + </p> + </div> + <div class="container"> + <p> + {% trans %} + The agreements ensure that the code will continue to be made + available under free software licenses, but gives developers + the freedom to move code between GNUnet and GNU Taler without + worrying about licenses and the company the ability to + dual-license (for example, so that we can distribute via + App-stores that are hostile to free software). + {% endtrans %} + </p> + <p> + {% trans %} + Minor contributions (basically, anyone without Git access) do + not require copyright assignment. Pseudonymous contributions are + accepted, in this case simply sign the agreement with your + pseudonym. Scanned copies are sufficient, but snail mail is + preferred. + {% endtrans %} + </p> + </div> </div> - <div class="container"> - <p> - {% trans %} - The agreements ensure that the code will continue to be made - available under free software licenses, but gives developers - the freedom to move code between GNUnet and GNU Taler without - worrying about licenses and the company the ability to - dual-license (for example, so that we can distribute via - App-stores that are hostile to free software). - {% endtrans %} - </p> - <p> - {% trans %} - Minor contributions (basically, anyone without Git access) do - not require copyright assignment. Pseudonymous contributions are - accepted, in this case simply sign the agreement with your - pseudonym. Scanned copies are sufficient, but snail mail is - preferred. - {% endtrans %} - </p> - </div> -</div> {% endblock body_content %} diff --git a/template/developers.html.j2 b/template/developers.html.j2 index 0fc1f67a..0a52128b 100644 --- a/template/developers.html.j2 +++ b/template/developers.html.j2 @@ -36,13 +36,13 @@ Taler is designed to work on the Internet. To ensure that Taler payments can work with restrictive network setups, Taler uses a RESTful - protocol over HTTP or HTTPS. Taler's security does + protocol over HTTP or HTTPS. Taler's security does not depend upon the use of HTTPS, but obviously merchants may choose to offer HTTPS for consistency and because it generally is better for privacy compared to HTTP. Taler uses JSON to encode structure data, making it easy to integrate Taler - with existing Web applications. Taler's protocol + with existing Web applications. Taler's protocol is documented in detail at {% endtrans %} <a href="https://docs.taler.net/">docs.taler.net</a>. @@ -91,7 +91,7 @@ {% trans %} Technical papers can be found in our {% endtrans %} - <a href="bibliography.html">{{ _("bibliography")}}</a>. + <a href="{{ url_localized('bibliography.html') }}">{{ _("bibliography")}}</a>. </p> </div> <div class="col-lg-4"> @@ -146,7 +146,7 @@ <h2>{{ _("Technical Presentation") }}</h2> <div class="row"> <div class="col-lg-4"> - <a href="{{ url('presentations/tech.pdf') }}"><img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}"><br><p align="center">{{ _("Download") }}</p></a> + <a href="{{ url('presentations/tech.pdf') }}"><img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url_static('images/pdf.svg') }}"><br><p align="center">{{ _("Download") }}</p></a> </div> <div class="col-lg-4" id="canvas-left" style="display:none"> <canvas id="the-canvas-left"></canvas> @@ -154,8 +154,8 @@ <div class="col-lg-4" id="canvas-right" style="display:none"> <canvas id="the-canvas-right"></canvas> </div> - <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script> - <script type="text/javascript" src="{{ url('dist/js/pdf-view-tech.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf.min.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf-view-tech.js') }}"></script> </div> </div> </div> @@ -172,7 +172,7 @@ {% endtrans %} </p> - <img src="/images/taler-arch-full.svg" alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> + <img src="{{ url_static('images/taler-arch-full.svg') }}" alt="{{_("system overview")}}" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> <ol> <li> {% trans %} @@ -189,7 +189,7 @@ <li> {% trans %} Once the exchange has received the wire - transfer, it allows the customer's electronic + transfer, it allows the customer's electronic wallet to <b>withdraw</b> electronic coins. The electronic coins are digital representations of the original currency from @@ -293,7 +293,7 @@ </li> </ol> <div class="col"> - <img class="img-fluid" src="../images/diagram-complex.png"> + <img class="img-fluid" src="{{ url_static('images/diagram-complex.png') }}"> </div> </div> </div> <!-- /container --> diff --git a/template/docs.html.j2 b/template/docs.html.j2 index 83fa2e53..c6b55547 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,51 +33,51 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-merchant-manual.html"> - <img src="../icons/icon-backend.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-manual.html"> + <img src="{{ url('icons/icon-backend.svg') }}" height=60> <h3>{{ _("Merchant Backend Administration")}}</h3> </a> {% trans %} 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"> - <img src="../icons/icon-market.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-merchant-api-tutorial.html"> + <img src="{{ url('icons/icon-market.svg') }}" height=60> <h3>{{ _("Merchant API Tutorial") }}</h3> </a> {% trans %} 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"> - <img src="../icons/icon-exchange.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-exchange-manual.html"> + <img src="{{ url('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"> - <img src="../icons/icon-bank.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-bank-manual.html"> + <img src="{{ url('icons/icon-bank.svg') }}" height=60> <h3>{{ _("Bank Integration") }}</h3> </a> {% trans %} 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,15 +87,15 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/taler-backoffice-manual.html"> - <img src="../icons/icon-backoffice.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/taler-backoffice-manual.html"> + <img src="{{ url('icons/icon-backoffice.svg') }}" height=60> <h3>{{ _("Back office") }}</h3> </a> {% trans %} 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,8 +113,8 @@ <div class="row"> <div class="col-3"> - <a href="https://{{ docshost }}/core/index.html"> - <img src="../icons/icon-api.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/core/index.html"> + <img src="{{ url('icons/icon-api.svg') }}" height=60> <h3>{{ _("HTTP API")}}</h3> </a> {% trans %} @@ -123,15 +123,15 @@ </div> <div class="col-3"> - <a href="https://{{ docshost }}/onboarding.html"> - <img src="../icons/icon-developers.svg" height=60> + <a href="https://{{ siteconfitem['docshost'] }}/onboarding.html"> + <img src="{{ url('icons/icon-developers.svg') }}" height=60> <h3>{{ _("Onboarding")}}</h3> </a> {% trans %} 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> @@ -150,7 +150,7 @@ <div class="row"> <div class="col-3"> <a href="https://lists.gnu.org/mailman/listinfo/taler"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("Mailing List")}}</h3> </a> {{ _("The official GNU Taler mailing list.") }} @@ -158,7 +158,7 @@ <div class="col-3"> <a href="https://webchat.freenode.net/?channels=taler"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("IRC")}}</h3> </a> {{ _("Our IRC channel is #taler on freenode.") }} @@ -166,7 +166,7 @@ <div class="col-3"> <a href="https://gnunet.org/bugs/"> - <img src="../icons/icon-share.svg" height=60> + <img src="{{ url('icons/icon-share.svg') }}" height=60> <h3>{{ _("Bug Tracker")}}</h3> </a> {{ _("Our bug tracker for bugs and feature request.") }} @@ -190,7 +190,7 @@ <div class="col-3"> <a href="https://git.taler.net"> - <img src="../icons/icon-code.svg" height=60> + <img src="{{ url('icons/icon-code.svg') }}" height=60> <h3>{{ _("Git repositories") }}</h3> </a> {{ _("Git repositories for all of GNU Taler.") }} @@ -199,5 +199,5 @@ </div> </div> - +{% endfor %} {% endblock body_content %} diff --git a/template/faq.html.j2 b/template/faq.html.j2 index 3a9349da..d1f5cfa9 100644 --- a/template/faq.html.j2 +++ b/template/faq.html.j2 @@ -117,7 +117,7 @@ <h2>{{ _("Does Taler work with international payments?") }}</h2> <p> {% trans %} - Taler's wallet supports multiple currencies, but the system + Taler's wallet supports multiple currencies, but the system currently does not support conversion between currencies. However, in principle an entity that accepts deposits in one currency and allows withdrawals in another currency could be created. Still, the 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/glossary.html.j2 b/template/glossary.html.j2 index cb5862e1..81b593f7 100644 --- a/template/glossary.html.j2 +++ b/template/glossary.html.j2 @@ -54,14 +54,14 @@ {% trans %} a `coin` is dirty if its public key may be known to an entity other than the customer, thereby creating the danger of some entity being able to - link multiple transactions of coin's owner if the coin is not refreshed + link multiple transactions of coin's owner if the coin is not refreshed first {% endtrans %} </dd> <dt>{{ _("exchange") }}</dt> <dd> {% trans %} - Taler's payment service provider. Issues electronic `coins` during + Taler's payment service provider. Issues electronic `coins` during `withdrawal` and redeems them when they are `deposited` by merchants. {% endtrans %} </dd> @@ -145,7 +145,7 @@ <dd> {% trans %} funds set aside for future use; either the balance of a customer at the - exchange ready for `withdrawal`, or the funds kept in the exchange's bank + exchange ready for `withdrawal`, or the funds kept in the exchange's bank account to cover obligations from coins in circulation {% endtrans %} </dd> @@ -176,7 +176,7 @@ <dt>{{ _("sharing") }}</dt> <dd> {% trans %} - users can share ownership of a `coin` by sharing access to the coin's + users can share ownership of a `coin` by sharing access to the coin's private key, thereby allowing all co-owners to spend the coin at any time. {% endtrans %} diff --git a/template/governments.html.j2 b/template/governments.html.j2 index 1f169d6f..78fbd487 100644 --- a/template/governments.html.j2 +++ b/template/governments.html.j2 @@ -56,7 +56,7 @@ <p> {% trans %} - Taler's payments are cryptographically secured. Thus, + Taler's payments are cryptographically secured. Thus, customers, merchants and the Taler payment service provider (the exchange) can mathematically demonstrate their lawful behavior in court in case of @@ -170,7 +170,7 @@ {% trans %} The amounts of digital coins legitimately withdrawn by customers from the exchange, the value of - non-redeemed digital coins in customer's wallets, the + non-redeemed digital coins in customer's wallets, the value and corresponding wire details of deposit operations performed by merchants with the exchange, and the income of the exchange from transaction fees. diff --git a/template/gsoc-codeless.html.j2 b/template/gsoc-codeless.html.j2 index 74fb05da..c2c297a7 100644 --- a/template/gsoc-codeless.html.j2 +++ b/template/gsoc-codeless.html.j2 @@ -12,13 +12,13 @@ <h2 id="overview">{{ _("Overview") }}</h2> <p> {% trans %} - Codeless payment is a component that sits between the seller's + Codeless payment is a component that sits between the seller's frontend and the GNU Taler merchant backend. This component has a web interface, where payment buttons are configured. Registered merchants can manage their inventory and simultaneously create a - 'Buy Now' button for a specific product. This code can be directly - copy pasted on the seller's frontend and can be used for 'Pay with - Taler'. + 'Buy Now' button for a specific product. This code can be directly + copy pasted on the seller's frontend and can be used for 'Pay with + Taler'. {% endtrans %} </p> </div> @@ -100,7 +100,7 @@ </p> </div> <div class="col-lg-6"> - <img src="{{ url('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%"> + <img src="{{ url_static('images/UseCaseDiagram.png') }}" alt="{{ _("Use Case Diagram")}}" style="float: right; margin: 5px 5px 5px 5px;" width="100%"> </div> </div> <!-- /container --> @@ -191,15 +191,15 @@ <h2 id="documentation">{{ _("Screenshots") }}</h2> <div class="col-lg-4"> <h3>{{ _("Home page")}}</h3> - <img src="{{ url('images/home.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/home.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> <h3>{{ _("Product page")}}</h3> - <img src="{{ url('images/product.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/product.png') }}" height="240" align="middle"> </div> <div class="col-lg-4"> <h3>{{ _("Shipment Tracking")}}</h3> - <img src="{{ url('images/shipment.png') }}" height="240" align="middle"> + <img src="{{ url_static('images/shipment.png') }}" height="240" align="middle"> </div> </div> </div> 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/investors.html.j2 b/template/investors.html.j2 index 784d9897..4fb50259 100644 --- a/template/investors.html.j2 +++ b/template/investors.html.j2 @@ -36,14 +36,11 @@ <p> {% trans %} We are currently supported by - {% endtrans %} - <a href="http://www.inria.fr/">Inria</a>, - {% trans %} + <a href="http://www.inria.fr/">Inria</a>, the French national institute for research in informatics and automation, and the + <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>. {% endtrans %} - <!-- They do have a German name though, allow translation? --> - <a href="https://renewablefreedom.org/">Renewable Freedom Foundation</a>. </p> </div> <div class="col-lg-4"> @@ -54,7 +51,7 @@ All transactions in Taler are secured using <a href="bibliography.html">modern cryptography</a> and trust in all parties is minimized. Financial damage is bounded - (for customers, merchants and the exchange) even in the case that + (for customers, merchants and the exchange) even in the case that systems are compromised and private keys are stolen. Databases can be audited for consistency, resulting in either the detection of compromised systems or the demonstration that participants were @@ -88,7 +85,7 @@ <div class="row"> <div class="col-lg-4"> <a href="{{ url('presentations/investors2018.pdf') }}"> - <img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url('images/pdf.svg') }}"> + <img border=0 class="center-block" width=64 height=64 alt="PDF" src="{{ url_static('images/pdf.svg') }}"> <br> <p align="center">{{ _("Download") }}</p> </a> @@ -107,8 +104,8 @@ <div class="col-lg-4" id="canvas-right" style="display:none"> <canvas id="the-canvas-right"></canvas> </div> - <script type="text/javascript" src="{{ url('dist/js/pdf.min.js') }}"></script> - <script type="text/javascript" src="{{ url('dist/js/pdf-view.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf.min.js') }}"></script> + <script type="text/javascript" src="{{ url_dist('js/pdf-view.js') }}"></script> </div> </div> </div> diff --git a/template/merchants.html.j2 b/template/merchants.html.j2 index 57e14ed5..95836059 100644 --- a/template/merchants.html.j2 +++ b/template/merchants.html.j2 @@ -77,7 +77,7 @@ <p> {% trans %} Taler is uses efficient cryptographic constructions with low - bandwidth and storage requirements. Combined with Taler's strong + bandwidth and storage requirements. Combined with Taler's strong security which makes fraud impossible, Taler payment service providers can operate with very low overhead and thus offer low transaction fees. @@ -100,7 +100,7 @@ <p> {% trans %} Taler prevents tax evasion and money laundering. - Taler's protocols are efficient and do not use wasteful + Taler's protocols are efficient and do not use wasteful proof-of-work calculations. Taler encourages transparency by providing an open standard and free software reference implementations. @@ -144,8 +144,8 @@ {% trans %} The backend <b>signs</b> and <b>stores</b> the complete terms of offers made by the merchant to customers. - For this, the merchant's frontend needs to give the - customer's order in a JSON format to the backend. + For this, the merchant's frontend needs to give the + customer's order in a JSON format to the backend. {% endtrans %} </li> @@ -154,7 +154,7 @@ The backend <b>validates</b> payments received from the wallet and <b>executes</b> them with the Taler payment service provider (the exchange). For this, - the merchant's frontend must pass the payment + the merchant's frontend must pass the payment request through to the Taler backend and check the HTTP status code that is returned. {% endtrans %} 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 diff --git a/template/wallet.html.j2 b/template/wallet.html.j2 index 94024e6a..1b3998a0 100644 --- a/template/wallet.html.j2 +++ b/template/wallet.html.j2 @@ -2,7 +2,7 @@ {% block head_content %} <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> -<script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> +<script src="{{ url('web-common/taler-wallet-lib.js') }}" type="text/javascript"></script> <script type="application/javascript"> /* @@ -117,7 +117,7 @@ document.addEventListener('DOMContentLoaded', onLoad); </p> <p class="bluebox" id="box-not-present" style="display:none"> {% trans %} - You don't have a wallet installed yet. + You don't have a wallet installed yet. {% endtrans %} </p> </div> <!-- /col-lg-12 --> @@ -147,7 +147,7 @@ document.addEventListener('DOMContentLoaded', onLoad); {% endtrans %} <a href="https://www.chromium.org/">Chromium</a> {% trans %} - is required, but it appears you don't have it installed. + is required, but it appears you don't have it installed. {% endtrans %} </p> <p id="error-chrome-version" class="error"> @@ -175,7 +175,7 @@ document.addEventListener('DOMContentLoaded', onLoad); <noscript> <em style="color:darkred;"> {% trans %} - JavaScript is disabled, installation won't work. + JavaScript is disabled, installation won't work. {% endtrans %} </em> </noscript> @@ -194,7 +194,7 @@ document.addEventListener('DOMContentLoaded', onLoad); <!-- <h3>Firefox Beta</h3> <ol> - <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li> + <li><a href="{{ url('releases/taler-wallet/taler-wallet-stable.xpi') }}">Download the wallet</a> (right click, Save Link As...)</li> <li>On the <code>about:debugging</code> page, "Load temporary extension"</li> </ol> |