Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coming soon #813

Merged
merged 2 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 6 additions & 0 deletions modules/sponsorship.py
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,12 @@ def sponsor_renew_request_logic(user_identifier, mailer=None, reveal_private_dat
else:
info = '%s, so cannot send email' % reason
else:
if current.globalenv['is_testing']:
if info:
info += " (NB: set is_testing to False to send to the user's email address)"
else:
info = "set is_testing to False to send to the user's email address"

# Should send to the admin address if is_testing == True
mail.send(**mailargs)
elif reveal_private_data:
Expand Down
3 changes: 1 addition & 2 deletions views/default/sponsor_renew.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ <h1>This is the private sponsorship renewal page for {{=username}}</h1>
</p>

<p>
Leaf sponsorships usually last for 4 years at which point they need to be renewed, we have given most sponsors extra time
so that they don't have to renew during the height of the COVID crisis. This page will help you to see all your sponsorships
Leaf sponsorships usually last for 4 years at which point they need to be renewed. This page will help you to see all your sponsorships
and renew those that are expiring soon. Scroll down and select what you want to renew, or to do this quickly
</p>

Expand Down
7 changes: 3 additions & 4 deletions views/default/sponsor_user_manage.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{block masthead}}
<div class="home-heading uk-text-center uk-padding-small">
<h1>Manage your sponsored leaves</h1>
<em>Coming soon... share a page listing all your sponsored leaves and have one easy place to go for renewing all your sponsorships</em>
<em>A page to list all your sponsored leaves: for sharing with friends and renewing leaves</em>
</div>
{{end block}}

Expand All @@ -14,12 +14,11 @@ <h1>Manage your sponsored leaves</h1>
<h3>Thank you for sponsoring a leaf on our tree of life</h3>
<p>OneZoom is a registered non-profit in the UK, all our products are available for free and with no advertising. Your donation will help us in our aim to provide easy access to scientific knowledge about biodiversity and evolution, and raise awareness about the variety of life on earth together with the need to conserve it. </p>

<p>To thank you for your donation, we put your name (or the name of a nominated friend or relative) on a leaf of your choice on our {{=A('tree of life explorer', _href=URL('default','life'))}}. Sponsorship is for four years and that after this point you would need to make another donation to renew your sponsorship if you want it to remain on the tree. </p>
<p>To thank you for your donation, we put your name (or the name of a nominated friend or relative) on a leaf of your choice on our {{=A('tree of life explorer', _href=URL('default','life'))}}. Sponsorship is for four years. After this point you need to make another donation to renew your sponsorship, if you want it to remain on the tree. </p>

<img class="example-leaf" src="{{=URL('static','images/Screenshots/sponsor_for_1.png')}}" alt="" >
<p>For many people it&#39s been more than four years now, but don&#39t worry. The COVID crisis hit just at the moment when the first renewals would have been needed. We decided that this wasn&#39t a good time to ask our supporters for further donations and so we&#39ve delayed opening the renewals portal - everyone&#39s sponsored leaves have been extended for free in the meantime.</p>
<p>Note that if you were among the first people to ever sponsor a leaf (thanks if so!), the COVID crisis hit just at the moment when renewals would have been needed. We decided that this wasn&#39t a good time to ask our supporters for further donations and so we extended sponsorships for free over that period.</p>

<p>We will soon be opening the renewals portal so please watch this space and check your e-mails too for instructions on how to renew if you wish. Meanwhile, we&#39ve written a bit of information in the form of questions and answers about what to expect so that you can be prepared. We do hope that you will consider renewing your sponsorships to help us continue our work.</p>
<h3>Questions about your sponsorships</h3>
<ul class="columns">
<li>
Expand Down