From 2b84f3bd5de3a500b63193924bea2f3dfd0c9afd Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 21 Apr 2021 21:07:18 +0200 Subject: common base template, new logo and lots of cleanup --- .../blog/templates/article_frame.html.j2 | 15 ------- .../blog/templates/article_refunded.html.j2 | 18 -------- talermerchantdemos/blog/templates/base.html.j2 | 52 ---------------------- .../blog/templates/confirm_refund.html.j2 | 23 ---------- talermerchantdemos/blog/templates/error.html.j2 | 24 ---------- talermerchantdemos/blog/templates/footer.html.j2 | 1 - talermerchantdemos/blog/templates/index.html.j2 | 36 --------------- talermerchantdemos/blog/templates/javascript.html | 31 ------------- .../blog/templates/language-switcher.html.j2 | 1 - talermerchantdemos/blog/templates/menu.html.j2 | 1 - 10 files changed, 202 deletions(-) delete mode 100644 talermerchantdemos/blog/templates/article_frame.html.j2 delete mode 100644 talermerchantdemos/blog/templates/article_refunded.html.j2 delete mode 100644 talermerchantdemos/blog/templates/base.html.j2 delete mode 100644 talermerchantdemos/blog/templates/confirm_refund.html.j2 delete mode 100644 talermerchantdemos/blog/templates/error.html.j2 delete mode 120000 talermerchantdemos/blog/templates/footer.html.j2 delete mode 100644 talermerchantdemos/blog/templates/index.html.j2 delete mode 100644 talermerchantdemos/blog/templates/javascript.html delete mode 120000 talermerchantdemos/blog/templates/language-switcher.html.j2 delete mode 120000 talermerchantdemos/blog/templates/menu.html.j2 (limited to 'talermerchantdemos/blog/templates') diff --git a/talermerchantdemos/blog/templates/article_frame.html.j2 b/talermerchantdemos/blog/templates/article_frame.html.j2 deleted file mode 100644 index 2690306..0000000 --- a/talermerchantdemos/blog/templates/article_frame.html.j2 +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "templates/base.html.j2" %} -{% block main %} -{% include "articles/" + lang + "/" + article_file %} - -{% if refundable %} -
-

- {{ - gettext("Taler allows merchants to offer refunds to customers.") + - gettext('You can request a refund within the first hour after buying this article.').format(url=url_for('confirm_refund', lang='en', order_id=order_id)) - }} -

-{% endif %} - -{% endblock main %} diff --git a/talermerchantdemos/blog/templates/article_refunded.html.j2 b/talermerchantdemos/blog/templates/article_refunded.html.j2 deleted file mode 100644 index d4e405c..0000000 --- a/talermerchantdemos/blog/templates/article_refunded.html.j2 +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "templates/base.html.j2" %} -{% block main %} - -

{{ gettext("Refunded") }}

- -

-{{ - gettext("Your payment (order ID {order}) for the article "{article}" has been refunded.").format(order=order_id,article=article_name) -}} -

- -

-{{ - gettext("You will not be able to read the article until you pay for it again.") -}} -

- -{% endblock main %} diff --git a/talermerchantdemos/blog/templates/base.html.j2 b/talermerchantdemos/blog/templates/base.html.j2 deleted file mode 100644 index c4935f1..0000000 --- a/talermerchantdemos/blog/templates/base.html.j2 +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - {% block meta %}{% endblock %} - {{ gettext("GNU Taler Demo: Essay Shop") }} - - - - - {% block styles %}{% endblock %} - {% block scripts %}{% endblock %} - - - -
-

{{ gettext("Taler Demo")}}
- {{ gettext("Essay shop") }}

-

