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

This commit is contained in:
Florian Dold 2015-12-25 18:48:25 +01:00
commit 8b1be1eda6
2 changed files with 9 additions and 10 deletions

View File

@ -2,7 +2,7 @@
<html>
<head>
<title>Taler Wallet: Confirm Reserve Creation</title>
<title>Taler Wallet: Select Taler Provider</title>
<script src="../lib/URI.js"></script>
<script src="../lib/polyfill-react.js"></script>
<script src="confirm-create-reserve.js"></script>
@ -13,7 +13,7 @@
<header>
<div id="logo"></div>
<h1>Confirm Reserve Creation</h1>
<h1>Select Taler Provider</h1>
</header>
<aside class="sidebar" id="left">
@ -23,10 +23,10 @@
<article>
<p>
A bank wants to create a reserve for <span id="show-amount">(loading...)</span>.
You asked to withdraw <span id="show-amount">(loading...)</span> from your bank account.
</p>
<p>
Please specify the base URL of the mint you want to use.
Please specify the base URL of the Taler mint you want to use. The Taler mint will process the payments, possibly for a fee. The mint underwrites electronic coins and will hold matching funds in reserve in its bank account. Mints are expected to be regularly audited by a trusted party to ensure that they have sufficient reserves to cover all outstanding obligations.
</p>
<div class="formish">
@ -34,7 +34,7 @@
<label for="mint-url">Mint URL</label>
<input class="url" id="mint-url" type="text" value="http://mint.demo.taler.net/"></input>
</div>
<button id="confirm">Confirm Reserve</button>
<button id="confirm">Confirm Mint Selection</button>
</div>
</article>

View File

@ -2,14 +2,14 @@
<html>
<head>
<title>Taler Wallet: Reserve Created</title>
<title>Taler Wallet: Withdraw operation initiated</title>
<link rel="stylesheet" type="text/css" href="../style/wallet.css">
</head>
<body>
<header>
<div id="logo"></div>
<h1>Reserve Creation</h1>
<h1>Withdraw operation initiated</h1>
</header>
<aside class="sidebar" id="left">
@ -20,11 +20,10 @@
<article>
<h1>Success!</h1>
<p>The reserve was created successfully.</p>
<p>We have started the process of withdrawing electronic coins. This process may take a bit, but will happen in the background. So you can now continue to browse.</p>
<p>You can click on the Taler logo in your navigation bar to check on the progress of the withdrawal operation and your current balance.</p>
</article>
</section>
</body>
</body>
</html>