diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-13 14:54:16 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-13 14:54:16 +0100 |
commit | b78146658710310370db633eff0b421378f0c67a (patch) | |
tree | 681127ce6a4292798b3147212722e85853d53f2f | |
parent | 844073c2e3ad972c07a01b79362f6f1c82f54728 (diff) | |
download | www-b78146658710310370db633eff0b421378f0c67a.tar.gz www-b78146658710310370db633eff0b421378f0c67a.zip |
revising index and citizen's pages based on feedback from Marcello and Sva
-rw-r--r-- | citizens.html.j2 | 72 | ||||
-rw-r--r-- | index.html.j2 | 27 | ||||
-rw-r--r-- | merchants.html.j2 | 4 |
3 files changed, 56 insertions, 47 deletions
diff --git a/citizens.html.j2 b/citizens.html.j2 index 024bdc41..af3f0e6c 100644 --- a/citizens.html.j2 +++ b/citizens.html.j2 | |||
@@ -22,7 +22,7 @@ | |||
22 | <!-- Example row of columns --> | 22 | <!-- Example row of columns --> |
23 | <div class="row"> | 23 | <div class="row"> |
24 | <div class="col-lg-6"> | 24 | <div class="col-lg-6"> |
25 | <h3>{{ _("Security") }}</h3> | 25 | <h3>{{ _("Secure") }}</h3> |
26 | 26 | ||
27 | <p>{{ _("Taler uses modern cryptography, ensuring that there | 27 | <p>{{ _("Taler uses modern cryptography, ensuring that there |
28 | is no counterfeit. Your digital wallet is safer | 28 | is no counterfeit. Your digital wallet is safer |
@@ -34,20 +34,20 @@ | |||
34 | 34 | ||
35 | </div> | 35 | </div> |
36 | <div class="col-lg-6"> | 36 | <div class="col-lg-6"> |
37 | <h3>{{ _("Privacy") }}</h3> | 37 | <h3>{{ _("Private") }}</h3> |
38 | 38 | ||
39 | <p>{{ _("Your transactions are private, neither the exchange | 39 | <p>{{ _("Your transactions are private, neither the payment |
40 | nor merchant needs to learn your identity. There is | 40 | service provider nor merchant needs to learn your |
41 | no need to give out credit card numbers or other | 41 | identity. There is no need to give out credit card |
42 | sensitive information. The merchant will only be | 42 | numbers or other sensitive information. The merchant |
43 | able to do exactly the transaction you agreed to.") | 43 | will only be able to do exactly the transaction you |
44 | }}</p> | 44 | agreed to.") }}</p> |
45 | 45 | ||
46 | </div> | 46 | </div> |
47 | </div> | 47 | </div> |
48 | <div class="row"> | 48 | <div class="row"> |
49 | <div class="col-lg-6"> | 49 | <div class="col-lg-6"> |
50 | <h3>{{ _("Convenience") }}</h3> | 50 | <h3>{{ _("Convenient") }}</h3> |
51 | 51 | ||
52 | <p>{{ _("You will be able to withdraw money to replenish the | 52 | <p>{{ _("You will be able to withdraw money to replenish the |
53 | digital coins in your wallet using your credit card | 53 | digital coins in your wallet using your credit card |
@@ -58,7 +58,7 @@ | |||
58 | 58 | ||
59 | </div> | 59 | </div> |
60 | <div class="col-lg-6"> | 60 | <div class="col-lg-6"> |
61 | <h3>{{ _("Stability") }}</h3> | 61 | <h3>{{ _("Stable") }}</h3> |
62 | 62 | ||
63 | <p>{{ _("Coins in your digital wallet will be of the same | 63 | <p>{{ _("Coins in your digital wallet will be of the same |
64 | denomination as the cash in your physical wallet. | 64 | denomination as the cash in your physical wallet. |
@@ -104,30 +104,40 @@ | |||
104 | 104 | ||
105 | <p>{{ _("Customers interact with the Taler system using | 105 | <p>{{ _("Customers interact with the Taler system using |
106 | the Taler wallet:") }}</p> | 106 | the Taler wallet:") }}</p> |
107 | |||
107 | <ul> | 108 | <ul> |
108 | <li>{{ _("To <b>withdraw</b> electronic coins, the customer transfers funds | 109 | |
109 | from his bank account to the Taler exchange. The wire | 110 | <li>{{ _("To <b>withdraw</b> electronic coins, the customer |
110 | transfer subject must match a code generated by the customer's | 111 | transfers funds from his bank account to the Taler |
111 | wallet. After the wire transfer is complete, the wallet will | 112 | payment service provider (the exchange). The wire |
112 | automatically withdraw the coins.") }}</li> | 113 | transfer subject must match a code identifying the |
113 | 114 | customer's wallet. After the wire transfer is | |
114 | <li>{{ _("To <b>spend</b> electronic coins, a merchant must cause the wallet | 115 | complete, the wallet will automatically withdraw the |
115 | to display a proposal and ask for one-click confirmation. | 116 | coins from the exchange.") }}</li> |
116 | Payment is then instant. | 117 | |
117 | Transaction histories and digitally signed contracts can be | 118 | <li>{{ _("To <b>spend</b> electronic coins, a merchant must |
118 | preserved by the wallet.") }}</li> | 119 | cause the wallet to display a proposal for some |
120 | purchase. The wallet will ask the customer for | ||
121 | one-click confirmation. Payment is then instant. | ||
122 | Transaction histories and digitally signed contracts | ||
123 | can be preserved by the wallet.") }}</li> | ||
119 | 124 | ||
120 | <li>{{ _("The customer can use the wallet to <b>review</b> his | 125 | <li>{{ _("The customer can use the wallet to <b>review</b> his |
121 | balance. The wallet can contain different currencies, | 126 | balance. The wallet can contain different |
122 | and may be shared across devices. Customers can make | 127 | currencies, and may be shared across |
123 | backups of the wallet to secure its contents against | 128 | devices. Customers can make backups of the wallet to |
124 | hardware failures.") }}</li> | 129 | secure its contents against hardware failures.") |
125 | </ul> | 130 | }}</li> |
126 | </div> | ||
127 | <div class="col-lg-6"> | ||
128 | <img src="{{ url('images/citizen.svg') }}" alt="customer perspective" style="float: right; margin: 5px 5px 5px 5px;" width="100%"> | ||
129 | </div> | ||
130 | 131 | ||
132 | </ul> | ||
133 | </div> | ||
131 | 134 | ||
132 | </div> <!-- /container --> | 135 | <div class="col-lg-6"> |
136 | <img src="{{ url('images/citizen.svg') }}" | ||
137 | alt="customer perspective" | ||
138 | style="float: right; margin: 5px 5px 5px 5px;" width="100%"> | ||
139 | </div> | ||
140 | |||
141 | </div> | ||
142 | <!-- /container --> | ||
133 | {% endblock body_content %} | 143 | {% endblock body_content %} |
diff --git a/index.html.j2 b/index.html.j2 index aa171dce..293a5d9d 100644 --- a/index.html.j2 +++ b/index.html.j2 | |||
@@ -7,7 +7,7 @@ | |||
7 | </div> | 7 | </div> |
8 | 8 | ||
9 | <div class="container text-center"> | 9 | <div class="container text-center"> |
10 | <h1>{{ _("Independent One-Click Payments!") }}</h1> | 10 | <h1>{{ _("One-Click Cash Payments!") }}</h1> |
11 | <p> | 11 | <p> |
12 | {% trans %} | 12 | {% trans %} |
13 | Taler is an electronic payment system under | 13 | Taler is an electronic payment system under |
@@ -40,18 +40,17 @@ | |||
40 | 40 | ||
41 | <p> | 41 | <p> |
42 | {% trans %} | 42 | {% trans %} |
43 | Taler does not introduce a new currency with | 43 | Taler does not introduce a new currency. Taler |
44 | fluctuation risks, and instead uses a digital | 44 | uses a digital wallet storing coins and payment service |
45 | wallet holding coins in reserve. Taler's | 45 | providers with escrow accounts in existing currencies. |
46 | cryptographic coins correspond to existing | 46 | Thus, Taler's cryptographic coins correspond to existing |
47 | currencies, such as US Dollars, Euros or even | 47 | currencies, such as US Dollars, Euros or even Bitcoins. |
48 | Bitcoins. | ||
49 | {% endtrans %} | 48 | {% endtrans %} |
50 | </p> | 49 | </p> |
51 | 50 | ||
52 | </div> | 51 | </div> |
53 | <div class="col-lg-4"> | 52 | <div class="col-lg-4"> |
54 | <h3>{{ _("Security-focused") }}</h3> | 53 | <h3>{{ _("Secure") }}</h3> |
55 | 54 | ||
56 | <p> | 55 | <p> |
57 | {% trans %} | 56 | {% trans %} |
@@ -70,7 +69,7 @@ | |||
70 | 69 | ||
71 | <p> | 70 | <p> |
72 | {% trans %} | 71 | {% trans %} |
73 | When using Taler, merchants cannot hide their income from tax | 72 | When using Taler, merchant's revenue is transparent for tax |
74 | collection authorities. Unlike cash and most digital currencies, | 73 | collection authorities. Unlike cash and most digital currencies, |
75 | Taler helps prevent black markets. Taler is not suitable for | 74 | Taler helps prevent black markets. Taler is not suitable for |
76 | illegal activities. | 75 | illegal activities. |
@@ -79,7 +78,7 @@ | |||
79 | 78 | ||
80 | </div> | 79 | </div> |
81 | <div class="col-lg-4"> | 80 | <div class="col-lg-4"> |
82 | <h3>{{ _("Privacy-friendly") }}</h3> | 81 | <h3>{{ _("Private") }}</h3> |
83 | <p> | 82 | <p> |
84 | {% trans %} | 83 | {% trans %} |
85 | When you pay with Taler, your identity does not | 84 | When you pay with Taler, your identity does not |
@@ -118,7 +117,7 @@ | |||
118 | on their device. Before the first payment, the wallet's balance must | 117 | on their device. Before the first payment, the wallet's balance must |
119 | be charged in the desired currency by some other means of payment.</p> | 118 | be charged in the desired currency by some other means of payment.</p> |
120 | <p>Once the wallet is charged, payments on websites take only one click, | 119 | <p>Once the wallet is charged, payments on websites take only one click, |
121 | are never falsely rejected by fraud detection and do not post any risk | 120 | are never falsely rejected by fraud detection and do not pose any risk |
122 | of phishing or identity theft.</p> | 121 | of phishing or identity theft.</p> |
123 | {% endtrans %} | 122 | {% endtrans %} |
124 | </div> | 123 | </div> |
@@ -126,10 +125,10 @@ | |||
126 | <h2>{{ _("Receiving payments with Taler") }}</h2> | 125 | <h2>{{ _("Receiving payments with Taler") }}</h2> |
127 | {% trans %} | 126 | {% trans %} |
128 | <p>To receive Taler payments, a merchant needs a bank account | 127 | <p>To receive Taler payments, a merchant needs a bank account |
129 | in the desired currency. We provide | 128 | in the desired currency. We provide supporting software |
130 | SDKs in various languages to makes the integration painless. | 129 | in various programming languages to make the integration painless. |
131 | The merchant's backend for Taler transaction processing can run | 130 | The merchant's backend for Taler transaction processing can run |
132 | on the merchant's premises or hosted.</p> | 131 | on the merchant's premises or be hosted by a third party.</p> |
133 | {% endtrans %} | 132 | {% endtrans %} |
134 | </div> | 133 | </div> |
135 | </div> | 134 | </div> |
diff --git a/merchants.html.j2 b/merchants.html.j2 index f5c9b422..e2b17947 100644 --- a/merchants.html.j2 +++ b/merchants.html.j2 | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | </div> | 45 | </div> |
46 | <div class="col-lg-4"> | 46 | <div class="col-lg-4"> |
47 | <h3>{{ _("Free Software") }}</h3> | 47 | <h3>{{ _("Free") }}</h3> |
48 | 48 | ||
49 | <p>{{ _("Taler is free software, and you can use the | 49 | <p>{{ _("Taler is free software, and you can use the |
50 | liberally-licensed reference code as a starting | 50 | liberally-licensed reference code as a starting |
@@ -58,7 +58,7 @@ | |||
58 | </div> | 58 | </div> |
59 | <div class="row"> | 59 | <div class="row"> |
60 | <div class="col-lg-4"> | 60 | <div class="col-lg-4"> |
61 | <h3>{{ _("Low Fees") }}</h3> | 61 | <h3>{{ _("Cheap") }}</h3> |
62 | 62 | ||
63 | <p>{{ _("Taler is designed to minimize the work the exchange | 63 | <p>{{ _("Taler is designed to minimize the work the exchange |
64 | needs to perform. Combined with Taler's strong | 64 | needs to perform. Combined with Taler's strong |