Merge branch 'master' of git.taler.net:taler-ops-www

1 files changed, 79 insertions, 53 deletions

diff --git a/template/fees.html.j2 b/template/fees.html.j2
index 59312f0..29830c9 100644
--- a/template/fees.html.j2
+++ b/template/fees.html.j2
@@ -4,32 +4,59 @@
   name="description"
   content="{% trans %}Information about the fees Taler does, and does not collect.{% endtrans %}"
 />
-{# <meta name="author" content="" /> #} {% endblock %} {# FIXME: Holy f***ing
-sh** this needs to be restructured - I'm not even going to try to do this as of
-right now. #} {% block body_content %}
+{# <meta name="author" content="" /> #}
+{% endblock %}
+{% block body_content %}
 <main id="maincontent">
-  <section class="hero">
+  <section>
+    <h2>{% trans %}Wire transfer fee{% endtrans %}</h2>
+    <div class="toggle-content">
+      <p>
+        {% trans %}
+        A <b>wire fee</b> of <b>0.1&nbsp;CHF</b> is charged on an
+        outgoing wire transfer when Taler is used to deposit funds into a bank
+        account. Merchants are encouraged to allow Taler to delay and then
+        aggregate many small payments into a single collective wire transfer to
+        minimize wire transfer fees. For example, by configuring a
+        <b>wire deadline</b> of one week, all payments within a week could be
+        aggregated into a single wire transfer, and thus only be paying the wire
+        transfer fee once. The fee is simply subtracted from the total amount
+        wired.
+        {% endtrans %}
+      </p>
+    </div>
+  </section>
+  <section>
     <h2>{% trans %}Deposit fees{% endtrans %}</h2>
-    <p>
-      {% trans %} Withdrawing 5&nbsp;CHF creates electronic coins with
-      denominations of 0.04&nbsp;CHF, 0.16&nbsp;CHF, 0.32&nbsp;CHF,
-      0.64&nbsp;CHF, 1.28&nbsp;CHF, and 2.56&nbsp;CHF. Paying 3.23&nbsp;CHF
-      might then use the 0.04&nbsp;CHF, 0.64&nbsp;CHF and 2.56&nbsp;CHF coins,
-      resulting in a total of 3.24&nbsp;CHF with 0.01&nbsp;CHF returned as
-      change. {% endtrans %}
-    </p>
-    <p>
-      This matters, as the <b>deposit fees</b> charged by Taler payment
-      providers depend on the electronic coins used in the transaction.
-      Merchants can offer to pay deposit fees up to a specified limit; customers
-      have to pay deposit fees that exceed what the merchant is willing to
-      cover. Taler wallets inform customers about applicable deposit fees for
-      every transaction. The following table shows the deposit fee structure
-      used by Taler Operations:
-    </p>
-    <table
-      class="border-spacing-2 border-separate border border-slate-500 rounded-3xl bg-slate-50 border-opacity-50"
-    >
+    <div class="toggle-content">
+      <p>
+        {% trans %}
+        Withdrawing 5&nbsp;CHF creates electronic coins with
+        denominations of 0.04&nbsp;CHF, 0.16&nbsp;CHF, 0.32&nbsp;CHF,
+        0.64&nbsp;CHF, 1.28&nbsp;CHF, and 2.56&nbsp;CHF. Paying 3.23&nbsp;CHF
+        might then use the 0.04&nbsp;CHF, 0.64&nbsp;CHF and 2.56&nbsp;CHF coins,
+        resulting in a total of 3.24&nbsp;CHF with 0.01&nbsp;CHF returned as
+        change.
+        {% endtrans %}
+      </p>
+      <p>
+        {% trans %}
+        The <b>deposit fees</b> charged by Taler payment
+        providers depend on the electronic coins used in the transaction.
+        Merchants can offer to pay deposit fees up to a specified limit; customers
+        have to pay deposit fees that exceed what the merchant is willing to
+        cover. Taler wallets inform customers about applicable deposit fees they
+        have to pay before every transaction.
+        {% endtrans %}
+      </p>
+      <p>
+        {% trans %}
+        The following table shows the deposit fee structure used by Taler Operations:
+        {% endtrans %}
+      </p>
+      <table
+        class="border-spacing-2 border-separate border border-slate-500 rounded-3xl bg-slate-50 border-opacity-50"
+      >
       <tr>
         <th class="text-left p-2 bg-slate-200 bg-opacity-60 rounded-2xl">
           {% trans %}Coin denomination{% endtrans %}
@@ -62,59 +89,58 @@ right now. #} {% block body_content %}
           0.0010&nbsp;CHF
         </td>
       </tr>
-    </table>
-    <br />
+      </table>
+      <br />
+      <p>
+        {% trans %}
+        Merchants can set the merchant backend if they want to cover
+        customary fees which over over-approximate typical deposit
+        and wire fees, ensuring that customers virtually never have
+        to pay deposit fees. The following curve shows the customary
+        fees for different net transaction amounts.
+        {% endtrans %}
+      </p>
+      <img alt="Customary fees for different net amounts" style="width:400px" src="{{ url_static('images/stefan.svg') }}">
+    </div>
   </section>
 
   <section class="toggleable">
-    <div class="title">{% trans %}Bounce fee{% endtrans %}</div>
+    <h2>{% trans %}Bounce fee{% endtrans %}</h2>
     <div class="toggle-content">
       <p>
-        {% trans %} A <b>bounce fee</b> of <b>0.1&nbsp;CHF</b> is applied to
+        {% trans %}
+        A <b>bounce fee</b> of <b>0.1&nbsp;CHF</b> is applied to
         wire transfers that return funds to customers when either the Taler
         wallet did not withdraw the amount after <b>4 weeks</b>, or immediately
         if a wire transfer subject was used that is missing the required code to
         associate a wallet with the wire transfer. The fee is deducted from the
-        amount transferred back to the original account. {% endtrans %}
+        amount transferred back to the original account.
+        {% endtrans %}
       </p>
       <p>
-        {% trans %} Payers should be careful when entering the wire transfer
+        {% trans %}
+        Payers should be careful when entering the wire transfer
         subject, and ensure that their wallet is online within a month of
-        initiating the withdrawal to avoid paying bounce fees. {% endtrans %}
+        initiating the withdrawal to avoid paying bounce fees.
+        {% endtrans %}
       </p>
     </div>
   </section>
 
   <div class="toggleable">
-    <div class="title">Wire transfer fee</div>
-    <div class="toggle-content">
-      <p>
-        {% trans %} A <b>wire fee</b> of <b>0.1&nbsp;CHF</b> is charged on an
-        outgoing wire transfer when Taler is used to deposit funds into a bank
-        account. Merchants are encouraged to allow Taler to delay and then
-        aggregate many small payments into a single collective wire transfer to
-        minimize wire transfer fees. For example, by configuring a
-        <b>wire deadline</b> of one week, all payments within a week could be
-        aggregated into a single wire transfer, and thus only be paying the wire
-        transfer fee once. The fee is simply subtracted from the total amount
-        wired. {% endtrans %}
-      </p>
-    </div>
-  </div>
-
-  <div class="toggleable">
-    <div class="title">Possible loss of e-money due to expiration</div>
+    <h2>{% trans %}Possible loss of e-money due to expiration{% endtrans %}</h2>
     <div class="toggle-content">
       <p>
-        {% trans %} Taler eCHF is issued with a <b>1&nbsp;year</b> validity
+        {% trans %}
+        Taler eCHF is issued with a <b>1&nbsp;year</b> validity
         period. One month before the expiration date, you wallet should
         automatically exchange any eCHF that are about to expire for new eCHF
         with an extended validity period. However, if your wallet is offline for
         an extended period of time, it may be unable to do so. Ensure your
-        wallet is regularly online to avoid loosing money due to expiration! {%
-        endtrans %}
+        wallet is regularly online to avoid loosing money due to expiration!
+        {% endtrans %}
       </p>
     </div>
-  </div>
+  </section>
 </main>
 {% endblock body_content %}