Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Update announcement #4229

Merged
merged 4 commits into from
Dec 13, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update announcement: new Terms!
chadwhitacre committed Dec 13, 2016

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8e0e9c1ecd37946deb619d2b78fcd348810ef8a6
23 changes: 3 additions & 20 deletions templates/base.html
Original file line number Diff line number Diff line change
@@ -66,36 +66,19 @@ <h1><a href="/"><img src="{{ website.asset('gratipay.svg') }}"
{% block banner %}{% if banner %}<h1>{{ banner }}</h1>{% endif %}{% endblock %}
</div>

{% if request.path.raw != '/1.0-payout' %}
{% if not user.participant or user.participant.status_of_1_0_payout == 'pending-application' %}
<table id="notice">
<tr>
<td>&#x2605;</td>
<td>{{ _( "{nowrap}{a}1.0 payouts{_a} are{_nowrap} {nowrap}available {a2}indefinitely{_a}{_nowrap}."
<td>{{ _( "{nowrap}Our new {a}Terms of Service{_a}{_nowrap} {nowrap}make it {a2}easier to join Gratipay{_a}{_nowrap}."
, nowrap='<span class="nowrap">'|safe
, _nowrap='</span>'|safe
, a='<a href="/1.0-payout">'|safe
, a2='<a href="https://medium.com/gratipay-blog/39c07bd031b">'|safe
, a='<a href="/about/policies/terms-of-service">'|safe
, a2='<a href="https://gratipay.news/from-teams-to-projects-45c46718507b">'|safe
, _a='</a>'|safe
) }}</td>
<td>&#x2605;</td>
</tr>
</table>
{% elif user.participant and user.participant.status_of_1_0_payout in ('pending-review', 'pending-payout') %}
<table id="notice">
<tr>
<td>&#x2605;</td>
<td>{{ _( "{nowrap}Check the status of your{_nowrap} {a}1.0 payout application{_a}."
, nowrap='<span class="nowrap">'|safe
, _nowrap='</span>'|safe
, a='<a href="/1.0-payout">'|safe
, _a='</a>'|safe
) }}</td>
<td>&#x2605;</td>
</tr>
</table>
{% endif %}
{% endif %}

<div id="main">
{% block main %}
2 changes: 1 addition & 1 deletion tests/py/test_notifications.py
Original file line number Diff line number Diff line change
@@ -27,4 +27,4 @@ def test_remove_notification(self):
assert alice.notifications == ["abcd", "bcde"]

def test_blog_announcement(self):
assert 'blog/39c07bd031b">indefinitely' in self.client.GET('/').body
assert 'projects-45c46718507b">easier' in self.client.GET('/').body