diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-10-15 12:15:22 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-10-15 12:15:22 +0200 |
commit | a653c2169b94691660561c4d3964bc24d018747e (patch) | |
tree | b9ce8106383f42cbff8b0bdbad82d7bf9a4fe633 | |
parent | 0a9286e8ef449d924397c2f39568cb18c89e758e (diff) | |
parent | c46834689c3f991c0fb2d917b6d72529f666235d (diff) | |
download | www-a653c2169b94691660561c4d3964bc24d018747e.tar.gz www-a653c2169b94691660561c4d3964bc24d018747e.zip |
Merge branch 'master' of git+ssh://taler.net/www
-rw-r--r-- | index.html | 2 | ||||
-rw-r--r-- | wallet.html | 22 |
2 files changed, 9 insertions, 15 deletions
@@ -21,7 +21,7 @@ | |||
21 | <h1 lang="en">Electronic payments for a liberal society!</h1> | 21 | <h1 lang="en">Electronic payments for a liberal society!</h1> |
22 | <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> | 22 | <h1 lang="de">Elektronisches Bezahlen für eine freiheitliche Gesellschaft!</h1> |
23 | <h1 lang="fr">Paiements électroniques pour une société libre!</h1> | 23 | <h1 lang="fr">Paiements électroniques pour une société libre!</h1> |
24 | <h1 lang="it">Pagamenti elettronici per una società liberale!</h1> | 24 | <h1 lang="it">Pagamenti elettronici per una società libera!</h1> |
25 | <h1 lang="es">¡Pagos electrónicos para una sociedad libre!</h1> | 25 | <h1 lang="es">¡Pagos electrónicos para una sociedad libre!</h1> |
26 | <p lang="en">Taler is a new electronic payment system under development | 26 | <p lang="en">Taler is a new electronic payment system under development |
27 | at <a href="http://www.inria.fr/">Inria</a>. Today, this website only | 27 | at <a href="http://www.inria.fr/">Inria</a>. Today, this website only |
diff --git a/wallet.html b/wallet.html index 924b4b60..900c3023 100644 --- a/wallet.html +++ b/wallet.html | |||
@@ -129,8 +129,7 @@ document.addEventListener('DOMContentLoaded', onLoad); | |||
129 | 129 | ||
130 | <div class="row"> | 130 | <div class="row"> |
131 | <div class="col-lg-6"> | 131 | <div class="col-lg-6"> |
132 | 132 | <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Google Chrome / Chromium 49+</a></h2> | |
133 | <h2>Google Chrome / Chromium 49+</h2> | ||
134 | 133 | ||
135 | <p id="error-chrome" class="error"> | 134 | <p id="error-chrome" class="error"> |
136 | <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> | 135 | <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> |
@@ -139,21 +138,16 @@ document.addEventListener('DOMContentLoaded', onLoad); | |||
139 | <p id="error-chrome-version" class="error"> | 138 | <p id="error-chrome-version" class="error"> |
140 | <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> | 139 | <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> |
141 | version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.</p> | 140 | version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.</p> |
142 | <ul> | 141 | <div id="inline-install-chrome"> |
143 | <li> | 142 | <button onclick="installWallet()" id="install-button"> |
144 | <a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install from the Chrome Web Store</a> | 143 | Install wallet |
145 | </li> | 144 | </button> |
146 | <li id="inline-install-chrome"> | 145 | <div id="install-result"></div> |
147 | <button onclick="installWallet()" id="install-button"> | 146 | </div> |
148 | Install from this page | ||
149 | </button> | ||
150 | <div id="install-result"></div> | ||
151 | </li> | ||
152 | </ul> | ||
153 | </div> <!-- /col-lg-6 --> | 147 | </div> <!-- /col-lg-6 --> |
154 | 148 | ||
155 | <div class="col-lg-6"> | 149 | <div class="col-lg-6"> |
156 | <h2>Firefox 50+</h2> | 150 | <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Firefox 50+</a></h2> |
157 | 151 | ||
158 | <p>The add-on is currently in the process of being reviewed and signed by Mozilla, | 152 | <p>The add-on is currently in the process of being reviewed and signed by Mozilla, |
159 | until then it can be installed the following way:</p> | 153 | until then it can be installed the following way:</p> |