commit 942a6227bae7e32db3f92886a47e00dd7c648067
parent ba0ef6b6e8a51ba10ceaba02835bd46004110ccf
Author: Florian Dold <florian.dold@gmail.com>
Date: Sat, 23 Apr 2016 19:34:30 +0200
wallet style
Diffstat:
4 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/pages/confirm-contract.html b/pages/confirm-contract.html
@@ -5,7 +5,6 @@
<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">
<script src="../lib/vendor/URI.js"></script>
<script src="../lib/vendor/mithril.js"></script>
@@ -15,18 +14,45 @@
<script src="../i18n/strings.js"></script>
<script src="../lib/i18n.js"></script>
<script src="../lib/module-trampoline.js"></script>
-</head>
-<body>
- <header>
- <div id="logo"></div>
- <h1>Payment Confirmation</h1>
- </header>
+ <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;
+ border-radius: 5px;
+ margin: 1em 0;
+ padding: 0.5em;
+ font-weight: bold;
+ color: white;
+ }
+ button.linky {
+ background:none!important;
+ border:none;
+ padding:0!important;
- <aside class="sidebar" id="left">
- </aside>
+ font-family:arial,sans-serif;
+ color:#069;
+ text-decoration:underline;
+ cursor:pointer;
+ }
+ input.url {
+ width: 25em;
+ }
+ </style>
+</head>
+
+<body>
<section id="main">
+ <h1>GNU Taler Wallet</h1>
<article id="contract" class="fade"></article>
</section>
</body>
diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx
@@ -87,7 +87,7 @@ export function main() {
_.map(contract.products,
(p: any) => m("li",
`${p.description}: ${prettyAmount(p.price)}`))),
- m("button.confirm-pay", {onclick: doPayment}, i18n`Confirm Payment`),
+ m("button.accept", {onclick: doPayment}, i18n`Confirm Payment`),
m("p", error ? error : []),
m(Details, contract)
];
diff --git a/pages/confirm-create-reserve.html b/pages/confirm-create-reserve.html
@@ -4,8 +4,6 @@
<head>
<title>Taler Wallet: Select Taler Provider</title>
- <link rel="stylesheet" type="text/css" href="../style/wallet.css">
-
<script src="../lib/vendor/URI.js"></script>
<script src="../lib/vendor/mithril.js"></script>
<script src="../lib/vendor/system-csp-production.src.js"></script>
@@ -13,21 +11,47 @@
<script src="../i18n/strings.js"></script>
<script src="../lib/i18n.js"></script>
<script src="../lib/module-trampoline.js"></script>
-</head>
-<body>
- <header>
- <div id="logo"></div>
- <h1>Select Taler Provider</h1>
- </header>
+ <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;
+ border-radius: 5px;
+ margin: 1em 0;
+ padding: 0.5em;
+ font-weight: bold;
+ color: white;
+ }
+ button.linky {
+ background:none!important;
+ border:none;
+ padding:0!important;
- <aside class="sidebar" id="left">
- </aside>
+ font-family:arial,sans-serif;
+ color:#069;
+ text-decoration:underline;
+ cursor:pointer;
+ }
+ input.url {
+ width: 25em;
+ }
+
+ </style>
+</head>
+
+<body>
<section id="main">
- <article>
+ <h1>GNU Taler Wallet</h1>
<div class="fade" id="exchange-selection"></div>
- </article>
</section>
</body>
diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx
@@ -194,8 +194,9 @@ function view(ctrl: Controller) {
let mx = (x, ...args) => controls.push(m(x, ...args));
mx("p",
- i18n`The bank wants to create a reserve over ${amountToPretty(
- ctrl.amount)}.`);
+ i18n.parts`You are about to withdraw ${m("strong", amountToPretty(
+ ctrl.amount))} from your bank account into your wallet.`);
+
mx("input",
{
className: "url",
@@ -205,14 +206,16 @@ function view(ctrl: Controller) {
oninput: m.withAttr("value", ctrl.onUrlChanged.bind(ctrl)),
});
- mx("button", {
+ mx("br");
+
+ mx("button.accept", {
onclick: () => ctrl.confirmReserve(ctrl.reserveCreationInfo,
ctrl.url(),
ctrl.amount,
ctrl.callbackUrl),
disabled: !ctrl.isValidExchange
},
- "Confirm exchange selection");
+ "Accept fees and withdraw");
if (ctrl.statusString) {
mx("p", ctrl.statusString);
