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

base_conservancy: Activate progressbar for new match.

Browse source
This commit is contained in:
Brett Smith 2017-11-27 13:08:21 -05:00
parent cf20e691e6
commit 0add4633c1
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/conservancy/local_context_processors.py
View file

@ -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}

4
www/conservancy/static/js/conservancy.js
View file

@ -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",
});

38
www/conservancy/templates/base_conservancy.html
View file

@ -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 %}
<div class="fundraiser-top-text">
<em>
{% if this_match_remaining <= 0 %}
Thanks to {{ this_match_goal|intcomma }} Supporters we earned our full match! Help us go further to stand up for software
Thanks to {{ sitegoal.fundraiser_donation_count|intcomma }} Supporters we earned our full match! Help us go further to stand up for software
freedom &mdash; <a href="/supporter">sign up now</a>!
{% else %}
Let's stand up for software freedom together!
The next {{ this_match_remaining|intcomma }} Supporters who join or
renew by February 28th will be matched by an anonymous donor! <a href="/supporter/">Join today!</a>
The next ${{ this_match_remaining|floatformat:0|intcomma }} we receive from Supporters and donors will be matched! <a href="/supporter/">Join today!</a>
{% endif %}
</em>
<div id="siteprogressbar">
<a href="/supporter">
We've matched
{% if this_match_remaining <= 0 %}
<span id="site-fundraiser-match-count">{{ this_match_goal|intcomma }}</span>
$<span id="site-fundraiser-match-count">{{ this_match_goal|intcomma }}</span>
{% else %}
<span id="site-fundraiser-match-count">{{ this_match_so_far|intcomma }}</span>
$<span id="site-fundraiser-match-count">{{ this_match_so_far|intcomma }}</span>
{% endif %}
Supporters have been matched, out of
<span id="site-fundraiser-final-goal">{{ this_match_goal|intcomma }}</span> possible.
of
$<span id="site-fundraiser-final-goal">{{ this_match_goal|intcomma }}</span>
so far!
</a>
</div>
</div>
{% endwith %}
{% endwith %}
{% endcomment %}
{% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
<div id="conservancyfooter">