Merge pull request #73 from liberapay/about-2

Complete the About pages (2/2)

templates/about.html

@@ -4,7 +4,7 @@
     {% set pages = [
         ('/', _('Introduction')),
         ('/faq', _('FAQ')),
-        ('/payday', _('Payday')),
+        ('/money', _('Money')),
         ('/teams', _('Teams')),
         ('/stats', _('Stats')),
         ('/legal', _('Legal')),

www/%username/receiving/index.html.spt

@@ -36,8 +36,8 @@ teams = website.db.all("""
     <p><a class="btn btn-default" href="payout/Li4=">{{ _("Withdraw money") }}</a></p>
 {% endif %}
 
+<h2 id="teams">{{ _("Teams") }}</h2>
 {% if teams %}
-    <h2 id="teams">{{ _("Teams") }}</h2>
     {% for team in teams %}
         <h4>{{ team.username }}
             <a href="/{{ team.username }}/membership/leave?back_to={{ urlquote(request.line.uri) }}"
@@ -48,7 +48,13 @@ teams = website.db.all("""
                 Money(team.receiving, "EUR")) }}</p>
         {{ team_takes_table(team, cls='table-condensed') }}
     {% endfor %}
+{% else %}
+    <p>{{ _("You are not a member of any team.") }}</p>
 {% endif %}
+<p>
+    <a class="btn btn-default" href="/about/teams">{{ _("About teams") }}</a>
+    <a class="btn btn-default" href="/explore/teams/">{{ _("Explore teams") }}</a>
+</p>
 
 {% if participant.receiving > participant.taking %}
 {% set tip_distribution = participant.get_tip_distribution()[0] %}

www/about/money.spt

@@ -0,0 +1,51 @@
+[---]
+title = _("Money")
+[---] text/html
+{% extends "templates/about.html" %}
+{% block content %}
+<div class="row"><div class="col-md-8">
+
+<h3>{{ _("Quarantine") }}</h3>
+
+<p>{{ _(
+    "We quarantine money for {0} to protect ourselves from credit card fraud, "
+    "sorry for the inconvenience.",
+    constants.QUARANTINE
+) + ' ' + _(
+    "Concretely, you are prevented from withdrawing the quarantined money from "
+    "your Liberapay account to your bank account."
+) }}</p>
+
+<h3>{{ _("Chargebacks") }}</h3>
+
+<p>{{ _(
+    "If despite our fraud prevention efforts you receive money whose origin is "
+    "revealed to be fraudulent, it falls on you to pay it back."
+) }}</p>
+
+<h3>{{ _("Safety") }}</h3>
+
+<p>{{ _(
+    "We guarantee that the funds you put in our custody will not be lost in "
+    "case of bankruptcy, whether it affects us or a third party to whom we "
+    "have delegated the custody of the funds."
+) }}</p>
+
+<h3>{{ _("Wallets") }}</h3>
+
+<p>{{ _(
+    "A user's money is held in their wallets. We currently only support one "
+    "wallet per user, and only one currency (the euro) in that wallet."
+) }}</p>
+
+<h3>Payday</h3>
+
+<p>{{ _(
+    "Payday is when donations are actually executed. It's a program ({0}this "
+    "one{1}) that we run every Wednesday.",
+    '<a href="https://github.com/liberapay/liberapay.com/blob/master/liberapay/billing/payday.py">'|safe,
+    '</a>'|safe
+) }}</p>
+
+</div></div>
+{% endblock %}

www/about/teams.spt

@@ -27,6 +27,7 @@ title = _("Teams")
 [---] text/html
 {% extends "templates/about.html" %}
 {% block content %}
+<div class="row paragraph"><div class="col-md-8">
 
 <p>{{ _(
     "A Liberapay team coordinates donations from multiple donors to multiple "
@@ -35,10 +36,15 @@ title = _("Teams")
     "donors to donees."
 ) }}</p>
 
+<p>{{ _(
+    "Teams are for peer-to-peer donations, they can't be used by a legal "
+    "entity to distribute donations to its members."
+) }}</p>
+
 <h2>{{ _("Creating a team") }}</h2>
 
 {% if user.ANON %}
-    <p>{{ _("You need to {0}sign in{1} first.",
+    <p>{{ _("You need to {0}sign into your own account{1} first.",
             '<a href="/sign-in?back_to=%s">'|safe % urlquote(request.line.uri),
             '</a>'|safe
 ) }}</p>
@@ -48,14 +54,55 @@ title = _("Teams")
 
 <h2>{{ _("Becoming a team member") }}</h2>
 
-<p>TODO</p>
+<p>{{ _(
+    "Once you have contributed to a team's project, ask its members to invite "
+    "you. Don't forget to tell them what your username is."
+) }}</p>
 
 <h2>{{ _("Sharing the money") }}</h2>
 
-<p>TODO</p>
+<p>{{ _(
+    "Teams don't have a hierarchy, all their members are equal and set their "
+    "own take."
+) }}</p>
+
+<p>{{ _(
+    "You can change your takes from {0}your teams dashboard{1}. It contains "
+    "tables that show the nominal takes of all members for the next and "
+    "previous payday, as well as an estimate of the actual amounts of money "
+    "they'll receive in the next payday.",
+    '<a href="/about/me/receiving/#teams">'|safe,
+    '</a>'|safe
+) }}</p>
+
+<p>{{ _(
+    "The nominal takes are the raw numbers that the members input themselves, "
+    "the actual takes are computed by the system: first it sums up the nominal "
+    "takes, then it computes the percentage that each take represents, and "
+    "finally it applies those percentages to the available income."
+) }}</p>
+
+<p>{{ _(
+    "Nominal takes are throttled, they can't be raised higher than a maximum "
+    "computed based on the nominal takes at the time of the previous payday. "
+    "The exact limit is the maximum of these three values: two times the "
+    "member's take in the previous payday, 70% of the median take in the "
+    "previous payday, and the number 1."
+) }}</p>
 
 <h2>{{ _("Removing team membership") }}</h2>
 
-<p>TODO</p>
+<p>{{ _(
+    "You can leave a team from {0}your teams dashboard{1}.",
+    '<a href="/about/me/receiving/#teams">'|safe,
+    '</a>'|safe
+) }}</p>
+
+<p>{{ _(
+    "Kicking a member out of a team is not implemented yet. Please contact "
+    "support with evidence that the member needs to be kicked out and that "
+    "there is consensus on that among the other members."
+) }}</p>
 
+</div></div>
 {% endblock %}