taler-www

commit a653c2169b94691660561c4d3964bc24d018747e
parent 0a9286e8ef449d924397c2f39568cb18c89e758e
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 15 Oct 2016 12:15:22 +0200

Merge branch 'master' of git+ssh://taler.net/www

Diffstat:
M
index.html
 | 
2
+-
M
wallet.html
 | 
22
++++++++--------------

2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/index.html b/index.html
@@ -21,7 +21,7 @@
          <h1 lang="en">Electronic payments for a liberal society!</h1>
          <h1 lang="de">Elektronisches Bezahlen f&uuml;r eine freiheitliche Gesellschaft!</h1>
          <h1 lang="fr">Paiements électroniques pour une société libre!</h1>
-         <h1 lang="it">Pagamenti elettronici per una società liberale!</h1>
+         <h1 lang="it">Pagamenti elettronici per una società libera!</h1>
          <h1 lang="es">¡Pagos electrónicos para una sociedad libre!</h1>
 	 <p lang="en">Taler is a new electronic payment system under development
 	    at <a href="http://www.inria.fr/">Inria</a>.  Today, this website only
diff --git a/wallet.html b/wallet.html
@@ -129,8 +129,7 @@ document.addEventListener('DOMContentLoaded', onLoad);
 
       <div class="row">
         <div class="col-lg-6">
-
-          <h2>Google Chrome / Chromium 49+</h2>
+          <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Google Chrome / Chromium 49+</a></h2>
 
           <p id="error-chrome" class="error">
             <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);
           <p id="error-chrome-version" class="error">
             <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a>
             version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.</p>
-          <ul>
-            <li>
-              <a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install from the Chrome Web Store</a>
-            </li>
-            <li id="inline-install-chrome">
-              <button onclick="installWallet()" id="install-button">
-                Install from this page
-              </button>
-              <div id="install-result"></div>
-            </li>
-          </ul>
+          <div id="inline-install-chrome">
+            <button onclick="installWallet()" id="install-button">
+              Install wallet
+            </button>
+            <div id="install-result"></div>
+          </div>
         </div> <!-- /col-lg-6 -->
 
         <div class="col-lg-6">
-          <h2>Firefox 50+</h2>
+          <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Firefox 50+</a></h2>
 
           <p>The add-on is currently in the process of being reviewed and signed by Mozilla,
              until then it can be installed the following way:</p>