From 4109e09c70912e22814f0bdc8d3924695d949385 Mon Sep 17 00:00:00 2001 From: Jeff Burdges Date: Wed, 13 Apr 2016 02:19:25 +0200 Subject: Avoid using the word track because it freaks people out --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d57c5c9f..d5bced70 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,7 @@

Tassabile

Imponible

Unlike BitCoin or cash payments, Taler ensures that - governments can easily track their citizen's income and thus collect + governments can learn their citizen's total income and thus collect sales, value-added or income taxes. Taler is thus a currency for the mainstream economy, and not the black market.

Anders als bei BitCoin oder Barzahlungen kann im -- cgit v1.2.3 From 63184009bf078709aee1d2f6632a71f07d392032 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 23 Apr 2016 01:59:21 +0200 Subject: wallet installation --- wallet-installation.html | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 wallet-installation.html diff --git a/wallet-installation.html b/wallet-installation.html new file mode 100644 index 00000000..fa1aad31 --- /dev/null +++ b/wallet-installation.html @@ -0,0 +1,97 @@ + + + + + Taler Demonstration Framework + + + + + + + + + + +

+ +

+ + +

Taler Demonstration Framework

+ + + +

Install the Taler wallet

from the app store for + Google + Chrome and Chromium +
via inline install: + +

+ Wallets for other browsers will be provided in the near future. +

+ Congratulations, you have installed the Taler wallet correctly. + You can now proceed with the next steps. +

+ + -- cgit v1.2.3 From f9f860b2ed9777b3a2ac06571a747a22f0098f40 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 23 Apr 2016 03:21:42 +0200 Subject: installation --- wallet-installation.html | 5 ++--- web-common | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wallet-installation.html b/wallet-installation.html index fa1aad31..e9897eae 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -2,12 +2,11 @@ - Taler Demonstration Framework + Taler Wallet Installation - - @@ -64,9 +63,9 @@ Google Chrome and Chromium -

via inline install: +

from this page:

-- cgit v1.2.3 From 1ada3dd4acb20067bfc18549bab41e04c090182c Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2016 04:41:29 +0200 Subject: install boxes --- wallet-installation.html | 68 +++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/wallet-installation.html b/wallet-installation.html index b3e7516f..bf492097 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -7,30 +7,30 @@ - + - + @@ -71,9 +78,12 @@ Wallets for other browsers will be provided in the near future.

Congratulations, you have installed the Taler wallet correctly. You can now proceed with the next steps.

+ You don't have a wallet installed yet. +

-- cgit v1.2.3 From 36bc84b04c823034911feef4ae7477a59665c3e9 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2016 04:42:27 +0200 Subject: css --- wallet-installation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallet-installation.html b/wallet-installation.html index bf492097..ae11badc 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -78,11 +78,11 @@ Wallets for other browsers will be provided in the near future.

Congratulations, you have installed the Taler wallet correctly. You can now proceed with the next steps.

You don't have a wallet installed yet.

-- cgit v1.2.3 From a03ad01f314637dbe38841da64e0e9ca5512be42 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2016 04:45:02 +0200 Subject: css --- wallet-installation.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wallet-installation.html b/wallet-installation.html index ae11badc..16384b4d 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -64,6 +64,8 @@

Install the Taler wallet

+ +

from the app store for @@ -85,5 +87,6 @@
You don't have a wallet installed yet.
+

-- cgit v1.2.3 From 8ae3721d60e9aad5c7d05479fe6f4a28e23bae9a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2016 04:46:37 +0200 Subject: copy --- wallet-installation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wallet-installation.html b/wallet-installation.html index 16384b4d..8db3d961 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -81,8 +81,8 @@ Wallets for other browsers will be provided in the near future.

- Congratulations, you have installed the Taler wallet correctly. - You can now proceed with the next steps. + Congratulations, you have installed the Taler wallet. + Check out the demo.

