diff options
author | Florian Dold <florian.dold@gmail.com> | 2018-01-22 02:58:20 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2018-01-22 02:59:38 +0100 |
commit | 73ec94f494b2f428d89aab703fd1608634bfd4e9 (patch) | |
tree | 8f2224300141229ea0e358fbc97f555f18eff72c /talerdonations/donations/templates | |
parent | 6faf7afb71328dae733858db78eb8c077e15536f (diff) | |
download | donations-73ec94f494b2f428d89aab703fd1608634bfd4e9.tar.gz donations-73ec94f494b2f428d89aab703fd1608634bfd4e9.tar.bz2 donations-73ec94f494b2f428d89aab703fd1608634bfd4e9.zip |
use new API, add donor
Diffstat (limited to 'talerdonations/donations/templates')
-rw-r--r-- | talerdonations/donations/templates/backoffice.html | 46 | ||||
-rw-r--r-- | talerdonations/donations/templates/base.html | 10 | ||||
-rw-r--r-- | talerdonations/donations/templates/checkout.html | 1 | ||||
-rw-r--r-- | talerdonations/donations/templates/execute-payment.html | 12 | ||||
-rw-r--r-- | talerdonations/donations/templates/fallback.html | 28 | ||||
-rw-r--r-- | talerdonations/donations/templates/index.html | 31 | ||||
-rw-r--r-- | talerdonations/donations/templates/provider-not-supported.html | 5 |
7 files changed, 23 insertions, 110 deletions
diff --git a/talerdonations/donations/templates/backoffice.html b/talerdonations/donations/templates/backoffice.html deleted file mode 100644 index 719d4b6..0000000 --- a/talerdonations/donations/templates/backoffice.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "templates/base.html" %} -{% block main %} - <h1>Backoffice</h1> - <p>This page simulates a backoffice facility. Through it, - the user can see the money flow from Taler transactions to - wire transfers and viceversa.</p> - <table id="history" width="60%" style="visibility: hidden;"> - <tbody> - <tr> - <th>Order ID</th> - <th>Summary</th> - <th>Amount</th> - <th>Date</th> - </tr> - </tbody> - </table> - <div class="loader"></div> - <div id="popup1" class="overlay"> - <div class="popup"> - <h2> - <a class="close" href="/backoffice">×</a> - </h2> - <div class="track-content"> - <table> - <tbody> - <tr> - <th>WTID</th> - <th>Amount</th> - <th>Coin</th> - <th>Date</th> - </tr> - </tbody> - </table> - </div> - </div> - </div> - <a href="#" onclick="get_history(true);" style="margin-left: 90%;">Fake scroll</a> -{% endblock main %} - -{% block styles %} - <link rel="stylesheet" type="text/css" href="{{ url("/static/popup.css") }}"> -{% endblock styles %} - -{% block scripts %} - <script src="{{ url('/static/backoffice.js') }}" type="application/javascript"></script> -{% endblock scripts %} diff --git a/talerdonations/donations/templates/base.html b/talerdonations/donations/templates/base.html index b464752..374e426 100644 --- a/talerdonations/donations/templates/base.html +++ b/talerdonations/donations/templates/base.html @@ -18,11 +18,9 @@ <html data-taler-nojs="true"> <head> <title>Taler Donation Demo</title> - <link rel="stylesheet" type="text/css" href="{{ url('/static/web-common/pure.css') }}" /> - <link rel="stylesheet" type="text/css" href="{{ url('/static/web-common/demo.css') }}" /> - <link rel="stylesheet" type="text/css" href="{{ url('/static/web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" /> - <script src="{{ url("/static/web-common/taler-wallet-lib.js") }}" type="application/javascript"></script> - <script src="{{ url("/static/web-common/lang.js") }}" type="application/javascript"></script> + <link rel="stylesheet" type="text/css" href="{{ url('static', filename='web-common/pure.css') }}" /> + <link rel="stylesheet" type="text/css" href="{{ url('static', filename='web-common/demo.css') }}" /> + <link rel="stylesheet" type="text/css" href="{{ url('static', filename='web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" /> {% block styles %}{% endblock %} {% block scripts %}{% endblock %} </head> @@ -43,7 +41,7 @@ </div> <section id="main" class="content"> - <a href="{{ url("/") }}"> + <a href="{{ url_for('index') }}"> <div id="logo"> <svg height="100" width="100"> <circle cx="50" cy="50" r="40" stroke="darkcyan" stroke-width="6" fill="white" /> diff --git a/talerdonations/donations/templates/checkout.html b/talerdonations/donations/templates/checkout.html index a7d009c..2785af8 100644 --- a/talerdonations/donations/templates/checkout.html +++ b/talerdonations/donations/templates/checkout.html @@ -36,6 +36,7 @@ <div id="opt-form" align="left"><br> <input type="hidden" name="donation_receiver" value="{{ donation_receiver }}"></input> <input type="hidden" name="donation_amount" value="{{ donation_amount }}"></input> + <input type="hidden" name="donation_donor" value="{{ donation_donor }}"></input> <input type="radio" name="payment_system" value="lisa" id="lisa-radio-button-id">Lisa</input> <br/> diff --git a/talerdonations/donations/templates/execute-payment.html b/talerdonations/donations/templates/execute-payment.html deleted file mode 100644 index e1283ce..0000000 --- a/talerdonations/donations/templates/execute-payment.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "templates/base.html" %} - -{% block scripts %} -<meta name="contract-hash" value="{{ hc }}"> -<meta name="pay-url" value="{{ pay_url|safe }}"> -<meta name="offering-url" value="{{ offering_url|safe }}"> -<script src="static/execute-payment.js" type="application/javascript"></script> -{% endblock scripts %} - -{% block main %} -<div id="msg">Executing payment <span id="action-indicator"></span></div> -{% endblock main %} diff --git a/talerdonations/donations/templates/fallback.html b/talerdonations/donations/templates/fallback.html deleted file mode 100644 index 8dc426b..0000000 --- a/talerdonations/donations/templates/fallback.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "templates/base.html" %} -{% block main %} - -<p class="taler-installed-show"> -Payment is being processed. If nothing happens, please <a href="{{ request.path }}">click here</a>. -</p> - -<div id="ccfakeform" class="taler-installed-hide"> - <p> - Oops, it looks like you don't have a Taler wallet installed. Why don't you enter - all your credit card details before reading the article? <em>You can also - use GNU Taler to complete the purchase at any time.</em> - </p> - - <form> - First name<br> <input type="text"><br> - Family name<br> <input type="text"><br> - Age<br> <input type="text"><br> - Nationality<br> <input type="text"><br> - Gender<br> <input type="radio" name"gender">Male</input> - CC number<br> <input type="text"><br> - <input type="radio" name="gender">Female<br> - </form> - <form method="get" action="/cc-payment/{{ article_name }}"> - <input type="submit"></input> - </form> -</div> -{% endblock main %} diff --git a/talerdonations/donations/templates/index.html b/talerdonations/donations/templates/index.html index 097c781..3ba9638 100644 --- a/talerdonations/donations/templates/index.html +++ b/talerdonations/donations/templates/index.html @@ -32,31 +32,26 @@ You are paying with an imaginary currency ({{ merchant_currency }}). <option value="GNUnet">GNUnet</option> <option value="Taler">GNU Taler</option> <option value="Tor">Tor</option> - <!-- options are added dynamically --> </select> <select id="taler-donation" name="donation_amount"> - <option value="0.1">0.1 {{ merchant_currency }}</option> - <option value="1">1 {{ merchant_currency }}</option> - <option value="6">5 {{ merchant_currency }}</option> - <option value="10">10 {{ merchant_currency }}</option> + <option value="{{ merchant_currency }}:0.1">0.1 {{ merchant_currency }}</option> + <option value="{{ merchant_currency }}:1">1 {{ merchant_currency }}</option> + <option value="{{ merchant_currency }}:6">5 {{ merchant_currency }}</option> + <option value="{{ merchant_currency }}:10">10 {{ merchant_currency }}</option> </select> - <input type="submit" class="pure-button pure-button-primary" value="Donate!"/> + <input type="text" name="donation_donor" value="Anonymous" /> + <input type="submit" class="pure-button pure-button-primary" value="Donate!" /> </div> </form> <p> - (*) To make it a bit more fun, the 5 KUDOS option - is deliberately implemented with a fault: the merchant will try to - make you donate 6 KUDOS instead of the 5 KUDOS you got to see. But do - not worry, you will be given the opportunity to review the - final offer from the merchant in a window secured - by the Taler extension. That way, you can spot the - error before committing to an incorrect contract. + (*) To make it a bit more fun, the 5 {{ merchant_currency }} option is + deliberately implemented with a fault: the merchant will try to make you + donate 6 {{ merchant_currency} instead of the 5 {{ merchant_currency }} you + got to see. But do not worry, you will be given the opportunity to review + the final offer from the merchant in a window secured by the Taler + extension. That way, you can spot the error before committing to an + incorrect contract. </p> </div> -<!-- <h2>Back-office interface</h2> --> -<!--p>Try the <a href="backoffice">back-office</a>, in order to track -orders and corresponding deposits. -</p Depends on #4992 --> - {% endblock %} diff --git a/talerdonations/donations/templates/provider-not-supported.html b/talerdonations/donations/templates/provider-not-supported.html new file mode 100644 index 0000000..e10d66a --- /dev/null +++ b/talerdonations/donations/templates/provider-not-supported.html @@ -0,0 +1,5 @@ +{% extends "templates/base.html" %} + +{% block main %} +Unfortunately the selected payment provider is not supported in this demo. +{% endblock main %} |