Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display donation bar, noting it's results, for 1 week after end

Browse source 
The fundgoal section is now always included, but an if statement now
wraps the entire (partial) file, which will only generate any content
if it's not more than  one week after the fundraiser has ended.

Add an else that indicates these are results if it is past the end of
the fundraiser.
This commit is contained in:
Bradley M. Kuhn 2024-01-16 06:07:33 -08:00
parent b4a2b9c613
commit 0680c58853
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
View file

@ -26,16 +26,16 @@
{% endcomment %} {% endcomment %}
{% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %} {% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %}
{% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal.fundraiser_endtime|subtract:datetime_now this_match_exceeded=this_match_so_far|subtract:this_match_goal %} {% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal.fundraiser_endtime|subtract:datetime_now this_match_exceeded=this_match_so_far|subtract:this_match_goal %}
{% if sitefundgoal_timeleft.total_seconds >= -604800 %}
<div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns"> <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
<div class="mw8 center ph2 ph4-ns"> <div class="mw8 center ph2 ph4-ns">
<div class="mt2 mb3 tc"> <div class="mt2 mb3 tc">
{% if datetime_now < sitefundgoal.fundraiser_endtime %}
{% if this_match_remaining <= 0 %} {% if this_match_remaining <= 0 %}
Thanks to so many donors, we earned our full match! Thanks to so many donors, we earned our full match!
Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>! Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
{% else %} {% else %}
{% if sitefundgoal_timeleft.total_seconds <= 0 %} {% if sitefundgoal_timeleft.days == 0 %}
The
{% elif sitefundgoal_timeleft.days == 0 %}
For the next {% widthratio sitefundgoal_timeleft.total_seconds 3600 1 %} hours <strong>only</strong>, the For the next {% widthratio sitefundgoal_timeleft.total_seconds 3600 1 %} hours <strong>only</strong>, the
{% elif sitefundgoal_timeleft.days == 1 %} {% elif sitefundgoal_timeleft.days == 1 %}
Through tomorrow only, the Through tomorrow only, the
@ -47,6 +47,9 @@
next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/sustainer/">support we receive</a> will be matched! next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/sustainer/">support we receive</a> will be matched!
{% endif %} {% endif %}
{% else %}
Thank you so much to all our donors who participated in our donation match challenge! Here are the results:
{% endif %}
</div> </div>
{% if 1 %} {% if 1 %}
@ -73,5 +76,6 @@
</div> </div>
</div> </div>
{% endif %}
{% endwith %} {% endwith %}
{% endwith %} {% endwith %}

3
conservancy/templates/base_conservancy.html
View file

@ -80,10 +80,7 @@
<div id="navbar-clear"></div> <div id="navbar-clear"></div>
</div> </div>
{% if datetime_now < sitefundgoal.fundraiser_endtime %}
{% include "fundgoal/fundraiser_goal_banner_partial.html" %} {% include "fundgoal/fundraiser_goal_banner_partial.html" %}
{% endif %}
<div> <div>
{% block outercontent %}<div id="mainContent" class="mw8 center ph2 ph3"> {% block content %}{% endblock %}</div>{% endblock %} {% block outercontent %}<div id="mainContent" class="mw8 center ph2 ph3"> {% block content %}{% endblock %}</div>{% endblock %}