Merge branch 'master' of taler.net:/var/git/wallet-webex

author: tg(x) <*@tg-x.net> 2016-10-05 00:02:10 +0200
committer: tg(x) <*@tg-x.net> 2016-10-05 00:02:10 +0200
commit: ec62d29c90958aa8d41474ed2fe5a179d6fafed7 (patch)
tree: 367cc55bc6772cf194ed6c4778cd344d581d3d7c /pages
parent: fda241d74d5c1c39203b64da676c684d4dc9d800 (diff)
parent: d3ccf4103900b8d990b1970d135695b938d94eae (diff)
8 files changed, 56 insertions, 20 deletions
diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html
index c2d75ef5a..e7200910a 100644
--- a/pages/confirm-contract.html
+++ b/pages/confirm-contract.html
@@ -5,6 +5,9 @@
   <title>Taler Wallet: Confirm Reserve Creation</title>
 
   <link rel="stylesheet" type="text/css" href="../style/lang.css">
+  <link rel="stylesheet" type="text/css" href="../style/wallet.css">
+
+  <link rel="icon" href="../img/icon.png">
 
   <script src="../lib/vendor/URI.js"></script>
   <script src="../lib/vendor/mithril.js"></script>
@@ -16,14 +19,6 @@
   <script src="../lib/module-trampoline.js"></script>
 
   <style>
-    #main {
-      border: solid 1px black;
-      border-radius: 10px;
-      margin: auto;
-      max-width: 50%;
-      padding: 2em;
-    }
-
     button.accept {
       background-color: #5757D2;
       border: 1px solid black;
diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx
index 52e4cb79a..f162dca85 100644
--- a/pages/confirm-contract.tsx
+++ b/pages/confirm-contract.tsx
@@ -52,7 +52,8 @@ const Details = {
         }, "show less details"),
         m("div", [
           "Accepted exchanges:",
-          m("ul", contract.exchanges.map(e => m("li", `${e.url}: ${e.master_pub}`)))
+          m("ul",
+            contract.exchanges.map(e => m("li", `${e.url}: ${e.master_pub}`)))
         ])
       ]);
     }