{{ - gettext("On this page you can buy articles using an imaginary currency.") + "
" + - gettext("The articles are chapters from Richard Stallman's book "Free Software, Free Society".") + "
" + - gettext('The book is published by the FSF and available gratis at gnu.org.').format(shop="https://shop.fsf.org/product/free-software-free-society-2", gnu="https://www.gnu.org") - }} -

-
- {% from 'templates/menu.html.j2' import menu with context %} {{ menu('blog') }} - -
- {% block main %} - This is the main content of the page. - {% endblock %} - {% include 'templates/footer.html.j2' %} -
- - diff --git a/talermerchantdemos/blog/templates/confirm_refund.html.j2 b/talermerchantdemos/blog/templates/confirm_refund.html.j2 deleted file mode 100644 index a356ea1..0000000 --- a/talermerchantdemos/blog/templates/confirm_refund.html.j2 +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "templates/base.html.j2" %} -{% block main %} -

{{ gettext("Confirm refund request for article") }}

- -

- {{ - gettext("Do you want to get a refund for the article {name}?").format(name=article_name) + "
" + - gettext("In this demonstration, refunds will be automatically approved by the merchant.") + "
" + - gettext("After you have obtained a refund, you will not be able to read the article anymore.") - }} -

- -

- {{ - gettext ("You will only be able to receive the refund on the same wallet that you have used to pay for this article originally.") - }} -

- -
- - -
-{% endblock main %} diff --git a/talermerchantdemos/blog/templates/error.html.j2 b/talermerchantdemos/blog/templates/error.html.j2 deleted file mode 100644 index ffc2e1f..0000000 --- a/talermerchantdemos/blog/templates/error.html.j2 +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "templates/base.html.j2" %} -{% block main %} -

{{ gettext("Error encountered") }}

- -

{{ message }}

- - {% if status_code %} -

- {{ gettext ("The backend returned status code {code}.").format(code=status_code) }}. -

- {% endif %} - - {% if json %} -

{{gettext("Backend response:")}}

- 
{{ json }}
- {% endif %} - - {% if stack %} -

{{gettext("Stack trace:")}}

- 
-    {{ stack }}
-
- {% endif %} -{% endblock main %} diff --git a/talermerchantdemos/blog/templates/footer.html.j2 b/talermerchantdemos/blog/templates/footer.html.j2 deleted file mode 120000 index 028b093..0000000 --- a/talermerchantdemos/blog/templates/footer.html.j2 +++ /dev/null @@ -1 +0,0 @@ -../../templates/footer.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/blog/templates/index.html.j2 b/talermerchantdemos/blog/templates/index.html.j2 deleted file mode 100644 index f231e6f..0000000 --- a/talermerchantdemos/blog/templates/index.html.j2 +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "templates/base.html.j2" %} -{% block main %} -

{{ gettext("Essay Shop: Free Software, Free Society") }}

-
-

{{ gettext("This is the latest edition of Free Software, Free Society: Selected Essays of Richard M. Stallman.") }}
- Free Software Foundation
- 51 Franklin Street, Fifth Floor
- Boston, MA 02110-1335 -
- Copyright © 2002, 2010 Free Software Foundation, Inc. -

- -

{{ gettext("Verbatim copying and distribution of this entire book are permitted worldwide, without royalty, in any medium, provided this notice is preserved. Permission is granted to copy and distribute translations of this book from the original English into another language provided the translation has been approved by the Free Software Foundation and the copyright notice and this permission notice are preserved on all copies.") }} -

-

ISBN 978-0-9831592-0-9

-
- -

{{ gettext("Chapters") }}

-
- {{ - gettext("Click on an individual chapter to to purchase it with GNU Taler.") + - gettext('You can get free, virtual money to buy articles on this page at the bank').format(env('TALER_ENV_URL_BANK')) - }} -
- -
- {% for article in articles %} -
-

{{article.title}}

-

{{ article.teaser|safe }} ({{ gettext('Pay to read more...') }})

-
- {% else %} - ({{ gettext("No articles available in this language.") }}) - {% endfor %} -
-{% endblock main %} diff --git a/talermerchantdemos/blog/templates/javascript.html b/talermerchantdemos/blog/templates/javascript.html deleted file mode 100644 index 436c186..0000000 --- a/talermerchantdemos/blog/templates/javascript.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - JavaScript disclaimer. - - -

This site does not use JavaScript.

- - - - - - diff --git a/talermerchantdemos/blog/templates/language-switcher.html.j2 b/talermerchantdemos/blog/templates/language-switcher.html.j2 deleted file mode 120000 index 6423c5c..0000000 --- a/talermerchantdemos/blog/templates/language-switcher.html.j2 +++ /dev/null @@ -1 +0,0 @@ -../../templates/language-switcher.html.j2 \ No newline at end of file diff --git a/talermerchantdemos/blog/templates/menu.html.j2 b/talermerchantdemos/blog/templates/menu.html.j2 deleted file mode 120000 index b9575ea..0000000 --- a/talermerchantdemos/blog/templates/menu.html.j2 +++ /dev/null @@ -1 +0,0 @@ -../../templates/menu.html.j2 \ No newline at end of file -- cgit v1.2.3