diff options
| -rw-r--r-- | citizens.html.j2 | 29 | ||||
| -rw-r--r-- | common/base.j2 | 3 | ||||
| -rw-r--r-- | taler-big-accent.svg | 9 | ||||
| -rw-r--r-- | wallet.html.j2 | 284 |
4 files changed, 175 insertions, 150 deletions
diff --git a/citizens.html.j2 b/citizens.html.j2 index b464d1ee..767559e4 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 @@ -70,6 +70,35 @@ </div> </div> +</div> + +<div class="contianer-fluid c_acronym"> +<div class="container"> + <div class="row"> + <div class="col-lg-6"> + <h2>{{ _("Wallet Browser Extension") }}</h2> + <p> + {% trans %} + We currently provide a <a href="wallet.html">wallet browser extension</a> for Chromium, Chrome, Firefox, Opera + and Edge. Wallets for mobile phones and other platforms will be available in the future. + {% endtrans %} + </p> + </div> + <div class="col-lg-6"> + <h2>{{ _("Taler Demo") }}</h2> + <p> + {% trans %} + You can see how Taler works in practice by visiting our <a href="https://demo.taler.net">demo page</a>. + {% endtrans %} + </p> + </div> + </div> +</div> +</div> + + +<div class="container"> + <div class="col-lg-12"> <h2 id="overview">{{ _("Taler as seen by customers") }}</h2> diff --git a/common/base.j2 b/common/base.j2 index 7bed5774..31b5f1ed 100644 --- a/common/base.j2 +++ b/common/base.j2 @@ -4,7 +4,8 @@ <meta charset="UTF-8"/> <title>{{ _("GNU Taler") }}</title> <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" /> - {% include "common/header.j2.inc" %} + {% include "common/header.j2.inc" %} + {% block head_content %}{% endblock %} </head> <body id="mybody"> {% include "common/navigation.j2.inc" %} diff --git a/taler-big-accent.svg b/taler-big-accent.svg index 89b76b10..508b1eb9 100644 --- a/taler-big-accent.svg +++ b/taler-big-accent.svg @@ -7,13 +7,14 @@ <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" /> <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" /> - <rect x="-20" y="-17" width="40" height="4"/> - <rect x="-20" y="-12" width="40" height="1"/> - <rect x="-4" y="-17" width="8" height="54"/> + <!-- big horizontal T stroke --> + <rect x="-20" y="-14" width="40" height="4"/> + <rect x="-20" y="-9" width="40" height="1"/> + <rect x="-4" y="-14" width="8" height="54"/> - <text font-family="Verdana" font-weight="bold" font-size="8" color="red" x="0" y="-20" text-anchor="middle" letter-spacing="0.25em"> + <text font-family="Verdana" font-weight="bold" font-size="9" color="red" x="0" y="-20" text-anchor="middle" letter-spacing="0.20em"> <tspan class="ts1">❬</tspan>Tale<tspan class="ts2">r<tspan class="ts1">❭</tspan></tspan> </text> diff --git a/wallet.html.j2 b/wallet.html.j2 index 5756de0b..85714462 100644 --- a/wallet.html.j2 +++ b/wallet.html.j2 @@ -1,38 +1,33 @@ -<!DOCTYPE html> -<html lang="{{ _('en') }}"> - <head profile="http://www.w3.org/2005/10/profile"> - <meta charset="UTF-8"/> - <title>{{ _("GNU Taler") }} - {{ _("Wallet") }}</title> - <meta name="description" content=""/> - {% include "common/header.j2.inc" %} - - <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> - <script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> - - <script type="application/javascript"> - /* - @licstart The following is the entire license notice for the - JavaScript code in this page. - - Copyright (C) 2015 GNUnet e.V. - - The JavaScript code in this page is free software: you can - redistribute it and/or modify it under the terms of the GNU - Lesser General Public License (GNU LGPL) as published by the Free Software - Foundation, either version 2.1 of the License, or (at your option) - any later version. The code is distributed WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU LGPL for more details. - - As additional permission under GNU LGPL version 2.1 section 7, you - may distribute non-source (e.g., minimized or compacted) forms of - that code without the copy of the GNU LGPL normally required by - section 4, provided you include this license notice and a URL - through which recipients can access the Corresponding Source. - - @licend The above is the entire license notice - for the JavaScript code in this page. - */ +{% extends "common/base.j2" %} + +{% block head_content %} +<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> +<script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> + +<script type="application/javascript"> +/* + @licstart The following is the entire license notice for the + JavaScript code in this page. + + Copyright (C) 2015 GNUnet e.V. + + The JavaScript code in this page is free software: you can + redistribute it and/or modify it under the terms of the GNU + Lesser General Public License (GNU LGPL) as published by the Free Software + Foundation, either version 2.1 of the License, or (at your option) + any later version. The code is distributed WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU LGPL for more details. + + As additional permission under GNU LGPL version 2.1 section 7, you + may distribute non-source (e.g., minimized or compacted) forms of + that code without the copy of the GNU LGPL normally required by + section 4, provided you include this license notice and a URL + through which recipients can access the Corresponding Source. + + @licend The above is the entire license notice + for the JavaScript code in this page. +*/ var chrome_min_version = '49'; @@ -78,123 +73,122 @@ function onLoad() { } document.addEventListener('DOMContentLoaded', onLoad); - </script> - - <style type="text/css"> - .greenbox { - background-color: #5EFF64; - border: solid; - border-radius: 5px; - padding: 0.5em; - } - .bluebox { - background-color: #C2C6FF; - border: solid; - border-radius: 5px; - padding: 0.5em; - } - .error { - font-style: italic; - display: none; - } - #install-result { - font-weight: bold; - } - - main ul li { - margin-bottom: 1em; - } - </style> - </head> - - <body> - <div class="container"> - {% include "common/navigation.j2.inc" %} - <!-- Jumbotron --> - <div class="jumbotron"> - <h1 lang="en">Taler Wallet</h1> +</script> + +<style type="text/css"> + .greenbox { + background-color: #5EFF64; + border: solid; + border-radius: 5px; + padding: 0.5em; + } + .bluebox { + background-color: #C2C6FF; + border: solid; + border-radius: 5px; + padding: 0.5em; + } + .error { + font-style: italic; + display: none; + } + #install-result { + font-weight: bold; + } + + main ul li { + margin-bottom: 1em; + } +</style> +{% endblock head_content %} + +{% block body_content %} + <!-- Jumbotron --> + <div class="jumbotron"> + <div class="text-center"> + <h1 lang="en">Taler Wallet</h1> </div> - - <div class="row"> - <div class="col-lg-12"> - <p class="greenbox" id="box-present" style="display:none"> - Congratulations, you have installed the Taler wallet. - Check out the <a href="https://demo.taler.net/">demo</a>. - </p> - <p class="bluebox" id="box-not-present" style="display:none"> - You don't have a wallet installed yet. - </p> - </div> <!-- /col-lg-12 --> - </div> <!-- /row --> - - <div class="row"> - <div class="col-lg-12"> - Install the wallet for your browser below, then check out the - <a href="https://demo.taler.net">demonstration</a>. + </div> + + <div class="container"> + + <div class="row"> + <div class="col-lg-12"> + <p class="greenbox" id="box-present" style="display:none"> + Congratulations, you have installed the Taler wallet. + Check out the <a href="https://demo.taler.net/">demo</a>. + </p> + <p class="bluebox" id="box-not-present" style="display:none"> + You don't have a wallet installed yet. + </p> + </div> <!-- /col-lg-12 --> + </div> <!-- /row --> + + <div class="row"> + <div class="col-lg-12"> + Install the wallet for your browser below, then check out the + <a href="https://demo.taler.net">demonstration</a>. + </div> + </div> <!-- /row --> + + <div class="row"> + <div class="col-lg-6"> + <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> + is required, but it appears you don't have it installed. + </p> + <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> + <div id="inline-install-chrome"> + <button onclick="installWallet()" id="install-button"> + Install wallet + </button> + <noscript> + <em style="color:darkred;">JavaScript is disabled, installation won't work.</em> + </noscript> + <div id="install-result"></div> </div> - </div> <!-- /row --> - - <div class="row"> - <div class="col-lg-6"> - <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> - is required, but it appears you don't have it installed. - </p> - <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> - <div id="inline-install-chrome"> - <button onclick="installWallet()" id="install-button"> - Install wallet - </button> - <noscript> - <em style="color:darkred;">JavaScript is disabled, installation won't work.</em> - </noscript> - <div id="install-result"></div> - </div> - </div> <!-- /col-lg-6 --> - - <div class="col-lg-6"> - <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Mozilla Firefox 50+</a></h2> + </div> <!-- /col-lg-6 --> + + <div class="col-lg-6"> + <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Mozilla Firefox 50+</a></h2> <!-- - <h3>Firefox Beta</h3> - <ol> - <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li> - <li>On the <code>about:debugging</code> page, "Load temporary extension"</li> - </ol> - - <h3>Firefox Developer Edition</h3> - <p>Either from the <code>about:debugging</code> page like above, or:</p> - <ol> - <li>On the <code>about:config</code> page set <code>xpinstall.signatures.required</code> to <code>false</code></li> - <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install the wallet</a></li> - </ol> + <h3>Firefox Beta</h3> + <ol> + <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li> + <li>On the <code>about:debugging</code> page, "Load temporary extension"</li> + </ol> + + <h3>Firefox Developer Edition</h3> + <p>Either from the <code>about:debugging</code> page like above, or:</p> + <ol> + <li>On the <code>about:config</code> page set <code>xpinstall.signatures.required</code> to <code>false</code></li> + <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install the wallet</a></li> + </ol> --> - </div> <!-- /col-lg-6 --> - - <div class="col-lg-6"> - <h2>Opera 36+</h2> + </div> <!-- /col-lg-6 --> - <ol> - <li><a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">Install Download Chrome Extension</a></li> - <li><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler</a> from the Chrome Web Store</li> - </ol> - </div> <!-- /col-lg-6 --> + <div class="col-lg-6"> + <h2>Opera 36+</h2> - </div> <!-- /row --> + <ol> + <li><a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">Install Download Chrome Extension</a></li> + <li><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler</a> from the Chrome Web Store</li> + </ol> + </div> <!-- /col-lg-6 --> - <div class="row"> + </div> <!-- /row --> - <div class="col-lg-6"> - <h2>Other browsers</h2> - <p>Wallets for other browsers will be provided in the near future.</p> - </div> <!-- /col-lg-6 --> + <div class="row"> - </div> <!-- /row --> + <div class="col-lg-6"> + <h2>Other browsers</h2> + <p>Wallets for other browsers will be provided in the near future.</p> + </div> <!-- /col-lg-6 --> - {% include "common/footer.j2.inc" %} - </div> <!-- /container --> - </body> -</html> + </div> <!-- /row --> + </div> <!-- /container --> +{% endblock body_content %} |