@@ -72,7 +73,9 @@ export function main() {
     view(ctrl: any) {
       return [
         renderContract(contract),
-        m("button.accept", {onclick: doPayment, disabled: payDisabled}, i18n`Confirm Payment`),
+        m("button.accept",
+          {onclick: doPayment, disabled: payDisabled},
+          i18n`Confirm Payment`),
         (error ? m("p.errorbox", error) : []),
         m(Details, contract)
       ];
@@ -87,7 +90,7 @@ export function main() {
         console.log("check-pay error", JSON.stringify(resp));
         switch (resp.error) {
           case "coins-insufficient":
-            error = "You do not have enough coins of the requested currency.";
+            error = i18n`You have insufficient funds of the requested currency in your wallet.`;
             break;
           default:
             error = `Error: ${resp.error}`;
diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
index 995a85aec..b8a825bd1 100644
--- a/pages/confirm-create-reserve.html
+++ b/pages/confirm-create-reserve.html
@@ -4,6 +4,8 @@
 <head>
   <title>Taler Wallet: Select Taler Provider</title>
 
+  <link rel="icon" href="../img/icon.png">
+
   <script src="../lib/vendor/URI.js"></script>
   <script src="../lib/vendor/mithril.js"></script>
   <script src="../lib/vendor/system-csp-production.src.js"></script>
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
index 0a509118d..8e8067052 100644
--- a/pages/confirm-create-reserve.tsx
+++ b/pages/confirm-create-reserve.tsx
@@ -214,6 +214,10 @@ function viewSimple(ctrl: Controller) {
       }, "advanced options");
     }
     else if (ctrl.reserveCreationInfo != undefined) {
+      let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
+                                  ctrl.reserveCreationInfo.withdrawFee).amount;
+      yield m("p", `Withdraw fees: ${amountToPretty(totalCost)}`);
+
       yield m("button.accept", {
            onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!,
                                               ctrl.url(),
@@ -228,9 +232,6 @@ function viewSimple(ctrl: Controller) {
           ctrl.complexViewRequested = true;
         }
       }, "advanced options");
-      let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
-                                  ctrl.reserveCreationInfo.withdrawFee).amount;
-      yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`);
     } else {
       yield m("p", "Please wait ...");
     }
@@ -242,6 +243,12 @@ function viewSimple(ctrl: Controller) {
 
 function viewComplex(ctrl: Controller) {
   function *f() {
+    if (ctrl.reserveCreationInfo) {
+      let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
+                                  ctrl.reserveCreationInfo.withdrawFee).amount;
+      yield m("p", `Withdraw fees: ${amountToPretty(totalCost)}`);
+    }
+
     yield m("button.accept", {
          onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo!,
                                             ctrl.url(),
@@ -277,9 +284,6 @@ function viewComplex(ctrl: Controller) {
     }
 
     if (ctrl.reserveCreationInfo) {
-      let totalCost = Amounts.add(ctrl.reserveCreationInfo.overhead,
-                                  ctrl.reserveCreationInfo.withdrawFee).amount;
-      yield m("p", `Withdraw cost: ${amountToPretty(totalCost)}`);
       if (ctrl.detailCollapsed()) {
         yield m("button.linky", {
           onclick: () => {
@@ -328,8 +332,8 @@ function renderReserveCreationDetails(rci: ReserveCreationInfo) {
   let withdrawFeeStr = amountToPretty(rci.withdrawFee);
   let overheadStr = amountToPretty(rci.overhead);
   return [
-    m("p", `Fee for withdrawal: ${withdrawFeeStr}`),
-    m("p", `Overhead: ${overheadStr}`),
+    m("p", `Withdrawal fees: ${withdrawFeeStr}`),
+    m("p", `Rounding loss: ${overheadStr}`),
     m("table", [
       m("tr", [
         m("th", "Count"),
diff --git a/pages/debug.html b/pages/debug.html
index 24682dd24..221c7380c 100644
--- a/pages/debug.html
+++ b/pages/debug.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>Taler Wallet Debugging</title>
+    <link rel="icon" href="../img/icon.png">
   </head>
   <body>
     <h1>Debug Pages</h1>
diff --git a/pages/help b/pages/help
deleted file mode 160000
-Subproject 1ca9f1b35b286625b05672feea1c16a4de368ed
diff --git a/pages/help/empty-wallet.html b/pages/help/empty-wallet.html
new file mode 100644
index 000000000..952bd92b7
--- /dev/null
+++ b/pages/help/empty-wallet.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>GNU Taler Help - Empty Wallet</title>
+    <link rel="icon" href="../../img/icon.png">
+    <meta name="description" content="">
+    <link rel="stylesheet" type="text/css" href="../../style/wallet.css">
+  </head>
+  <body>
+    <div class="container" id="main">
+      <div class="row">
+        <div class="col-lg-12">
+          <h2 lang="en">Your wallet is empty!</h2>
+          <p lang="en">You have succeeded with installing the Taler wallet.  However, before
+             you can buy articles using the Taler wallet, you must withdraw electronic coins.
+             This is typically done by visiting your bank's online banking Web site.  There,
+             you instruct your bank to transfer the funds to a Taler exchange operator.  In
+             return, your wallet will be allowed to withdraw electronic coins.</p>
+          <p lang="en">At this stage, we are not aware of any regular exchange operators issuing
+             coins in well-known currencies.  However, to see how Taler would work, you
+             can visit our "fake" bank at
+             <a href="https://bank.demo.taler.net/">bank.demo.taler.net</a> to
+             withdraw coins in the "KUDOS" currency that we created just for
+             demonstrating the system.</p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/pages/show-db.html b/pages/show-db.html
index ee54d0e08..024e844ee 100644
--- a/pages/show-db.html
+++ b/pages/show-db.html
@@ -4,7 +4,8 @@
 <html>
   <head>
     <title>Taler Wallet: Reserve Created</title>
-    <link rel="stylesheet" type="text/css" href="../style/wallet.css"> 
+    <link rel="stylesheet" type="text/css" href="../style/wallet.css">
+    <link rel="icon" href="../img/icon.png">
     <script src="show-db.js"></script>
   </head>
   <body>
author	tg(x) <*@tg-x.net>	2016-10-05 00:02:10 +0200
committer	tg(x) <*@tg-x.net>	2016-10-05 00:02:10 +0200
commit	ec62d29c90958aa8d41474ed2fe5a179d6fafed7 (patch)
tree	367cc55bc6772cf194ed6c4778cd344d581d3d7c /pages
parent	fda241d74d5c1c39203b64da676c684d4dc9d800 (diff)
parent	d3ccf4103900b8d990b1970d135695b938d94eae (diff)