Changeset - 3fe4a5bcbbe6
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Bradley Kuhn (bkuhn) - 8 years ago 2016-01-19 04:32:12
bkuhn@ebb.org
Reduce ! in various site-wide fundraising texts.

Surprisingly, given her predilection for exclamation points:

<karen> yeah... believe it or not, I'd rather not have two exclamation points
in the 750 achieved! [20:30]

<karen> and I would also delete the exclamation point after " enforcement
efforts!" in the text above it [20:31]

So this change is made on her behalf.
2 files changed with 3 insertions and 3 deletions:
www/conservancy/static/js/supporter-page.js
1
1
www/conservancy/templates/base_conservancy.html
2
2
0 comments (0 inline, 0 general)
www/conservancy/static/js/supporter-page.js
➞
Show inline comments
...
 
@@ -17,49 +17,49 @@ $(document).ready(function() {
 
        noCommaSiteMatchCount = "0";
 
    }
 
    var noCommaMatchFinalGoal = noCommaSiteFinalGoal - noCommaSiteMatchCount;
 
    var goal  = $('span#fundraiser-goal').text();
 
    var soFar = $('span#fundraiser-so-far').text();
 
    var donationCount = $('span#fundraiser-donation-count').text();
 
    var noCommaGoal = parseFloat(goal.replace(/,/g, ""));
 
    var noCommaSoFar = parseFloat(soFar.replace(/,/g, ""));
 
    var noCommaDonationCount = parseInt(donationCount.replace(/,/g, ""));
 
    var percentage = (parseFloat(noCommaSoFar) / parseFloat(noCommaGoal)) * 100;
 
    var curValue = 0.00;
 
    var incrementSoFar = 0.00;
 
    var curDonationCount = 0;
 
    var riseLevelPercent = 0.5;
 
    var incrementDonationCount = Math.round( (riseLevelPercent / 100) * noCommaDonationCount );
 
    $('#siteprogressbar').empty();
 

			




	
	
	
		
 
    if (noCommaSiteSoFar >= noCommaSiteMiddleGoal) {


			




	
	
	
		
 
        // We've got


			




	
	
	
		
 
        var moreCount = noCommaSiteSoFar - noCommaSiteMiddleGoal;


			




	
	
	
		
 
        moreCount =  moreCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");


			




	
	
	
		
 
        $('#siteprogressbar').


			




	
	
	
		
 
            multiprogressbar({ parts: [


			




	
	
	
		
 
                { value: (noCommaSiteSoFar / noCommaSiteFinalGoal) * 100,


			




	
	
	
		
 
                  text: "750 achieved! " + moreCount + " beyond that have joined!",


			




	
	
	
		
 
                  text: "750 achieved! " + moreCount + " beyond that have joined.",


			




	
	
	
		
 
                  barClass: "progress", textClass: "soFarText" },


			




	
	
	
		
 
                { value:


			




	
	
	
		
 
                  ((noCommaMatchFinalGoal - noCommaSiteMiddleGoal) / noCommaSiteFinalGoal) * 100,


			




	
	
	
		
 
                  text: noCommaMatchFinalGoal.toLocaleString() + " will save license compliance work",


			




	
	
	
		
 
                  barClass: "final-goal", textClass: "goalText" },


			




	
	
	
		
 
                {  value: 100,


			




	
	
	
		
 
                   text: siteMatchCount + " matched!",


			




	
	
	
		
 
                   barClass: "progress", textClass: "soFarText" },


			




	
	
	
		
 
            ]});


			




	
	
	
		
 
    } else {


			




	
	
	
		
 
        $('#siteprogressbar').


			




	
	
	
		
 
            multiprogressbar({ parts: [


			




	
	
	
		
 
                { value: (noCommaSiteSoFar / noCommaSiteFinalGoal) * 100,


			




	
	
	
		
 
                  text: siteSoFar + " joined!",


			




	
	
	
		
 
                  barClass: "progress", textClass: "soFarText" },


			




	
	
	
		
 
                { value: ((noCommaSiteMiddleGoal - noCommaSiteSoFar) / noCommaSiteFinalGoal) * 100,


			




	
	
	
		
 
                  text: siteMiddleGoal + " will save our basic work",


			




	
	
	
		
 
                  barClass: "middle-goal", textClass: "goalText" },


			




	
	
	
		
 
                { value:


			




	
	
	
		
 
                  ((noCommaMatchFinalGoal - noCommaSiteMiddleGoal) / noCommaSiteFinalGoal) * 100,


			




	
	
	
		
 
                  text: noCommaMatchFinalGoal.toLocaleString() + " will save license compliance",


			




	
	
	
		
 
                  barClass: "final-goal", textClass: "goalText" },


			




	
	
	
		
 
                {  value: 100,


			




	
	
	
		
 
                   text: siteMatchCount + " matched!",


			




        

    


    
    

    

        

                

                    www/conservancy/templates/base_conservancy.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -26,54 +26,54 @@


			




	
	
	
		
 
  <body class="conservancy-{% block category %}other{% endblock %}">


			




	
	
	
		
 
    <h1 id="conservancyheader"><a id="logobutton" href="/">Software Freedom Conservancy</a></h1>


			




	
	
	
		
 
    <div id="navbar-outer">


			




	
	
	
		
 
      <div id="navbar">


			




	
	
	
		
 
	<ul>


			




	
	
	
		
 
          <li class="About"><a href="/about/">About</a></li>


			




	
	
	
		
 
          <li class="news"><a href="/news/">News</a></li>


			




	
	
	
		
 
          <li class="blog"><a href="/blog/">Blog</a></li>


			




	
	
	
		
 
	  <li class="Members"><a href="/members/">Membership</a></li>


			




	
	
	
		
 
	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>


			




	
	
	
		
 
          <li class="compliance"><a href="/linux-compliance/">Copyleft Compliance</a></li>


			




	
	
	
		
 
          <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>


			




	
	
	
		
 
	  <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.


			




	
	
	
		
 
{% 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! However, we still need a total of


			




	
	
	
		
 
        <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> Supporters to avoid reducing licensing work &amp; hibernating our


			




	
	
	
		
 
        enforcement efforts!


			




	
	
	
		
 
        enforcement efforts.


			




	
	
	
		
 
{% endif %}


			




	
	
	
		
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}


			




	
	
	
		
 
The next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters


			




	
	
	
		
 
who sign up <a href="/news/2015/dec/24/private-internet-access-match/">by January 31 will count twice</a>, 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.


			




	
	
	
		
 
{% endif %}


			




	
	
	
		
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 0 %}


			




	
	
	
		
 
Also, match pledges reduced our 2,500 maximum need by <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|min:632|intcomma }}</span>


			




	
	
	
		
 
{% endif %}


			




	
	
	
		
 
!</div></a>


			




	
	
	
		
 
</div>


			




	
	
	
		
 
      {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}


			




	
	
	
		
 
    <div id="conservancyfooter">


			




	
	
	
		
 
      <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>


			




	
	
	
		
 
      <p>Find Conservancy


			




	
	
	
		
 
      on <a href="https://identi.ca/conservancy">pump.io</a>,


			




	
	
	
		
 
      <a href="https://twitter.com/conservancy">Twitter</a>, <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">Youtube</a>, <a href="https://plus.google.com/104268783278405704634/">Google+</a>


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-8879
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy