diff --git a/www/conservancy/local_context_processors.py b/www/conservancy/local_context_processors.py index c430d18dc3eeaeafed3d18362f1e74c3bcaaff63..1b4359378519281833548894729b76e5c0a9b2b0 100644 --- a/www/conservancy/local_context_processors.py +++ b/www/conservancy/local_context_processors.py @@ -9,7 +9,7 @@ def fundgoal_lookup(fundraiser_sought): return None def sitefundraiser(request): - return {'sitefundgoal': fundgoal_lookup('supporterrun') } + return {'sitefundgoal': fundgoal_lookup('fy-2018-main-match') } if conservancy.settings.FORCE_CANONICAL_HOSTNAME: _HOST_URL_VAR = {'host_url': 'https://' + conservancy.settings.FORCE_CANONICAL_HOSTNAME} diff --git a/www/conservancy/static/js/conservancy.js b/www/conservancy/static/js/conservancy.js index 805b2b7e211fa000f4c81772b42bc1cd838522aa..fad6efd4658ed3f839f9505c317e3e8bc2f9b58a 100644 --- a/www/conservancy/static/js/conservancy.js +++ b/www/conservancy/static/js/conservancy.js @@ -29,7 +29,7 @@ $(document).ready(function() { } var barParts = [{ value: (noCommaSiteMatchCount / noCommaSiteFinalGoal) * 100, - text: noCommaSiteMatchCount.toLocaleString() + " matched!", + text: "$" + noCommaSiteMatchCount.toLocaleString() + " matched!", barClass: "progress", textClass: "soFarText", }]; @@ -37,7 +37,7 @@ $(document).ready(function() { var matchesLeft = noCommaSiteFinalGoal - noCommaSiteMatchCount; barParts.push({ value: 100, - text: matchesLeft.toLocaleString() + " to go!", + text: "$" + matchesLeft.toLocaleString() + " to go!", barClass: "final-goal", textClass: "goalText", }); diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index ab1eba928ce51c95ec20e9a4a3ed311f34adc8a5..ba4d18aa02edb039a5aeeb498a1d213d400f1ec2 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -47,45 +47,49 @@ {% comment %} FUNDRAISER VARIABLES AND CONSTANTS GUIDE -fundraiser_goal_amount: The highest number of Supporters we want -fundraiser_so_far_amount: The number of Supporters we have -fundraiser_donation_count: The "minimum" number of Supporters we want (not currently used) -fundraiser_donation_count_disclose_threshold: The number of Supporters that have been matched +sitefundgoal attributes: + +fundraiser_goal_amount: The amount being matched +fundraiser_so_far_amount: The amount contributed so far +fundraiser_donation_count: The number of people who have contributed so far +fundraiser_donation_count_disclose_threshold: Not used + +Local convenience variables: + +this_match_goal: The amount being matched +this_match_so_far: The amount contributed so far +this_match_remaining: this_match_goal - this_match_so_far -When we started this match, we had 1076 Supporters matched, so we subtract -that from count_disclose_threshold to determine how many happened in the -current match. {% endcomment %} -{% comment %} -{% with this_match_goal=150 this_match_so_far=sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:1076 %} +{% 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 %}