diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html index ff4e1413..66334868 100644 --- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html +++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html @@ -1,111 +1,104 @@ {% load humanize %} {% 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 %} {# 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 %} - {% if sitefundgoal1.days_remaining == 0 %} - For the only the next {{ sitefundgoal1.hours_remaining }} hour{{ sitefundgoal1.hours_remaining|pluralize }}, the - {% elif sitefundgoal1.days_remaining == 1 %} - Through tomorrow only, the - {% elif sitefundgoal1.days_remaining < 14 %} - For only {{ sitefundgoal1.days_remaining }} more days, the - {% else %} - Until FIXME_DATE, the - {% endif %} - next ${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} of support we receive will be matched! - {% 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 LEVEL 2.0 (whether or not there are any sitefundgoal1.days_remaining) #} +
+
+
+ {% if sitefundgoal0.match_remaining <= 0 %} {# IF LEVEL 0.1 #} + {% if sitefundgoal1.days_remaining >= 0 %} {# IF LEVEL 0.1.0 #} + {% if sitefundgoal1.match_remaining <= 0 %} {# IF LEVEL 0.1.0.0 #} + {# The problem with automating this is that it does not actually test here if we made the match or not; we are usually watching it so carefully that it should not matter? We also have made ever match we did since 2015, so no one has probably thought hard about this problem. -- bkuhn #} + 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 %} {# ELSE LEVEL 0.1.0.0 when sitefundgoal1.match_remaining > 0 #} + 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!
+ {% if sitefundgoal1.days_remaining == 0 %} {# IF LEVEL 0.1.0.0.0 sitefundgoal1.days_remaining alternatives #} + For the only the next {{ sitefundgoal1.hours_remaining }} hour{{ sitefundgoal1.hours_remaining|pluralize }}, the + {% elif sitefundgoal1.days_remaining == 1 %} {# ELIF LEVEL 0.1.0.0.0 sitefundgoal1.days_remaining alternatives #} + Through tomorrow only, the + {% elif sitefundgoal1.days_remaining < 14 %} {# ELIF LEVEL 0.1.0.0.0 sitefundgoal1.days_remaining alternatives #} + For only {{ sitefundgoal1.days_remaining }} more days, the + {% else %} {# ELIF LEVEL 0.1.0.0.0 sitefundgoal1.days_remaining alternatives #} + Until FIXME_DATE, the + {% endif %} {# ELSE LEVEL 0.1.0.0.0 sitefundgoal1.days_remaining alternatives #} + next ${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} of financial support we receive will be matched! + {% endif %} {# ENDIF LEVEL 0.1.0.0 (testing whether or not sitefundgoal1.match_remaining has anything left in it) #} + {% else %} {# ELSE LEVEL 0.1.0 when (sitefundgoal1.days_remaining < 0) #} + Thanks to all our donors who participated in our historic donation match challenge! + Thanks to all of you, we raised our goal of $503,878 to support software freedom: + {% endif %} {# ENDIF LEVEL 0.1.0 (whether or not there are any sitefundgoal1.days_remaining) #}
- {% if sitefundgoal1.match_remaining <= 0 %} -
- ${{ sitefundgoal1.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! -
- {% else %} -
- ${{ sitefundgoal1.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! -
-
- ${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} to go! -
-
- -
- {% if sitefundgoal0.match_remaining <= 0 %} -
- ${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! -
- {% else %} -
- ${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! -
-
- ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go! - {% endif %} -
+ {% if sitefundgoal1.match_remaining <= 0 %} {# IF LEVEL 0.1.1 #} +
+ ${{ sitefundgoal1.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! +
+ {% else %} {# ELSE LEVEL 0.1.1 when sitefundgoal1.match_remaining > 0 #} +
+ ${{ sitefundgoal1.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! +
+
+ ${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} to go! +
+ {% endif %} {# ENDIF LEVEL 0.1.1 testing whether or not sitefundgoal1.match_remaining has anything in it #}
-
- -
- {% endif %} -{% else %} {# ELSE LEVEL 1 when (sitefundgoal0.match_remaining > 0) #} -
-
-
- {% if sitefundgoal0.days_remaining >= 0 %} - {% if sitefundgoal0.match_remaining <= 0 %} - Thanks to so many donors, we earned our full match! - Help us go further to stand up for software freedom — sign up now! - {% else %} - {% if sitefundgoal0.days_remaining == 0 %} - For the next {{ sitefundgoal0.hours_remaining }} hour{{ sitefundgoal0.hours_remaining|pluralize }} only, the - {% elif sitefundgoal0.days_remaining == 1 %} - Help us reach our goal of $503,878 this season to keep SFC going. Through tomorrow only, the - {% elif sitefundgoal0.days_remaining < 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 %} - next ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} of support we receive will be matched! - {% 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 %} -
-
- {% if sitefundgoal0.match_remaining <= 0 %} -
- ${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! -
- {% else %} -
- ${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! -
-
- ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go! -
- {% endif %} {# ENDIF LEVEL 1, two choices for based on sitefundgoal0.match_remaining #} + {% if sitefundgoal0.match_remaining <= 0 %} {# IF LEVEL 0.1.2, pointless test of sitefundgoal0.match_remaining (if we get here, else block should never be used!) #} +
+ ${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! +
+ {% else %} {# ELSE LEVEL 0.1.2, sitefundgoal0.match_remaining > 0 , but NOTE! We are here inside IF LEVEL 0.1, so this *should* never appear, included just for consistency #} +
+ ${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! +
+
+ ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go! +
+ {% endif %} {# ENDIF LEVEL 0.1.2, this ends the pointless block here for consistency, see comment above. #}
+ {% else %} {# ELSE LEVEL 0.1 when (sitefundgoal0.match_remaining > 0) #} + {% if sitefundgoal0.days_remaining >= 0 %} {# IF LEVEL 0.1.3 #} + {% if sitefundgoal0.match_remaining <= 0 %} {# IF LEVEL 0.1.3.0 #} + Thanks to so many donors, we earned our full match! + Help us go further to stand up for software freedom — sign up now! + {% else %} {# ELSE LEVEL 0.1.3.0 when sitefundgoal0.match_remaining > 0 #} + {% if sitefundgoal0.days_remaining == 0 %} {# IF LEVEL 0.1.3.0.0 testing options for sitefundgoal0.days_remaining #} + For the next {{ sitefundgoal0.hours_remaining }} hour{{ sitefundgoal0.hours_remaining|pluralize }} only, the + {% elif sitefundgoal0.days_remaining == 1 %} {# ELSIF LEVEL 0.1.3.0.0 testing options for sitefundgoal0.days_remaining #} + Help us reach our goal of $503,878 this season to keep SFC going. Through tomorrow only, the + {% elif sitefundgoal0.days_remaining < 14 %} {# ELSIF LEVEL 0.1.3.0.0 testing options for sitefundgoal0.days_remaining #} + Help us reach our goal of $503,878 this season to keep SFC going. For only {{ sitefundgoal0.days_remaining }} more days, the + {% else %} {# ELSE LEVEL 0.1.3.0.0 testing options for sitefundgoal0.days_remaining #} + Help us reach our goal of $503,878 this season to keep SFC going. Until January 15, the + {% endif %} {# ENDIF LEVEL 0.1.3.0.0 testing options for sitefundgoal0.days_remaining #} + next ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} of support we receive will be matched! + {% else %} {# ENDIF LEVEL 0.1.3, sitefundgoal0.days_remaining < 0 #} + {# The problem with automating this is that it does not actually test here if we made the match or not; we are usually watching it so carefully that it should not matter? We also have made ever match we did since 2015, so no one has probably thought hard about this problem. -- bkuhn #} + Thanks to all our donors who participated in our historic donation match challenge! + {% endif %} {# ENDIF LEVEL 0.1.3, testing if there are any sitefundgoal0.days_remaining left #} + +
+ {% if sitefundgoal0.match_remaining <= 0 %} {# IF LEVEL 0.1.3.1 #} +
+ ${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched! +
+ {% else %} {# ELSE LEVEL 0.1.3.1 sitefundgoal0.match_remaining > 0 #} +
+ ${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched! +
+
+ ${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go! +
+ {% endif %} {# ENDIF LEVEL 0.1.3.1 sitefundgoal0.match_remaining #} +
+ + {% endif %} {# ENDIF LEVEL 0.1, two choices for based on sitefundgoal0.match_remaining #}
+
{% endif %} {# ENDIF LEVEL 0 (the fundraiser has been over for > 7 days) #}