Step 2, switch to using 'sitefundgoal0'

This commit is contained in:
Bradley Kuhn 2026-01-14 10:04:42 -08:00
parent e5ea74887a
commit a17c08f00c
2 changed files with 21 additions and 21 deletions

View file

@ -4,10 +4,10 @@ from .fundgoal.models import FundraisingGoal
def sitefundraiser(request): def sitefundraiser(request):
try: try:
fundgoal = FundraisingGoal.objects.get(fundraiser_code_name=settings.SITE_FUNDGOAL_0) fundgoal0 = FundraisingGoal.objects.get(fundraiser_code_name=settings.SITE_FUNDGOAL_0)
except FundraisingGoal.DoesNotExist: except FundraisingGoal.DoesNotExist:
fundgoal = None fundgoal0 = None
return {'sitefundgoal': fundgoal} return {'sitefundgoal0': fundgoal0 }
def host_url(request): def host_url(request):

View file

@ -1,24 +1,24 @@
{% load humanize %} {% load humanize %}
{% if sitefundgoal.days_remaining >= -22 %}{# i.e. 7 days over completion #} {% if sitefundgoal0.days_remaining >= -22 %}{# i.e. 7 days over completion #}
<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 sitefundgoal.days_remaining >= 0 %} {% if sitefundgoal0.days_remaining >= 0 %}
{% if sitefundgoal.match_remaining <= 0 %} {% if sitefundgoal0.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.days_remaining == 0 %} {% if sitefundgoal0.days_remaining == 0 %}
For the next {{ sitefundgoal.hours_remaining }} hour{{ sitefundgoal.hours_remaining|pluralize }} <strong>only</strong>, the For the next {{ sitefundgoal0.hours_remaining }} hour{{ sitefundgoal0.hours_remaining|pluralize }} <strong>only</strong>, the
{% elif sitefundgoal.days_remaining == 1 %} {% elif sitefundgoal0.days_remaining == 1 %}
Help us reach our goal of <b>$503,878</b> this season to keep SFC going. Through tomorrow only, the Help us reach our goal of <b>$503,878</b> this season to keep SFC going. Through tomorrow only, the
{% elif sitefundgoal.days_remaining < 14 %} {% elif sitefundgoal0.days_remaining < 14 %}
Help us reach our goal of <b>$503,878</b> this season to keep SFC going. For only {{ sitefundgoal.days_remaining }} more days, the Help us reach our goal of <b>$503,878</b> this season to keep SFC going. For only {{ sitefundgoal0.days_remaining }} more days, the
{% else %} {% else %}
Help us reach our goal of <b>$503,878</b> this season to keep SFC going. Until January 15, the Help us reach our goal of <b>$503,878</b> this season to keep SFC going. Until January 15, the
{% endif %} {% endif %}
next <b>${{ sitefundgoal.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched! next <b>${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched!
{% endif %} {% endif %}
{% else %} {% else %}
Thanks to all our donors who participated in our Thanks to all our donors who participated in our
@ -29,19 +29,19 @@
<a href="/sustainer/" style="text-decoration: none !important"> <a href="/sustainer/" style="text-decoration: none !important">
<div id="siteprogressbar" class="flex items-stretch w-100"> <div id="siteprogressbar" class="flex items-stretch w-100">
{% if sitefundgoal.match_remaining <= 0 %} {% if sitefundgoal0.match_remaining <= 0 %}
<div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal.fundraiser_so_far_amount }}px"> <div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span> <span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div> </div>
<div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal.match_exceeded_by }}px"> <div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_exceeded_by }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span> <span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal0.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span>
</div> </div>
{% else %} {% else %}
<div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal.fundraiser_so_far_amount }}px"> <div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100">${{ sitefundgoal.fundraiser_so_far_amount|floatformat:0|intcomma }} matched!</span> <span id="site-fundraiser-match-count" class="soFarText tc w-100">${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched!</span>
</div> </div>
<div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal.match_remaining }}px"> <div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_remaining }}px">
<span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal.match_remaining|floatformat:0|intcomma }} to go!</span> <span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go!</span>
</div> </div>
{% endif %} {% endif %}
</div> </div>