gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] branch master updated: revise template


From: gnunet
Subject: [taler-merchant] branch master updated: revise template
Date: Sun, 26 Jul 2020 16:15:21 +0200

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 3096616  revise template
3096616 is described below

commit 3096616441f2a8d226bfb42c1a655f484ac717f3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jul 26 16:15:19 2020 +0200

    revise template
---
 contrib/request_payment.must                     | 140 ++++++++++++++++++++---
 src/backend/taler-merchant-httpd_get-orders-ID.c |   4 +-
 2 files changed, 123 insertions(+), 21 deletions(-)

diff --git a/contrib/request_payment.must b/contrib/request_payment.must
index 6e050d0..89062b6 100644
--- a/contrib/request_payment.must
+++ b/contrib/request_payment.must
@@ -1,16 +1,115 @@
-{% extends "templates/base.html" %}
+<!DOCTYPE html>
+<!--
+  This file is part of GNU TALER.
+  Copyright (C) 2014-2020 Taler Systems SA
 
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Lesser General Public License as published by the Free 
Software
+  Foundation; either version 2.1, or (at your option) any later version.
 
-{% block meta %}
-<noscript>
-  <meta http-equiv="refresh" content="1">
-</noscript>
-{% endblock meta %}
+  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more 
details.
 
+  You should have received a copy of the GNU Lesser General Public License 
along with
+  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+-->
 
-{% block scripts %}
+<html data-taler-nojs="true">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <noscript>
+    <meta http-equiv="refresh" content="1">
+  </noscript>
+  <title>Payment required for {{order_summary}}</title>
+  <!-- FIXME: inline this? How to best serve this without using 3rd party? -->
+  <link rel="stylesheet"
+        href="https://unpkg.com/purecss@2.0.3/build/pure-min.css";
+        
integrity="sha384-cg6SkqEOCV1NbJoCu11+bm0NvBRc8IYLRGXkmNrqUBfTjmMYwNKPWBTIKyw9mHNJ"
+        crossorigin="anonymous">
+  <style>
+.talerbar h1 {
+  text-align: center;
+}
+.talerbar > p {
+  padding: 0.5em;
+}
+.talerbar a,
+.talerbar a:visited {
+  color: inherit;
+}
+.adorn-brackets::before {
+  content: "❬";
+  color: #aa3939;
+}
+.adorn-brackets::after {
+  content: "❭";
+  color: #aa3939;
+}
+.tt {
+  font-family: 'Lucida Console', Monaco, monospace;
+}
+.informational-ok {
+  background: lightgreen;
+  border-radius: 1em;
+  padding: 0.5em;
+}
+.informational-fail {
+  background: lightpink;
+  border-radius: 1em;
+  padding: 0.5em;
+}
+.content {
+  overflow-x: auto;
+}
+body {
+  overflow-y: scroll;
+}
+
+@media (min-width: 500px) {
+  .content {
+    margin-left: 25%;
+    padding-left: 2em;
+    margin-right: 1em;
+    overflow-x: auto;
+  }
+  .talerbar {
+    height: 100%;
+    margin: 0;
+    top: 0;
+    left: 0;
+    background-color: #033;
+    color: white;
+    position: fixed;
+    width: 25%;
+    padding-right: 1em;
+    overflow: auto;
+  }
+}
+  .warn {
+      background-color: #aa393977;
+      padding: 1em;
+    }
+    .notice {
+      border-radius: 1em;
+      background: #0333;
+      border-left: 0.3em solid #033;
+      padding-left: 1em;
+      padding-top: 0.5em;
+      padding-bottom: 0.5em;
+      margin-top: 2em;
+      margin-bottom: 2em;
+    }
+    #main a:link, #main a:visited, #main a:hover, #main a:active {
+        color: black;
+    }
+  </style>
+</head>
+
+<body>
 <script>
-  let checkUrl = decodeURIComponent("{{ check_status_url_enc }}");
+  let checkUrl = FIXME_dold_pay_uri_to_URL("{{taler_pay_uri}}");
   let delayMs = 500;
   function check() {
     let req = new XMLHttpRequest();
@@ -38,32 +137,35 @@
 
   setTimeout(check, delayMs);
 </script>
-{% endblock scripts %}
 
-
-{% block main %}
+<section id="main" class="content">
 
 <h1>Payment Required</h1>
 
 <div class="taler-installed-hide">
   <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>.
+  installing a <a href="https://wallet.taler.net/";>wallet browser 
extension</a>.
   </p>
 </div>
 
 <div>
-
   <p>
   You can use this QR code to pay with your mobile wallet:
   </p>
-
-  {{ qrcode_svg | safe }}
-
+  {{taler_pay_qrcode_svg}}
   <p>
-  Click <a href="{{ taler_pay_uri }}">this link</a> to open your system's 
Taler wallet if it exists.
+  Click <a href="{{taler_pay_uri}}">this link</a> to open your system's
+  Taler wallet if it exists.
   </p>
-
 </div>
+<hr />
+</section>
 
-{% endblock main %}
+<div class="talerbar" style="display: flex; flex-direction: column;">
+  <p>You can learn more about Taler on our <a 
href="https://taler.net/";>website</a>.</p>
+  <div style="flex-grow:1"></div>
+  <p>Copyright &copy; 2014&mdash;2020 Taler Systems SA</p>
+</div>
+</body>
+</html>
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c 
b/src/backend/taler-merchant-httpd_get-orders-ID.c
index ad1d596..c16fc8d 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -695,9 +695,9 @@ send_pay_request (struct GetOrderData *god,
     }
     {
       struct KVC kvc[] = {
-        { "pay_uri",
+        { "taler_pay_uri",
           GNUNET_strdup (taler_pay_uri) },
-        { "pay_qr",
+        { "taler_pay_qrcode_svg",
           qr },
         { NULL, NULL }
       };

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]