aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-03-06 15:02:35 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-03-06 15:02:35 +0100
commit4b0f33c9831b09b7f35d5108e8929902e25ca70d (patch)
tree3ab5ffd8e4cc918e888e084c1039634e376dcc73
parentf2f208f9455f9acfdc0eefc267c521754907624d (diff)
downloadwww-4b0f33c9831b09b7f35d5108e8929902e25ca70d.tar.gz
www-4b0f33c9831b09b7f35d5108e8929902e25ca70d.zip
merchant green box and wallet site fixes
Diffstat
-rw-r--r--citizens.html.j229
-rw-r--r--common/base.j23
-rw-r--r--taler-big-accent.svg9
-rw-r--r--wallet.html.j2284
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 @@
70 70
71 </div> 71 </div>
72 </div> 72 </div>
73</div>
74
75<div class="contianer-fluid c_acronym">
76<div class="container">
77 <div class="row">
78 <div class="col-lg-6">
79 <h2>{{ _("Wallet Browser Extension") }}</h2>
80 <p>
81 {% trans %}
82 We currently provide a <a href="wallet.html">wallet browser extension</a> for Chromium, Chrome, Firefox, Opera
83 and Edge. Wallets for mobile phones and other platforms will be available in the future.
84 {% endtrans %}
85 </p>
86 </div>
87 <div class="col-lg-6">
88 <h2>{{ _("Taler Demo") }}</h2>
89 <p>
90 {% trans %}
91 You can see how Taler works in practice by visiting our <a href="https://demo.taler.net">demo page</a>.
92 {% endtrans %}
93 </p>
94 </div>
95 </div>
96</div>
97</div>
98
99
100<div class="container">
101
73 <div class="col-lg-12"> 102 <div class="col-lg-12">
74 <h2 id="overview">{{ _("Taler as seen by customers") }}</h2> 103 <h2 id="overview">{{ _("Taler as seen by customers") }}</h2>
75 104
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 @@
4 <meta charset="UTF-8"/> 4 <meta charset="UTF-8"/>
5 <title>{{ _("GNU Taler") }}</title> 5 <title>{{ _("GNU Taler") }}</title>
6 <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" /> 6 <meta name="description" content="{{ _('Taxable Anonymous Libre Electronic Reserves') }}" />
7 {% include "common/header.j2.inc" %} 7 {% include "common/header.j2.inc" %}
8 {% block head_content %}{% endblock %}
8 </head> 9 </head>
9 <body id="mybody"> 10 <body id="mybody">
10 {% include "common/navigation.j2.inc" %} 11 {% 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 @@
7 7
8 <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" /> 8 <circle cx="0" cy="0" r="40" stroke="black" stroke-width="7.5" fill="none" />
9 <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" /> 9 <circle cx="0" cy="0" r="45" stroke="black" stroke-width="1" fill="none" />
10 <rect x="-20" y="-17" width="40" height="4"/> 10 <!-- big horizontal T stroke -->
11 <rect x="-20" y="-12" width="40" height="1"/> 11 <rect x="-20" y="-14" width="40" height="4"/>
12 <rect x="-4" y="-17" width="8" height="54"/> 12 <rect x="-20" y="-9" width="40" height="1"/>
13 <rect x="-4" y="-14" width="8" height="54"/>
13 14
14 15
15 16
16 <text font-family="Verdana" font-weight="bold" font-size="8" color="red" x="0" y="-20" text-anchor="middle" letter-spacing="0.25em"> 17 <text font-family="Verdana" font-weight="bold" font-size="9" color="red" x="0" y="-20" text-anchor="middle" letter-spacing="0.20em">
17 <tspan class="ts1">&#10092;</tspan>Tale<tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan> 18 <tspan class="ts1">&#10092;</tspan>Tale<tspan class="ts2">r<tspan class="ts1">&#10093;</tspan></tspan>
18 </text> 19 </text>
19 20
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 @@
1<!DOCTYPE html> 1{% extends "common/base.j2" %}
2<html lang="{{ _('en') }}"> 2
3 <head profile="http://www.w3.org/2005/10/profile"> 3{% block head_content %}
4 <meta charset="UTF-8"/> 4<link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" />
5 <title>{{ _("GNU Taler") }} - {{ _("Wallet") }}</title> 5<script src="web-common/taler-wallet-lib.js" type="text/javascript"></script>
6 <meta name="description" content=""/> 6
7 {% include "common/header.j2.inc" %} 7<script type="application/javascript">
8 8/*
9 <link rel="chrome-webstore-item" href="https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc" /> 9 @licstart The following is the entire license notice for the
10 <script src="web-common/taler-wallet-lib.js" type="text/javascript"></script> 10 JavaScript code in this page.
11 11
12 <script type="application/javascript"> 12 Copyright (C) 2015 GNUnet e.V.
13 /* 13
14 @licstart The following is the entire license notice for the 14 The JavaScript code in this page is free software: you can
15 JavaScript code in this page. 15 redistribute it and/or modify it under the terms of the GNU
16 16 Lesser General Public License (GNU LGPL) as published by the Free Software
17 Copyright (C) 2015 GNUnet e.V. 17 Foundation, either version 2.1 of the License, or (at your option)
18 18 any later version. The code is distributed WITHOUT ANY WARRANTY;
19 The JavaScript code in this page is free software: you can 19 without even the implied warranty of MERCHANTABILITY or FITNESS
20 redistribute it and/or modify it under the terms of the GNU 20 FOR A PARTICULAR PURPOSE. See the GNU LGPL for more details.
21 Lesser General Public License (GNU LGPL) as published by the Free Software 21
22 Foundation, either version 2.1 of the License, or (at your option) 22 As additional permission under GNU LGPL version 2.1 section 7, you
23 any later version. The code is distributed WITHOUT ANY WARRANTY; 23 may distribute non-source (e.g., minimized or compacted) forms of
24 without even the implied warranty of MERCHANTABILITY or FITNESS 24 that code without the copy of the GNU LGPL normally required by
25 FOR A PARTICULAR PURPOSE. See the GNU LGPL for more details. 25 section 4, provided you include this license notice and a URL
26 26 through which recipients can access the Corresponding Source.
27 As additional permission under GNU LGPL version 2.1 section 7, you 27
28 may distribute non-source (e.g., minimized or compacted) forms of 28 @licend The above is the entire license notice
29 that code without the copy of the GNU LGPL normally required by 29 for the JavaScript code in this page.
30 section 4, provided you include this license notice and a URL 30*/
31 through which recipients can access the Corresponding Source.
32
33 @licend The above is the entire license notice
34 for the JavaScript code in this page.
35 */
36 31
37var chrome_min_version = '49'; 32var chrome_min_version = '49';
38 33
@@ -78,123 +73,122 @@ function onLoad() {
78} 73}
79 74
80document.addEventListener('DOMContentLoaded', onLoad); 75document.addEventListener('DOMContentLoaded', onLoad);
81 </script> 76</script>
82 77
83 <style type="text/css"> 78<style type="text/css">
84 .greenbox { 79 .greenbox {
85 background-color: #5EFF64; 80 background-color: #5EFF64;
86 border: solid; 81 border: solid;
87 border-radius: 5px; 82 border-radius: 5px;
88 padding: 0.5em; 83 padding: 0.5em;
89 } 84 }
90 .bluebox { 85 .bluebox {
91 background-color: #C2C6FF; 86 background-color: #C2C6FF;
92 border: solid; 87 border: solid;
93 border-radius: 5px; 88 border-radius: 5px;
94 padding: 0.5em; 89 padding: 0.5em;
95 } 90 }
96 .error { 91 .error {
97 font-style: italic; 92 font-style: italic;
98 display: none; 93 display: none;
99 } 94 }
100 #install-result { 95 #install-result {
101 font-weight: bold; 96 font-weight: bold;
102 } 97 }
103 98
104 main ul li { 99 main ul li {
105 margin-bottom: 1em; 100 margin-bottom: 1em;
106 } 101 }
107 </style> 102</style>
108 </head> 103{% endblock head_content %}
109 104
110 <body> 105{% block body_content %}
111 <div class="container"> 106 <!-- Jumbotron -->
112 {% include "common/navigation.j2.inc" %} 107 <div class="jumbotron">
113 <!-- Jumbotron --> 108 <div class="text-center">
114 <div class="jumbotron"> 109 <h1 lang="en">Taler Wallet</h1>
115 <h1 lang="en">Taler Wallet</h1>
116 </div> 110 </div>
117 111 </div>
118 <div class="row"> 112
119 <div class="col-lg-12"> 113 <div class="container">
120 <p class="greenbox" id="box-present" style="display:none"> 114
121 Congratulations, you have installed the Taler wallet. 115 <div class="row">
122 Check out the <a href="https://demo.taler.net/">demo</a>. 116 <div class="col-lg-12">
123 </p> 117 <p class="greenbox" id="box-present" style="display:none">
124 <p class="bluebox" id="box-not-present" style="display:none"> 118 Congratulations, you have installed the Taler wallet.
125 You don't have a wallet installed yet. 119 Check out the <a href="https://demo.taler.net/">demo</a>.
126 </p> 120 </p>
127 </div> <!-- /col-lg-12 --> 121 <p class="bluebox" id="box-not-present" style="display:none">
128 </div> <!-- /row --> 122 You don't have a wallet installed yet.
129 123 </p>
130 <div class="row"> 124 </div> <!-- /col-lg-12 -->
131 <div class="col-lg-12"> 125 </div> <!-- /row -->
132 Install the wallet for your browser below, then check out the 126
133 <a href="https://demo.taler.net">demonstration</a>. 127 <div class="row">
128 <div class="col-lg-12">
129 Install the wallet for your browser below, then check out the
130 <a href="https://demo.taler.net">demonstration</a>.
131 </div>
132 </div> <!-- /row -->
133
134 <div class="row">
135 <div class="col-lg-6">
136 <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Google Chrome / Chromium 49+</a></h2>
137
138 <p id="error-chrome" class="error">
139 <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a>
140 is required, but it appears you don't have it installed.
141 </p>
142 <p id="error-chrome-version" class="error">
143 <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a>
144 version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.</p>
145 <div id="inline-install-chrome">
146 <button onclick="installWallet()" id="install-button">
147 Install wallet
148 </button>
149 <noscript>
150 <em style="color:darkred;">JavaScript is disabled, installation won't work.</em>
151 </noscript>
152 <div id="install-result"></div>
134 </div> 153 </div>
135 </div> <!-- /row --> 154 </div> <!-- /col-lg-6 -->
136 155
137 <div class="row"> 156 <div class="col-lg-6">
138 <div class="col-lg-6"> 157 <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Mozilla Firefox 50+</a></h2>
139 <h2><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Google Chrome / Chromium 49+</a></h2>
140
141 <p id="error-chrome" class="error">
142 <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a>
143 is required, but it appears you don't have it installed.
144 </p>
145 <p id="error-chrome-version" class="error">
146 <a href="https://www.google.com/chrome">Google Chrome</a> or <a href="https://www.chromium.org/">Chromium</a>
147 version <span id="chrome-min-version"></span> or newer is required, but it appears you have an older version.</p>
148 <div id="inline-install-chrome">
149 <button onclick="installWallet()" id="install-button">
150 Install wallet
151 </button>
152 <noscript>
153 <em style="color:darkred;">JavaScript is disabled, installation won't work.</em>
154 </noscript>
155 <div id="install-result"></div>
156 </div>
157 </div> <!-- /col-lg-6 -->
158
159 <div class="col-lg-6">
160 <h2><a href="https://addons.mozilla.org/en-US/firefox/addon/taler-wallet/">Mozilla Firefox 50+</a></h2>
161<!-- 158<!--
162 <h3>Firefox Beta</h3> 159 <h3>Firefox Beta</h3>
163 <ol> 160 <ol>
164 <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li> 161 <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Download the wallet</a> (right click, Save Link As...)</li>
165 <li>On the <code>about:debugging</code> page, "Load temporary extension"</li> 162 <li>On the <code>about:debugging</code> page, "Load temporary extension"</li>
166 </ol> 163 </ol>
167 164
168 <h3>Firefox Developer Edition</h3> 165 <h3>Firefox Developer Edition</h3>
169 <p>Either from the <code>about:debugging</code> page like above, or:</p> 166 <p>Either from the <code>about:debugging</code> page like above, or:</p>
170 <ol> 167 <ol>
171 <li>On the <code>about:config</code> page set <code>xpinstall.signatures.required</code> to <code>false</code></li> 168 <li>On the <code>about:config</code> page set <code>xpinstall.signatures.required</code> to <code>false</code></li>
172 <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install the wallet</a></li> 169 <li><a href="/releases/taler-wallet/taler-wallet-stable.xpi">Install the wallet</a></li>
173 </ol> 170 </ol>
174--> 171-->
175 </div> <!-- /col-lg-6 --> 172 </div> <!-- /col-lg-6 -->
176
177 <div class="col-lg-6">
178 <h2>Opera 36+</h2>
179 173
180 <ol> 174 <div class="col-lg-6">
181 <li><a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">Install Download Chrome Extension</a></li> 175 <h2>Opera 36+</h2>
182 <li><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler</a> from the Chrome Web Store</li>
183 </ol>
184 </div> <!-- /col-lg-6 -->
185 176
186 </div> <!-- /row --> 177 <ol>
178 <li><a href="https://addons.opera.com/en/extensions/details/download-chrome-extension-9/">Install Download Chrome Extension</a></li>
179 <li><a href="https://chrome.google.com/webstore/detail/gnu-taler-wallet/millncjiddlpgdmkklmhfadpacifaonc">Install GNU Taler</a> from the Chrome Web Store</li>
180 </ol>
181 </div> <!-- /col-lg-6 -->
187 182
188 <div class="row"> 183 </div> <!-- /row -->
189 184
190 <div class="col-lg-6"> 185 <div class="row">
191 <h2>Other browsers</h2>
192 <p>Wallets for other browsers will be provided in the near future.</p>
193 </div> <!-- /col-lg-6 -->
194 186
195 </div> <!-- /row --> 187 <div class="col-lg-6">
188 <h2>Other browsers</h2>
189 <p>Wallets for other browsers will be provided in the near future.</p>
190 </div> <!-- /col-lg-6 -->
196 191
197 {% include "common/footer.j2.inc" %} 192 </div> <!-- /row -->
198 </div> <!-- /container --> 193 </div> <!-- /container -->
199 </body> 194{% endblock body_content %}
200</html>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 22:37:51 +0000