From 8719403b814fef792d9199d482c53a4e4e3cf9cb Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Wed, 14 Jan 2026 11:24:18 -0800 Subject: [PATCH] Still not right, boy an django template mode for Emacs would help {# LEFT OFF HERE #} shows where I left off. --- .../fundraiser_goal_banner_partial.html | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html index 796485b3..944ffdf2 100644 --- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html +++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html @@ -1,19 +1,19 @@ {% load humanize %} -{% if sitefundgoal1.days_remaining >= -22 or sitefundgoal0.days_remaining >= -22 %}{# i.e. 7 days over completion #} +{% if sitefundgoal1.days_remaining >= -22 or sitefundgoal0.days_remaining >= -22 %} {# IF LEVEL 0 (only show this at all for 7 days after fundraiser and stretch are over) #}
- {% if sitefundgoal0.match_remaining <= 0 %} - {% if sitefundgoal1.days_remaining >= 0 %} - {% if sitefundgoal1.match_remaining <= 0 %} + {% if sitefundgoal0.match_remaining <= 0 %} {# LEVEL 1 #} + {% if sitefundgoal1.days_remaining >= 0 %} {# LEVEL 2.0 #} + {% if sitefundgoal1.match_remaining <= 0 %} {# LEFT OFF HERE #} Thanks to so many donors, we earned our full original match donation — as well as our extended match! Help us go further to stand up for software freedom — sign up now! {% else %} Thanks to so many donors, we met our largest match donation ever of $211,939. A generous anonymous donor has provided another $40,000 of matching funds. Give now to help us reach this stretch goal!
- {% endif %} + OLD_ENDIF {% if sitefundgoal1.days_remaining == 0 %} For the only the next {{ sitefundgoal1.hours_remaining }} hour{{ sitefundgoal1.hours_remaining|pluralize }}, the {% elif sitefundgoal1.days_remaining == 1 %} @@ -22,15 +22,13 @@ For only {{ sitefundgoal1.days_remaining }} more days, the {% else %} Until FIXME_DATE, the - {% endif %} + OLD_ENDIF next ${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} of support we receive will be matched! - {% endif %} - {% else %} + OLD_ENDIF + {% else %} {# ELSE LEVEL 2.0 when (sitefundgoal1.days_remaining < 0) #} Thanks to all our donors who participated in our historic donation match challenge! Thanks to you, we raised our goal of $503,878 to support software freedom: - {% endif %} -
- + {% endif %} {# ENDIF LEVEL 2.0 (whether or not there are any sitefundgoal1.days_remaining) #}
{% if sitefundgoal1.match_remaining <= 0 %} @@ -47,13 +45,30 @@
${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} to go!
- {% endif %} +
+ +
+ {% if sitefundgoal0.match_remaining <= 0 %} +
+ ${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! +
+
+ ${{sitefundgoal0.match_exceeded_by|floatformat:0|intcomma }} additional
raised!
 +
+ {% else %} +
+ ${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! +
+
+ ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go! +
+ OLD_ENDIF
+
-{% else %} -{% if sitefundgoal0.match_remaining > 0 %} +{% else %} {# ELSE LEVEL 1 when (sitefundgoal0.match_remaining > 0) #}
@@ -70,14 +85,14 @@ Help us reach our goal of $503,878 this season to keep SFC going. For only {{ sitefundgoal0.days_remaining }} more days, the {% else %} Help us reach our goal of $503,878 this season to keep SFC going. Until January 15, the - {% endif %} + OLD_ENDIF next ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} of support we receive will be matched! - {% endif %} + OLD_ENDIF {% else %} Thanks to all our donors who participated in our historic donation match challenge! Thanks to you, we raised more than $480k to support software freedom: - {% endif %} + OLD_ENDIF
@@ -96,9 +111,9 @@
${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go!
- {% endif %} + {% endif %} {# ENDIF LEVEL 1, two choices for based on sitefundgoal0.match_remaining #}
-{% endif %} +{% endif %} {# ENDIF LEVEL 0 (the fundraiser has been over for > 7 days) #}