[GNUnet-SVN] [taler-blog] branch master updated (75a0149 -> 0f625ec)

[gnunet]

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

dold pushed a change to branch master
in repository blog.

    from 75a0149  html fix / wording
     new b022594  text
     new 0f625ec  use taler://pay uri from backend

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 talerblog/blog/blog.py                        | 11 ++---------
 talerblog/blog/templates/base.html            |  2 +-
 talerblog/blog/templates/request_payment.html |  9 +++++++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/talerblog/blog/blog.py b/talerblog/blog/blog.py
index c2a72c3..1785f77 100644
--- a/talerblog/blog/blog.py
+++ b/talerblog/blog/blog.py
@@ -332,20 +332,13 @@ def article(article_name, data=None):
         ##
         # Redirect the browser to a page where the wallet can
         # run the payment protocol.
-        contract_url = pay_status["contract_url"]
-        taler_pay_uri = "talerpay:" + urllib.parse.quote_plus(contract_url) + 
";" + session_id
-
-        headers = {
-                "Taler-Contract-Url": urllib.parse.quote(contract_url),
-                "Taler-Session-Url": urllib.parse.quote(session_id),
-                "Taler-Resource-Url": urllib.parse.quote(resource_url),
-        }
-
+        taler_pay_uri = pay_status["taler_pay_uri"]
         qrcode_svg = get_qrcode_svg(taler_pay_uri)
         content = flask.render_template("templates/request_payment.html",
                                          article_name=article_name,
                                          taler_pay_uri=taler_pay_uri,
                                          qrcode_svg=qrcode_svg)
+        headers = { "Taler": taler_pay_uri }
         resp = flask.Response(content, status=402, headers=headers)
         return resp
 
diff --git a/talerblog/blog/templates/base.html 
b/talerblog/blog/templates/base.html
index ca33d03..52e97b7 100644
--- a/talerblog/blog/templates/base.html
+++ b/talerblog/blog/templates/base.html
@@ -20,7 +20,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block meta %}{% endblock %}
-  <title>Taler Donation Demo</title>
+  <title>Taler Essay Shop Demo</title>
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', 
filename='web-common/pure.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', 
filename='web-common/demo.css') }}" />
   <link rel="stylesheet" type="text/css" href="{{ url_for('static', 
filename='web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" />
diff --git a/talerblog/blog/templates/request_payment.html 
b/talerblog/blog/templates/request_payment.html
index 122b0ee..c30b847 100644
--- a/talerblog/blog/templates/request_payment.html
+++ b/talerblog/blog/templates/request_payment.html
@@ -4,15 +4,19 @@
 {% endblock meta %}
 {% block main %}
 
+<h1>Payment Required</h1>
+
 <div class="taler-installed-hide">
-  <h1>Payment Required</h1>
   <p>
   Looks like your browser doesn't support GNU Taler payments.  You can try
   installing a <a href="https://taler.net/en/wallet.html";>wallet browser 
extension</a>.
   </p>
+</div>
+
+<div>
 
   <p>
-  You can also use this QR code to pay with your mobile wallet:
+  You can use this QR code to pay with your mobile wallet:
   </p>
 
   {{ qrcode_svg | safe }}
@@ -22,4 +26,5 @@
   </p>
 
 </div>
+
 {% endblock main %}

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