[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-www] branch master updated: add pages for cashier and pos, modify
From: |
gnunet |
Subject: |
[taler-www] branch master updated: add pages for cashier and pos, modify link to wallet to point to F-Droid instead of F-Dold |
Date: |
Tue, 15 Sep 2020 12:18:10 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository www.
The following commit(s) were added to refs/heads/master by this push:
new 74b1f0e add pages for cashier and pos, modify link to wallet to point
to F-Droid instead of F-Dold
74b1f0e is described below
commit 74b1f0ec7295a9938d23c2c48762c79cab4a1c3f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Sep 15 12:18:03 2020 +0200
add pages for cashier and pos, modify link to wallet to point to F-Droid
instead of F-Dold
---
template/cashier.html.j2 | 87 +++++++++++++++++++++++++++++++++++++-----------
template/pos.html.j2 | 78 +++++++++++++++++++++++++++++++++++++++++++
template/wallet.html.j2 | 4 +--
3 files changed, 148 insertions(+), 21 deletions(-)
diff --git a/template/cashier.html.j2 b/template/cashier.html.j2
index c7509e9..6a6b548 100644
--- a/template/cashier.html.j2
+++ b/template/cashier.html.j2
@@ -1,29 +1,78 @@
{% extends "common/base.j2" %}
+{% block head_content %}
+<style type="text/css">
+ .greenbox {
+ background-color: #5EFF64;
+ border: solid;
+ border-radius: 5px;
+ padding: 0.5em;
+ }
+ .bluebox {
+ background-color: #C2C6FF;
+ border: solid;
+ border-radius: 5px;
+ padding: 0.5em;
+ }
+ .error {
+ font-style: italic;
+ display: none;
+ }
+ #install-result {
+ font-weight: bold;
+ }
+
+ main ul li {
+ margin-bottom: 1em;
+ }
+</style>
+{% endblock head_content %}
+
{% block body_content %}
-<!-- Jumbotron -->
-<div class="jumbotron">
- <div class="text-center">
- <h1 lang="en">{{ _("Taler Cashier") }}</h1>
+ <!-- Jumbotron -->
+ <div class="jumbotron">
+ <div class="text-center">
+ <h1 lang="en">Taler Cashier</h1>
+ </div>
</div>
-</div>
-<div class="container">
+ <div class="container">
<div class="row">
- <div class="col-lg-12">
- <p>
- {% trans %}
- The Taler Cashier is an Android app
- that enables you to take cash and give out electronic cash.
- {% endtrans %}
- </p>
- <h2>{{ _("Download") }}</h2>
- <p>
- Coming soon!
- </p>
- </div> <!-- /col-lg-12 -->
+ <div class="col-lg-12">
+ {% trans %}
+ This is the page for the Taler cashier App. It allows
+ the cashier to grant Taler users the right to withdraw
+ a certain amount of e-cash from the cashier's bank
+ account. Thus, it offers
+ an equivalent functionality to what you may find
+ on the bank Web site when withdrawing from an account there.
+ {% endtrans %}
+ </a>.
+ </div>
</div> <!-- /row -->
-</div> <!-- /container -->
+ <div class="row">
+ <div class="col-lg-6">
+ <h2>Android 4.4 (API 18) or later</h2>
+ <ul>
+ <li>
+ <a href="https://play.google.com/apps/testing/net.taler.cashier">
+ {% trans %}
+ Install Android App from Google App Store, or
+ {% endtrans %}
+ </a>
+ </li>
+ <li>
+ <a href="https://f-droid.org/en/packages/net.taler.cashier/">
+ {% trans %}
+ Download App from F-Droid.org.
+ {% endtrans %}
+ </a>
+ </li>
+ </ul>
+ </div> <!-- /col-lg-6 -->
+
+ </div> <!-- /row -->
+ </div> <!-- /container -->
{% endblock body_content %}
diff --git a/template/pos.html.j2 b/template/pos.html.j2
new file mode 100644
index 0000000..85222c1
--- /dev/null
+++ b/template/pos.html.j2
@@ -0,0 +1,78 @@
+{% extends "common/base.j2" %}
+
+{% block head_content %}
+<style type="text/css">
+ .greenbox {
+ background-color: #5EFF64;
+ border: solid;
+ border-radius: 5px;
+ padding: 0.5em;
+ }
+ .bluebox {
+ background-color: #C2C6FF;
+ border: solid;
+ border-radius: 5px;
+ padding: 0.5em;
+ }
+ .error {
+ font-style: italic;
+ display: none;
+ }
+ #install-result {
+ font-weight: bold;
+ }
+
+ main ul li {
+ margin-bottom: 1em;
+ }
+</style>
+{% endblock head_content %}
+
+{% block body_content %}
+ <!-- Jumbotron -->
+ <div class="jumbotron">
+ <div class="text-center">
+ <h1 lang="en">Taler Point of Sale (PoS)</h1>
+ </div>
+ </div>
+
+ <div class="container">
+
+ <div class="row">
+ <div class="col-lg-12">
+ {% trans %}
+ This is the page for the Taler PoS App. It allows
+ a vendor to maintain a list of products and to
+ quickly build up Taler contracts and process Taler
+ payments for these contracts. Its main use-case
+ is for a mensa, cafeteria or restaurant when vending
+ food from a menu.
+ {% endtrans %}
+ </a>.
+ </div>
+ </div> <!-- /row -->
+
+ <div class="row">
+ <div class="col-lg-6">
+ <h2>Android 4.4 (API 18) or later</h2>
+ <ul>
+ <li>
+ <a
href="https://play.google.com/apps/testing/net.taler.merchantpos">
+ {% trans %}
+ Install Android App from Google App Store, or
+ {% endtrans %}
+ </a>
+ </li>
+ <li>
+ <a href="https://f-droid.org/en/packages/net.taler.merchantpos/">
+ {% trans %}
+ Download App from F-Droid.org.
+ {% endtrans %}
+ </a>
+ </li>
+ </ul>
+ </div> <!-- /col-lg-6 -->
+
+ </div> <!-- /row -->
+ </div> <!-- /container -->
+{% endblock body_content %}
diff --git a/template/wallet.html.j2 b/template/wallet.html.j2
index 53e4192..907fd59 100644
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -244,9 +244,9 @@ document.addEventListener('DOMContentLoaded', onLoad);
</a>
</li>
<li>
- <a href="https://fdold.eu/taler-wallet-android.apk">
+ <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/">
{% trans %}
- Download Android App from us (bypassing Google registration)
and Open in a File Manager to install.
+ Download Android App from F-Droid (bypassing Google
registration).
{% endtrans %}
</a>
</li>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-www] branch master updated: add pages for cashier and pos, modify link to wallet to point to F-Droid instead of F-Dold,
gnunet <=