Updating template files wallet and principles.html

Signed-off-by: Stefan Kügel <skuegel@web.de>

2 files changed, 42 insertions, 32 deletions

diff --git a/template/principles.html.j2 b/template/principles.html.j2
index 2c37ead8..f3bcde2f 100644
--- a/template/principles.html.j2
+++ b/template/principles.html.j2
@@ -41,7 +41,7 @@
             For countries, Free/Libre
             software means GNU Taler can not compromise sovereignty by imposing
             restrictions or requirements. And for exchange operators, transparency is crucial to satisfy
-            <a href="https://en.wikipedia.org/wiki/Kerckhoffs's_principle">Kerckhoff's principle</a>
+            <a href="https://en.wikipedia.org/wiki/Kerckhoffs's_principle">Kerckhoffs's principle</a>
             and to establish public confidence.
           {% endtrans %}
         </p>
@@ -125,9 +125,8 @@
             principle (2). However, other parties - such as merchants - also
             must have data protection.
 
-            Generally, GNU Taler must collect the minimum information necessary:
-            data that is not collected or is no longer stored can not be
-            compromised.
+            Generally, GNU Taler must only collect the minimum information necessary:
+            Data that is not collected or is no longer stored cannot be compromised.
           {% endtrans %}
         </p>
       </div>
@@ -160,7 +159,7 @@
           {% trans %}
             GNU Taler must be designed to be efficient.
             Quite simply, efficiency means fewer things to break, and it means more
-            transactions per second and lowers our environmental impact. Efficiency
+            transactions per second and lower environmental impact. Efficiency
             is also critical for GNU Taler to be used for micropayments.
             Therefore certain expensive primitives, such as proof-of-work,
             must not be used by GNU Taler.
diff --git a/template/wallet.html.j2 b/template/wallet.html.j2
index 3a254c47..a14b9306 100644
--- a/template/wallet.html.j2
+++ b/template/wallet.html.j2
@@ -92,7 +92,6 @@ document.addEventListener('DOMContentLoaded', onLoad);
 
 {% block body_content %}
 <main id="maincontent">
-    <!-- Jumbotron -->
     <div class="jumbotron">
       <div class="text-center">
       <h1 lang="en">{% trans %}Taler Wallet{% endtrans %}</h1>
@@ -104,31 +103,38 @@ document.addEventListener('DOMContentLoaded', onLoad);
     <div class="row">
       <div class="col-lg-12">
         <p class="greenbox" id="box-present" style="display:none">
-          {% trans %}Congratulations, the Taler wallet is installed on your device. Check out the <a href="https://demo.taler.net/">demonstration</a>.{% endtrans %}
+          {% trans %}Congratulations, the Taler wallet is installed on your device. 
+          Check out the <a href="https://demo.taler.net/">demonstration</a>.{% endtrans %}
         </p>
         <p class="bluebox" id="box-not-present" style="display:none">
           {% trans %}You don&#39;t have a wallet installed yet.{% endtrans %}
         </p>
-      </div> <!-- /col-lg-12 -->
-    </div> <!-- /row -->
+      </div> 
+    </div> 
 
     <div class="row wallet-teaser-text">
       <div class="col-lg-12">
-        {% trans %}Install the wallet for your browser below, then check out the <a href="https://demo.taler.net">demonstration</a>. The source code is provided <a href="https://taler.net/files/wallet/">here</a>.{% endtrans %}
+        {% trans %}Install the wallet for your browser below, then check out the 
+        <a href="https://demo.taler.net">demonstration</a>. 
+        The source code is provided <a href="https://taler.net/files/wallet/" target="_blank" rel="noopener noreferrer">here</a>.{% endtrans %}
       </div>
-    </div> <!-- /row -->
+    </div> 
 
     <div class="row extension">
       <div class="col-lg-6">
-        <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">{% trans %}Google Chrome / Chromium 51+{% endtrans %}</a></h2>
+        <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc" target="_blank" rel="noopener noreferrer">
+        {% trans %}Google Chrome / Chromium 51+{% endtrans %}</a></h2>
 
         <p id="error-chrome" class="error">
-          {% trans %}<a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a> 
+          {% trans %}<a href="https://www.google.com/chrome" target="_blank" rel="noopener noreferrer">Google Chrome</a> or 
+          <a href="https://www.chromium.org/" target="_blank" rel="noopener noreferrer">Chromium</a> 
           is required, but it appears you don&#39;t have it installed.{% endtrans %}
         </p>
         <p id="error-chrome-version" class="error">
