[GNUnet-SVN] [taler-merchant-frontends] branch master updated: remove JS stuff, wording

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository merchant-frontends.

The following commit(s) were added to refs/heads/master by this push:
     new cd9ddf2  remove JS stuff, wording
cd9ddf2 is described below

commit cd9ddf2f33d4160111d79793b95327ededafe848
Author: Florian Dold <address@hidden>
AuthorDate: Wed Mar 15 14:40:43 2017 +0100

    remove JS stuff, wording
---
 talerfrontends/donations/templates/index.html | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/talerfrontends/donations/templates/index.html 
b/talerfrontends/donations/templates/index.html
index b544ba2..240e88b 100644
--- a/talerfrontends/donations/templates/index.html
+++ b/talerfrontends/donations/templates/index.html
@@ -1,15 +1,10 @@
 {% extends "templates/base.html" %}
 
-{% block scripts %}
-<meta name="merchant_currency" value="{{ merchant_currency }}">
-<script src="{{ url('/static/index.js') }}" 
type="application/javascript"></script>
-{% endblock %}
-
 {% block main %}
 <h1 lang="en">Welcome to the Taler Donation "Shop" Demo</h1>
 
 <p>This toy donations website shows the user experience for donations with 
Taler.
-You are paying with an imaginary currency ({{ env("TALER_CONFIG_CURRENCY", 
"KUDOS") }}).
+You are paying with an imaginary currency ({{ merchant_currency }}).
 </p>
 
 <div class="taler-installed-hide">
@@ -28,7 +23,7 @@ You are paying with an imaginary currency ({{ 
env("TALER_CONFIG_CURRENCY", "KUDO
 </div>
 
 <div class="taler-installed-show">
-  <p>Please choose a project and the amount (*) of {{ 
env("TALER_CONFIG_CURRENCY", "KUDOS") }} you
+  <p>Please choose a project and the amount (*) of {{ merchant_currency }} you
     wish to donate:</p>
 
   <form name="tform" action="checkout" method="GET" class="pure-form">
@@ -40,10 +35,10 @@ You are paying with an imaginary currency ({{ 
env("TALER_CONFIG_CURRENCY", "KUDO
         <!-- options are added dynamically -->
       </select>
       <select id="taler-donation" name="donation_amount">
-        <option value="0.1">0.1 {{ env("TALER_CONFIG_CURRENCY", "??") 
}}</option>
-        <option value="1">1 {{ env("TALER_CONFIG_CURRENCY", "??") }}</option>
-        <option value="6">5 {{ env("TALER_CONFIG_CURRENCY", "??") }}</option>
-        <option value="10">10 {{ env("TALER_CONFIG_CURRENCY", "??") }}</option>
+        <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>
       </select>
       <input type="submit" class="pure-button pure-button-primary" 
value="Donate!"/>
     </div>
@@ -61,7 +56,7 @@ You are paying with an imaginary currency ({{ 
env("TALER_CONFIG_CURRENCY", "KUDO
 
 <h2>Back-office interface</h2>
 <p>Try the <a href="backoffice">back-office</a>, in order to track
-your deposits!
+orders and corresponding deposits.
 </p>
 
 {% endblock %}

-- 
To stop receiving notification emails like this one, please contact
address@hidden