You don't have a wallet installed yet. -- cgit v1.2.3 From 4265311d9cc643f0682f0441cc58e1aab4b84102 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 27 Apr 2016 04:53:41 +0200 Subject: better presence detection --- wallet-installation.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wallet-installation.html b/wallet-installation.html index 8db3d961..7920fd36 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -44,6 +44,15 @@ function installWallet() { chrome.webstore.install("https://chrome.google.com/webstore/detail/millncjiddlpgdmkklmhfadpacifaonc", onSuccess, onFailure); } + + taler.onPresent(function () { + document.getElementById("box-present").style.display = "inherit"; + document.getElementById("box-not-present").style.display = "none"; + }); + taler.onAbsent(function () { + document.getElementById("box-present").style.display = "none"; + document.getElementById("box-not-present").style.display = "inherit"; + }); @@ -76,26 +106,34 @@

Install the Taler wallet

Google Chrome / Chromium

+ Google Chrome or Chromium + is required, but it appears you don't have it installed. +

+ Google Chrome or Chromium + version or newer is required, but it appears you have an older version.

from the app store for - Google - Chrome and Chromium +
+ Install from the Chrome Web Store
from this page: +
+ Install from this page + +

- Wallets for other browsers will be provided in the near future. -

+ +

Other browsers

Wallets for other browsers will be provided in the near future.

-- cgit v1.2.3 From 72c5b56b2439fa54fb3079e95dbf3390e19461be Mon Sep 17 00:00:00 2001 From: "tg(x)" <*@tg-x.net> Date: Wed, 17 Aug 2016 12:08:45 +0200 Subject: wallet install: css --- wallet-installation.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wallet-installation.html b/wallet-installation.html index 5d695255..551f97f6 100644 --- a/wallet-installation.html +++ b/wallet-installation.html @@ -99,6 +99,10 @@ #install-result { font-weight: bold; } + + main ul li { + margin-bottom: 1em; + } -- cgit v1.2.3 From d54e608b7943937e333247279e8bde0802eadc6e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 26 Aug 2016 00:10:28 +0200 Subject: adding florian --- about.html | 1 + common/header.inc | 2 +- team-images/florian-dold.jpg | Bin 0 -> 17301 bytes web-common | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 team-images/florian-dold.jpg diff --git a/about.html b/about.html index 3d39d421..f678f421 100644 --- a/about.html +++ b/about.html @@ -91,6 +91,7 @@

Florian Dold

PhD Student, Inria. Hacker.

Doktorand, Inria. Hacker.

Fouineur

diff --git a/common/header.inc b/common/header.inc index 11d92f51..560e3fdd 100644 --- a/common/header.inc +++ b/common/header.inc @@ -3,7 +3,7 @@ @licstart The following is the entire license notice for the JavaScript code in this page. - Copyright (C) 2014,2015 GNUnet e.V. + Copyright (C) 2014, 2015, 2016 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 diff --git a/team-images/florian-dold.jpg b/team-images/florian-dold.jpg new file mode 100644 index 00000000..d5ddd3b1 Binary files /dev/null and b/team-images/florian-dold.jpg differ diff --git a/web-common b/web-common index dfa82524..80f1e270 160000 --- a/web-common +++ b/web-common @@ -1 +1 @@ -Subproject commit dfa825243b718e222013d35a58b2dd8ec0ef05ac +Subproject commit 80f1e2708dbe4b19349244b611a6167b4b7a98c9 -- cgit v1.2.3 From 8921e899b300ead12f76f3c1afda2ce83d5e77ef Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 26 Aug 2016 00:12:06 +0200 Subject: fix height --- about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.html b/about.html index f678f421..db0d8386 100644 --- a/about.html +++ b/about.html @@ -91,7 +91,7 @@

Florian Dold

PhD Student, Inria. Hacker.

Doktorand, Inria. Hacker.

Fouineur

-- cgit v1.2.3