[taler-merchant] branch master updated: style improvements

[gnunet]

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 c2bf5fe  style improvements
c2bf5fe is described below

commit c2bf5fedfd7c703b3cb807f34655f3bb39f80840
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jul 29 17:12:46 2020 +0200

    style improvements
---
 contrib/request_payment.must                     | 114 ++++++++++-------------
 src/backend/taler-merchant-httpd_get-orders-ID.c |   2 +
 2 files changed, 50 insertions(+), 66 deletions(-)

diff --git a/contrib/request_payment.must b/contrib/request_payment.must
index 6ef7794..2850808 100644
--- a/contrib/request_payment.must
+++ b/contrib/request_payment.must
@@ -29,81 +29,59 @@
         
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 {
+.taler::before {
   content: "❬";
   color: #aa3939;
 }
-.adorn-brackets::after {
+.taler::after {
   content: "❭";
   color: #aa3939;
 }
+.talerbar {
+  text-align: center;
+}
 .tt {
   font-family: 'Lucida Console', Monaco, monospace;
 }
-.informational-ok {
-  background: lightgreen;
-  border-radius: 1em;
-  padding: 0.5em;
+.content {
+    overflow-x: auto;
+    padding-left: 15%;
+    padding-right: 15%;
+}
+.qr {
+    margin: auto;
+    text-align: center;
+    transition: transform .2s;
+    height: 25vh;
+    width: 25vh;
+    font-size: 0.43vh;
 }
-.informational-fail {
-  background: lightpink;
-  border-radius: 1em;
-  padding: 0.5em;
+.qr:hover {
+    transform: scale(1.5);
 }
-.content {
-  overflow-x: auto;
+.talerbar {
+    margin: 0;
+    bottom: 0;
+    background-color: #033;
+    color: white;
+    width: 100%;
+    padding: 1em;
+    overflow: auto;
 }
+
 body {
   overflow-y: scroll;
 }
-
 @media (min-width: 500px) {
   .content {
-    margin-left: 25%;
-    padding-left: 2em;
+    padding-bottom: 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;
+    overflow-y: 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;
-    }
+#main a:link, #main a:visited, #main a:hover, #main a:active {
+  color: black;
+}
   </style>
 </head>
 
@@ -140,32 +118,36 @@ body {
 
 <section id="main" class="content">
 
-<h1>Payment Required</h1>
+
+<h1><span class="taler">Taler</span> 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://wallet.taler.net/";>wallet browser 
extension</a>.
+  Please select your Taler wallet to pay. If you do not have one, GNU Taler
+  offers <a href="https://www.gnu.org/philosophy/free-sw.html>Free</a>
+  <a href="https://wallet.taler.net/";>wallet browser extensions</a> for
+  many platforms.
   </p>
 </div>
 
 <div>
   <p>
-  You can use this QR code to pay with your mobile wallet:
+  Alternatively, you can scan this QR code to pay with your mobile wallet:
   </p>
-  {{{taler_pay_qrcode_svg}}}
+  <div class="qr">
+    {{{taler_pay_qrcode_svg}}}
+  </div>
   <p>
-  Click <a href="{{taler_pay_uri}}">this link</a> to open your system's
-  Taler wallet if it exists.
+  Finally, you could click <a href="{{taler_pay_uri}}">this link</a> to
+  try to open your system's Taler wallet if it exists.
   </p>
 </div>
 <hr />
 </section>
 
-<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 class="talerbar">
+  <p>You can learn more about GNU Taler on our <a 
href="https://taler.net/";>website</a>.<br>
+  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 b0c977d..6b0b981 100644
--- a/src/backend/taler-merchant-httpd_get-orders-ID.c
+++ b/src/backend/taler-merchant-httpd_get-orders-ID.c
@@ -416,6 +416,8 @@ static struct mustach_itf itf = {
  * failures, that is if we ever failed to load a template, we will never try
  * again.
  *
+ * FIXME: support i18n: evaluate Language: header from the browser!
+ *
  * @param name name of the template file to load
  *        (MUST be a 'static' string in memory!)
  * @return NULL on error, otherwise the template

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