-          {% trans %}<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.{% endtrans %}
+          {% trans %}<a href="https://www.google.com/chrome" target="_blank" rel="noopener noreferrer">Google Chrome</a> or 
+          <a href="https://www.chromium.org/" target="_blank" rel="noopener noreferrer">Chromium</a> 
+          version <span id="chrome-min-version"></span> or newer is required, 
+          but it appears you have an older version.{% endtrans %}
         </p>
         <div id="inline-install-chrome">
           <form target="_blank" action="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">
@@ -143,10 +149,11 @@ document.addEventListener('DOMContentLoaded', onLoad);
           </noscript>
           <div id="install-result"></div>
         </div>
-      </div> <!-- /col-lg-6 -->
+      </div> 
 
       <div class="col-lg-6">
-        <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">{% trans %}Mozilla Firefox 57+{% endtrans %}</a></h2>
+        <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/" target="_blank" rel="noopener noreferrer">
+        {% trans %}Mozilla Firefox 57+{% endtrans %}</a></h2>
         <div id="inline-install-chrome">
           <form action="https://addons.mozilla.org/firefox/downloads/latest/taler-wallet/">
             <button action="submit" class="install-button">
@@ -169,22 +176,23 @@ document.addEventListener('DOMContentLoaded', onLoad);
           <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install the wallet</a></li>
         </ol>
         -->
-      </div> <!-- /col-lg-6 -->
+      </div> 
 
       <div class="col-lg-6">
         <h2>{% trans %}Opera 36+{% endtrans %}</h2>
 
         <ol>
           <li>
-            <a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">
-              {% trans %}Install Download of Chrome Extension{% endtrans %}
+            <a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/" target="_blank" rel="noopener noreferrer">
+              {% trans %}Install Download Chrome Extension{% endtrans %}
             </a>
           </li>
           <li>
-            {% trans %}<a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler from the Chrome Web Store</a>.{% endtrans %}
+            {% trans %}<a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc" target="_blank" rel="noopener noreferrer">
+            Install the Taler wallet from the Chrome Web Store</a>{% endtrans %}
           </li>
         </ol>
-      </div> <!-- /col-lg-6 -->
+      </div> 
 
 
       <div class="col-lg-6">
@@ -193,23 +201,26 @@ document.addEventListener('DOMContentLoaded', onLoad);
         <ul>
           <li>
         <p>{% trans %}You can 
-        <a href="https://taler.net/files/wallet/wallet-nightly-debug-1667560285.apk">download the APK for Android</a> directly.{% endtrans %}</p>
+        <a href="https://taler.net/files/wallet/wallet-nightly-debug-1667560285.apk" target="_blank" rel="noopener noreferrer">
+        download the APK for Android</a> directly.{% endtrans %}</p>
           </li>
           <li>
-            <p style="color: red">{% trans %}The wallet uploaded on Google is currently outdated (as of 2022-11-04). Please use F-Droid or side-load the APK.{% endtrans %}</p>
+            <p style="color: red">{% trans %}The wallet uploaded on Google is currently outdated (as of 2022-11-04). 
+            Please use F-Droid or side-load the APK.{% endtrans %}</p>
             <s>
-            <a href="https://play.google.com/store/apps/details?id=net.taler.wallet">
+            <a href="https://play.google.com/store/apps/details?id=net.taler.wallet" target="_blank" rel="noopener noreferrer">
                {% trans %}Install the Android App from Google App Store</a>
             </s>
-          </li> or 
+          </li>
           <li>
-            <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/">download the Android App from F-Droid (bypassing Google registration).{% endtrans %}
+            <a href="https://f-droid.org/en/packages/net.taler.wallet.fdroid/" target="_blank" rel="noopener noreferrer">
+            Download the Android App from F-Droid (bypassing Google registration).{% endtrans %}
             </a>
           </li>
         </ul>
-      </div> <!-- /col-lg-6 -->
+      </div> 
 
-    </div> <!-- /row -->
+    </div> 
 
     <div class="row extension">
 
@@ -218,8 +229,8 @@ document.addEventListener('DOMContentLoaded', onLoad);
         <p>
           {% trans %}Wallets for other browsers will be provided in the near future.{% endtrans %}
         </p>
-      </div> <!-- /col-lg-6 -->
+      </div> 
 
-    </div> <!-- /row -->
-  </div> <!-- /container -->
+    </div> 
+  </div> 
 {% endblock body_content %}