Changeset - c414214e50c3
[Not reviewed]
Merge
0 2 0
Bradley Kuhn (bkuhn) - 8 years ago 2016-04-28 19:58:33
bkuhn@ebb.org
Merge my offline changes with upstream pushes on k

ssh://k.sfconservancy.org/website had incoming changes for me.
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -38,30 +38,30 @@
 
	  <li class="donate"><a href="/donate/">Donate</a></li>
 
          <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 

	
 
    </div>
 
    <div class="fundraiser-top-text">
 
{% if sitefundgoal.fundraiser_so_far_amount < sitefundgoal.fundraiser_donation_count %}
 
   <em>Conservancy
 
   <a href="/supporter/">needs <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters</a> to continue its basic community services &amp;
 
   <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> to
 
   avoid hibernating its enforcement efforts.
 
   avoid hibernating its enforcement efforts in 2017.
 
{% else %}
 
      <em>Conservancy will continue our basic community services, thanks to our
 
        first <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters! We still need
 
        {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }} more Supporters to avoid reducing licensing work &amp; hibernating our
 
        enforcement efforts.
 
        enforcement efforts in 2017.
 
{% endif %}
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}
 
The <strong>next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters
 
who sign up <a href="/news/2016/feb/01/PIA-match-extended/">by the end of Feb. 29th (anywhere on earth) will count twice</a></strong>, thanks to <a href="https://www.privateinternetaccess.com/">Private Internet Access</a>!
 
{% endif %}
 
</em>
 
<div id="siteprogressbar">
 
<a href="/supporter">
 
<span id="site-fundraiser-so-far">{{ sitefundgoal.fundraiser_so_far_amount|intcomma }}</span> have joined so far.
 
{% if sitefundgoal.fundraiser_so_far_amount > 750 %}
 
Thus, our 750 goal was achieved &amp; {{ sitefundgoal.fundraiser_so_far_amount|subtract:750|intcomma }}</span> have
 
    joined beyond that.
0 comments (0 inline, 0 general)