Changeset - 3766fbebc6bb
www/conservancy/static/copyleft-compliance/about.html
Show inline comments
...
 
@@ -6,3 +6,3 @@
 

	
 
<p>As existing donors and supporters know, the Software Freedom Conservancy
 
<p>As existing donors and sustainers know, the Software Freedom Conservancy
 
  is a 501(c)(3) non-profit charity registered in New York, and Conservancy
...
 
@@ -39,3 +39,3 @@ compliance actions.</p>
 

	
 
<p>We encourage our supporters and software freedom enthusiasts everywhere to
 
<p>We encourage our sustainers and software freedom enthusiasts everywhere to
 
  <a href="/copyleft-compliance/enforcement-strategy.html">read our detailed
...
 
@@ -151,3 +151,3 @@ Conservancy should contact <a href="mailto:debian-services@sfconservancy.org">&l
 
  class="donate-now">donations</a> in support of our GPL Compliance Projects,
 
  and we encourage you to become a <a href="/supporter/">an official
 
  and we encourage you to become a <a href="/sustainer/">an official
 
  Supporter of Software Freedom Conservancy</a>. </p>
www/conservancy/static/copyleft-compliance/enforcement-strategy.html
Show inline comments
...
 
@@ -7,3 +7,3 @@
 

	
 
<p>As existing donors and supporters know, the Software Freedom Conservancy
 
<p>As existing donors and sustainers know, the Software Freedom Conservancy
 
  is a 501(c)(3) non-profit charity registered in New York, and Conservancy
www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
Show inline comments
...
 
@@ -17,4 +17,4 @@
 
    Support Conservancy's and Christoph's efforts in this area
 
    by <a href="/supporter/">becoming a Conservancy
 
    supporter</a> or <a href="#donate-box" class="donate-now">donating via
 
    by <a href="/sustainer/">becoming a Conservancy
 
    sustainer</a> or <a href="#donate-box" class="donate-now">donating via
 
    the link on the right</a>.</em></p>
...
 
@@ -87,3 +87,3 @@ software communities alike.</p>
 
  bad actors that the GPL matters to the individuals in our community.
 
  After you <a href="#donate-box" class="donate-now">donate</a>, go and tell the world: &ldquo;Play by the rules, @VMware. I defend the #GPL with Christoph &amp; @Conservancy. #DTRTvmware  Help at https://sfconservancy.org/supporter/ &rdquo; on your blog or microblog.
 
  After you <a href="#donate-box" class="donate-now">donate</a>, go and tell the world: &ldquo;Play by the rules, @VMware. I defend the #GPL with Christoph &amp; @Conservancy. #DTRTvmware  Help at https://sfconservancy.org/sustainer/ &rdquo; on your blog or microblog.
 
  </p>
...
 
@@ -103,3 +103,3 @@ information</a>.)</p>
 
  and there is so much GPL enforcement work to do.  So, please
 
  donate now: by becoming <a href="/supporter/">a Conservancy Supporter</a> or
 
  donate now: by becoming <a href="/sustainer/">a Conservancy Sustainer</a> or
 
  via <a href="#donate-box" class="donate-now">donate link on the right</a>.</p>
www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
Show inline comments
...
 
@@ -658,3 +658,3 @@ enforce the GPL regarding the primary issue in this case.</dd>
 
  prepared to fund this case through its conclusion, but we can only do so
 
  with <a href="/supporter/"><em>your</em> support</a>.  If you are an
 
  with <a href="/sustainer/"><em>your</em> support</a>.  If you are an
 
  individual who supports copyleft and wants to see it defended, please
www/conservancy/static/donate/index.html
Show inline comments
...
 
@@ -11,7 +11,7 @@
 

	
 
<h3><a href="/supporter/#annual">Become a Supporter Now!</a></h3>
 
<h3><a href="/sustainer/#annual">Become a Sustainer Now!</a></h3>
 

	
 
<p>The best way to donate to Conservancy is
 
  via <a href="/supporter/#annual">our official Supporter program</a>, which
 
  earns a t-shirt and other surprise Supporter-only perks throughout the
 
  via <a href="/sustainer/#annual">our official Sustainer program</a>, which
 
  earns a t-shirt and other surprise Sustainer-only perks throughout the
 
  year.</p>
www/conservancy/static/npoacct/index.html
Show inline comments
...
 
@@ -31,4 +31,4 @@
 

	
 
<p>Or, <a href="/supporter/#annual"><span class="donate-box-highlight">become a Conservancy
 
      Supporter</span></a> (&mdash; a better option if you're donating more
 
<p>Or, <a href="/sustainer/#annual"><span class="donate-box-highlight">become a Conservancy
 
      Sustainer</span></a> (&mdash; a better option if you're donating more
 
      than $120, since you'll get a t-shirt!).</p>
www/conservancy/static/privacy-policy/index.html
Show inline comments
...
 
@@ -13,3 +13,3 @@
 
<ul>
 
<li>you sign up as a Conservancy Supporter or otherwise donate to Conservancy;</li>
 
<li>you sign up as a Conservancy Sustainer or otherwise donate to Conservancy;</li>
 
<li>you visit any Conservancy web site;</li>
...
 
@@ -23,3 +23,3 @@
 
</ul>
 
<p>Conservancy&rsquo;s member projects may also collect data and have their own privacy policies which specify what they do with the data they collect. This policy applies to Conservancy&rsquo;s general operations, Supporter program and websites.</p>
 
<p>Conservancy&rsquo;s member projects may also collect data and have their own privacy policies which specify what they do with the data they collect. This policy applies to Conservancy&rsquo;s general operations, Sustainer program and websites.</p>
 
<p>When you visit any Conservancy web site (including the specific sites named above), we collect your IP address to maintain our servers, estimate de-identified visitor patterns, and attribute changes to public resources like wikis and Etherpad documents.</p>
...
 
@@ -60,3 +60,3 @@
 
<li>As required to provide service, and for e-mail housing (as a consequence of uses already described in this Privacy Statement). It is in Conservancy’s legitimate business interest to provide all users an accurate record of data and content provided by Conservancy’s services, and to maintain the integrity of that data and content for historical, scientific, and research purposes. This data and content may include but is not limited to email, code changes, comments, and artifacts.</li>
 
<li>We may use stamps.com to mail items to you, such as Supporter t-shirts, in which case we will give stamps.com the details needed to perform its services, such as your name, address, email address, phone number, and contents of the package. This information will then be subject to <a href="https://www.stamps.com/privacy-policy/">stamps.com&rsquo;s privacy policy</a>.</li>
 
<li>We may use stamps.com to mail items to you, such as Sustainer t-shirts, in which case we will give stamps.com the details needed to perform its services, such as your name, address, email address, phone number, and contents of the package. This information will then be subject to <a href="https://www.stamps.com/privacy-policy/">stamps.com&rsquo;s privacy policy</a>.</li>
 
<li>As required by law (such as responding to a valid subpoena, warrant, audit, or agency action, or to prevent fraud).</li>
...
 
@@ -65,3 +65,3 @@
 
<h2>Donations</h2>
 
<p>We receive personal information from third party services when you donate to us via online payment mechanisms. We do not sell or distribute this information to third parties. Conservancy uses this information to acknowledge your donation and send you occasional solicitations and newsletters. Donors can opt out of all contact or specify only print or e-mail contact by emailing <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#112;&#114;&#105;&#118;&#97;&#99;&#121;&#64;&#115;&#102;&#99;&#111;&#110;&#115;&#101;&#114;&#118;&#97;&#110;&#99;&#121;&#46;&#111;&#114;&#103;">&#112;&#114;&#105;&#118;&#97;&#99;&#121;&#64;&#115;&#102;&#99;&#111;&#110;&#115;&#101;&#114;&#118;&#97;&#110;&#99;&#121;&#46;&#111;&#114;&#103;</a>. Donor names are posted on our <a href="https://sfconservancy.org/sponsors/">Sponsors &amp; Supporters</a> page as a recognition of their support. At the time of the donation, the donor can ask to be anonymous, so that their name will not be publicly recognized.</p>
 
<p>We receive personal information from third party services when you donate to us via online payment mechanisms. We do not sell or distribute this information to third parties. Conservancy uses this information to acknowledge your donation and send you occasional solicitations and newsletters. Donors can opt out of all contact or specify only print or e-mail contact by emailing <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#112;&#114;&#105;&#118;&#97;&#99;&#121;&#64;&#115;&#102;&#99;&#111;&#110;&#115;&#101;&#114;&#118;&#97;&#110;&#99;&#121;&#46;&#111;&#114;&#103;">&#112;&#114;&#105;&#118;&#97;&#99;&#121;&#64;&#115;&#102;&#99;&#111;&#110;&#115;&#101;&#114;&#118;&#97;&#110;&#99;&#121;&#46;&#111;&#114;&#103;</a>. Donor names are posted on our <a href="https://sfconservancy.org/sponsors/">Sponsors &amp; Sustainers</a> page as a recognition of their support. At the time of the donation, the donor can ask to be anonymous, so that their name will not be publicly recognized.</p>
 
<h2>Receiving E-Mail</h2>
www/conservancy/static/projects/apply/index.html
Show inline comments
...
 
@@ -270,3 +270,3 @@ form their own independent tax-exempt 501(c)(3) non-profit.</p>
 
  sponsorship activities; we raise additional funds
 
  through <a href="/supporter">support program</a> to subsidize our fiscal
 
  through <a href="/sustainer">support program</a> to subsidize our fiscal
 
  sponsorship work.</p>
www/conservancy/static/sustainer/event.html
Show inline comments
 
file renamed from www/conservancy/static/supporter/event.html to www/conservancy/static/sustainer/event.html
www/conservancy/static/sustainer/original-supporter-appeal.html
Show inline comments
 
file renamed from www/conservancy/static/supporter/original-supporter-appeal.html to www/conservancy/static/sustainer/original-supporter-appeal.html
...
 
@@ -133,3 +133,3 @@ internal policies</a> are published and available for scrutiny.</p>
 
<div class="supporter-form-inputs">
 
            <input type="hidden" name="return" value="https://sfconservancy.org/supporter/thank-you.html" />
 
            <input type="hidden" name="return" value="https://sfconservancy.org/sustainer/thank-you.html" />
 
            <input type="hidden" name="cmd" value="_xclick" />
...
 
@@ -192,3 +192,3 @@ internal policies</a> are published and available for scrutiny.</p>
 
            <input type="hidden" name="item_name" value="Conservancy Supporter, Monthly" />
 
            <input type="hidden" name="return" value="https://sfconservancy.org/supporter/thank-you.html" />
 
            <input type="hidden" name="return" value="https://sfconservancy.org/sustainer/thank-you.html" />
 
            <input type="hidden" name="cmd" value="_xclick-subscriptions">
www/conservancy/static/sustainer/thank-you-event.html
Show inline comments
 
file renamed from www/conservancy/static/supporter/thank-you-event.html to www/conservancy/static/sustainer/thank-you-event.html
www/conservancy/static/sustainer/thank-you.html
Show inline comments
 
file renamed from www/conservancy/static/supporter/thank-you.html to www/conservancy/static/sustainer/thank-you.html
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Thanks for Your Support - {% endblock %}
 
{% block category %}supporter{% endblock %}
 
{% block category %}sustainer{% endblock %}
 

	
...
 
@@ -10,6 +10,6 @@
 

	
 
<p>Thank you for being a Supporter of Software Freedom Conservancy!</p>
 
<p>Thank you for being a Sustainer of Software Freedom Conservancy!</p>
 

	
 
<!-- <p>Are you at LinuxFest Northwest right now?  If so, you are now eligible to
 
  attend a special Supporter-only dinner and drinks on Saturday 23 April 2016
 
  attend a special Sustainer-only dinner and drinks on Saturday 23 April 2016
 
  at 6:30PM, but space is limited!  please RSVP
...
 
@@ -21,11 +21,11 @@
 
  
 
<p>As a Conservancy Supporter, you'll also be eligible for future special
 
<p>As a Conservancy Sustainer, you'll also be eligible for future special
 
benefits.  We may contact you directly by email later to tell you about
 
special Supporter-only benefits in the coming year.</p>
 
special Sustainer-only benefits in the coming year.</p>
 

	
 
<p>Meanwhile, please spread the word about supporting Conservancy with
 
  a &ldquo;Supporter Badge&rdquo; on your website, Twitter account, or
 
  a &ldquo;Sustainer Badge&rdquo; on your website, Twitter account, or
 
  other locations where people view information about you:</p>
 

	
 
<p><a href="https://sfconservancy.org/supporter/"><img src="https://sfconservancy.org/img/supporter-badge.png" width="194" height="90" alt="Become a Conservancy Supporter!" border="0"/></a></p>
 
<p><a href="https://sfconservancy.org/sustainer/"><img src="https://sfconservancy.org/img/supporter-badge.png" width="194" height="90" alt="Become a Conservancy Sustainer!" border="0"/></a></p>
 

	
...
 
@@ -34,6 +34,6 @@ special Supporter-only benefits in the coming year.</p>
 
             cols="65">
 
<a href="https://sfconservancy.org/supporter/"><img src="https://sfconservancy.org/img/supporter-badge.png" width="194" height="90" alt="Become a Conservancy Supporter!" border="0"/></a>
 
<a href="https://sfconservancy.org/sustainer/"><img src="https://sfconservancy.org/img/supporter-badge.png" width="194" height="90" alt="Become a Conservancy Sustainer!" border="0"/></a>
 
 </textarea></p>
 

	
 
<p>Also, please enjoy these &ldquo;Supporter Cards&rdquo;, which you print out and
 
<p>Also, please enjoy these &ldquo;Sustainer Cards&rdquo;, which you print out and
 
  carry with you.  You've earned it! The cards are available in two different
www/conservancy/templates/base_compliance.html
Show inline comments
...
 
@@ -20,4 +20,4 @@
 
  To support our copyleft compliance &amp; enforcement work,
 
  please <a href="/supporter/#annual"><span class="donate-box-highlight">become a Conservancy
 
      Supporter <strong>right now</strong></span></a>.  We can't sustain
 
  please <a href="/sustainer/#annual"><span class="donate-box-highlight">become a Conservancy
 
      Sustainer <strong>right now</strong></span></a>.  We can't sustain
 
  this work without ongoing support from donors like you!</p>
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -29,3 +29,3 @@
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
  <body class="conservancy-{% block category %}other{% endblock %} debug">
 
    <div class="flex-ns" style="max-width: 1140px; margin: 0 auto;">
...
 
@@ -49,3 +49,3 @@
 
        <ul class="f5 b ttu">
 
      <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li>
 
      <li class="sustainer"><a href="/sustainer/">Become a Sustainer!</a></li>
 
      <li class="news"><a href="/news/">News</a></li>
...
 
@@ -73,3 +73,3 @@
 
  * fundraiser_donation_count: The number of people who have contributed so far
 
  * fundraiser_donation_count_disclose_threshold: The number of new Supporters that can be double-matched this fundraiser.
 
  * fundraiser_donation_count_disclose_threshold: The number of new Sustainers that can be double-matched this fundraiser.
 
      (No, this name makes no sense. We're repurposing an existing model field for this new reason.)
...
 
@@ -92,4 +92,4 @@
 
        {% if this_match_remaining <= 0 %}
 
          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>!
 
          Thanks to {{ sitegoal.fundraiser_donation_count|intcomma }} Sustainers we earned our full match!
 
          Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
 
        {% else %}
...
 
@@ -106,3 +106,3 @@
 
          {% endif %}
 
        next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/supporter/">support we receive</a> will be matched!
 
        next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/sustainer/">support we receive</a> will be matched!
 

	
...
 
@@ -113,3 +113,3 @@
 
<div id="siteprogressbar">
 
<a href="/supporter">
 
<a href="/sustainer">
 
  We've matched
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -107,3 +107,3 @@
 
     charitable donations for its operations.
 
     Please join {{supporters_count|safe}} others and <a href="/supporter/"><strong>become a Conservancy Supporter
 
     Please join {{supporters_count|safe}} others and <a href="/sustainer/"><strong>become a Conservancy Sustainer
 
     today</strong></a> and/or <a href="/donate/">donate generously</a> to help our work!
www/conservancy/templates/sponsors.html
Show inline comments
...
 
@@ -9,3 +9,3 @@
 

	
 
<h1>Conservancy's Sponsors &amp; Supporters</h1>
 
<h1>Conservancy's Sponsors &amp; Sustainers</h1>
 

	
...
 
@@ -49,11 +49,11 @@ any of its sponsors.</p>
 
<br/>
 
<h2>Supporters</h2>
 
<h2>Sustainers</h2>
 

	
 
<p>Conservancy currently has {{supporters_count|safe}} Supporters.
 
  Conservancy Supporters are individuals (or small companies) who give $120
 
  or more annually as part of <a href="/supporter/">the Official Conservancy
 
  Supporter program</a>.  Those who request public acknowledgment are listed
 
  here in order by the date when they first joined the Supporter program:</p>
 
<p>Conservancy currently has {{supporters_count|safe}} Sustainers.
 
  Conservancy Sustainers are individuals (or small companies) who give $120
 
  or more annually as part of <a href="/sustainer/">the Official Conservancy
 
  Sustainer program</a>.  Those who request public acknowledgment are listed
 
  here in order by the date when they first joined the Sustainer program:</p>
 

	
 
<ul id="supporters">
 
<ul id="sustainers">
 
<li>Anonymous ({{anonymous_count|safe}} people)</li>
www/conservancy/templates/supporter/banners.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block subtitle %}Supporter Banners - {% endblock %}
 
{% block category %}supporter{% endblock %}
 
{% block subtitle %}Sustainer Banners - {% endblock %}
 
{% block category %}sustainer{% endblock %}
 

	
...
 
@@ -6,3 +6,3 @@
 
<div class="singleColumn">
 
<h2>Conservancy Supporter Banners</h2>
 
<h2>Conservancy Sustainer Banners</h2>
 

	
...
 
@@ -10,6 +10,6 @@
 

	
 
<h3>Individual Supporter Banner</h3>
 
<h3>Individual Sustainer Banner</h3>
 

	
 
<pre><code>  &lt;div style="margin: 0 auto; max-width: 1200px;"&gt;
 
    &lt;a href="https://sfconservancy.org/supporter"&gt;
 
    &lt;a href="https://sfconservancy.org/sustainer"&gt;
 
      &lt;img style="width: 100%;"
...
 
@@ -23,3 +23,3 @@
 
<div style="margin: 0 auto; max-width: 1200px;">
 
  <a href="https://sfconservancy.org/supporter">
 
  <a href="https://sfconservancy.org/sustainer">
 
    <img style="width: 100%;"
...
 
@@ -34,3 +34,3 @@
 
<pre><code>  &lt;div style="margin: 0 auto; max-width: 1200px;"&gt;
 
    &lt;a href="https://sfconservancy.org/supporter"&gt;
 
    &lt;a href="https://sfconservancy.org/sustainer"&gt;
 
      &lt;img style="width: 100%;"
...
 
@@ -44,3 +44,3 @@
 
<div style="margin: 0 auto; max-width: 1200px;">
 
  <a href="https://sfconservancy.org/supporter">
 
  <a href="https://sfconservancy.org/sustainer">
 
    <img style="width: 100%;"
www/conservancy/templates/supporter/form_partial.html
Show inline comments
...
 
@@ -30,3 +30,3 @@ This partial accepts these optional parameters:
 
<div id="{{ form_id }}" class="supporter-type-selection">
 
  <h3>{{ verb|capfirst }} as {{ article }} {{ supptype|capfirst }} Supporter</h3>
 
  <h3>{{ verb|capfirst }} as {{ article }} {{ supptype|capfirst }} Sustainer</h3>
 

	
...
 
@@ -34,8 +34,8 @@ This partial accepts these optional parameters:
 
    {% if form_id == "annual" %}
 
    Annual Supporters do not automatically renew.  If you join today, you'll
 
    Annual Sustainers do not automatically renew.  If you join today, you'll
 
    receive an email to renew in about a year.
 
    {% elif form_id == "monthly" %}
 
    Monthly Supporters automatically pay each month until you cancel
 
    Monthly Sustainers automatically pay each month until you cancel
 
    payments in PayPal.  You'll be added to
 
    our <a href="/sponsors/#supporters" target="_blank">Supporters list</a> as soon as we
 
    our <a href="/sponsors/#sustainers" target="_blank">Sustainers list</a> as soon as we
 
    process your first payment.  You may not receive other benefits (like
...
 
@@ -45,4 +45,4 @@ This partial accepts these optional parameters:
 
    {% elif form_id == "renewal" %}
 
    This form is for annual Supporters who want to renew their support this
 
    year.  If you're a new Conservancy Supporter, please select another
 
    This form is for annual Sustainers who want to renew their support this
 
    year.  If you're a new Conservancy Sustainer, please select another
 
    form.
...
 
@@ -56,3 +56,3 @@ This partial accepts these optional parameters:
 
      <input type="hidden" name="business" value="supporter@sfconservancy.org">
 
      <input type="hidden" name="return" value="https://sfconservancy.org/supporter/thank-you.html">
 
      <input type="hidden" name="return" value="https://sfconservancy.org/sustainer/thank-you.html">
 
      <input type="hidden" name="lc" value="US">
...
 
@@ -60,3 +60,3 @@ This partial accepts these optional parameters:
 
      <input type="hidden" name="item_name"
 
             value="Conservancy Supporter, {{ supptype|capfirst }}{% if form_id == "renewal" %} Renewal{% endif %}"
 
             value="Conservancy Sustainer, {{ supptype|capfirst }}{% if form_id == "renewal" %} Renewal{% endif %}"
 
             >
...
 
@@ -83,3 +83,3 @@ This partial accepts these optional parameters:
 
      <p class="form-error">${{ min_amt|add:partial_amt }} is a minimum for
 
        Conservancy Supporters.
 
        Conservancy Sustainers.
 
        <a href="/donate">Donate smaller amounts here</a>.</p>
...
 
@@ -134,3 +134,3 @@ This partial accepts these optional parameters:
 
        <label for="publicAck">
 
          Should we add you to the <a href="/sponsors#supporters" target="_blank">Conservancy Supporters list</a>? </label>
 
          Should we add you to the <a href="/sponsors#sustainers" target="_blank">Conservancy Sustainers list</a>? </label>
 
        <div class="input-group">
...
 
@@ -155,3 +155,3 @@ This partial accepts these optional parameters:
 
             height="81" width="188" border="0"
 
             alt="{{ verb|capfirst }} as {{ article }} {{ supptype|capfirst }} Supporter Now!">
 
             alt="{{ verb|capfirst }} as {{ article }} {{ supptype|capfirst }} Sustainer Now!">
 
      <p>This button will send you to PayPal's site to select a payment
www/conservancy/templates/supporter/index.html
Show inline comments
...
 
@@ -2,3 +2,3 @@
 
{% block subtitle %}Support Conservancy - {% endblock %}
 
{% block category %}supporter{% endblock %}
 
{% block category %}sustainer{% endblock %}
 

	
...
 
@@ -7,3 +7,3 @@
 
<link href="/css/forms.css" rel="stylesheet" type="text/css"/>
 
{% include "opengraph_partial.html" with url="/supporter/" title="Support Conservancy!" description="Software freedom is critical to many of today&rsquo;s most pressing social issues, but it&rsquo;s only effective when FOSS is for everyone. Support Conservancy today to help make that happen!" %}
 
{% include "opengraph_partial.html" with url="/sustainer/" title="Support Conservancy!" description="Software freedom is critical to many of today&rsquo;s most pressing social issues, but it&rsquo;s only effective when FOSS is for everyone. Support Conservancy today to help make that happen!" %}
 
{% include "opengraph_urllist_partial.html" with property='image' urls='' fallback='/img/conservancy-logo.png' %}
...
 
@@ -18,3 +18,3 @@
 

	
 
<h3 class="donate-box-highlight">Become a Supporter Now:</h3>
 
<h3 class="donate-box-highlight">Become a Sustainer Now:</h3>
 

	
...
 
@@ -22,9 +22,9 @@
 

	
 
<h4><a href="#annual"><span class="donate-box-highlight">Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 
<h4><a href="#monthly"><span class="donate-box-highlight">Monthly supporter</span> via PayPal, ACH, or credit card.</a></h4>
 
<h4><a href="#renewal"><span class="donate-box-highlight">Renewing Annual supporter</span> via PayPal, ACH, or credit card.</a></h4>
 
   
 
<span class="donate-box-highlight">Other annual supporters methods:</span>
 
<h4><a href="#annual"><span class="donate-box-highlight">Annual sustainer</span> via PayPal, ACH, or credit card.</a></h4>
 
<h4><a href="#monthly"><span class="donate-box-highlight">Monthly sustainer</span> via PayPal, ACH, or credit card.</a></h4>
 
<h4><a href="#renewal"><span class="donate-box-highlight">Renewing Annual sustainer</span> via PayPal, ACH, or credit card.</a></h4>
 

	
 
<span class="donate-box-highlight">Other annual sustainers methods:</span>
 
<div class="toggle-unit">
 
    <h4 class="toggle-control" data-text="Wire Transfer" 
 
    <h4 class="toggle-control" data-text="Wire Transfer"
 
    data-expanded-text="Wire Transfer:">Wire Transfer</h4>
...
 
@@ -38,3 +38,3 @@
 
<div class="toggle-unit">
 
    <h4 class="toggle-control" data-text="Paper Check" 
 
    <h4 class="toggle-control" data-text="Paper Check"
 
    data-expanded-text="Paper Check:">Paper Check</h4>
...
 
@@ -45,4 +45,4 @@
 
    BROOKLYN, NY 11201-3548 &nbsp; USA<br/>
 
    Please write <q>SUPPORTER</q>, t-shirt size, if you are renewing, and if
 
    you want public acknowledgment in memo line. 
 
    Please write <q>SUSTAINER</q>, t-shirt size, if you are renewing, and if
 
    you want public acknowledgment in memo line.
 
    </div><!-- /.toggle-content -->
...
 
@@ -55,3 +55,3 @@
 
<div class="content-with-donate-sidebar" id="formStart">
 
  <h1 class="appeal"><img class="appeal-header" alt="Become a Conservancy Supporter!" src="/img/conservancy-supporter-header.png"/></h1>
 
  <h1 class="appeal"><img class="appeal-header" alt="Become a Conservancy Sustainer!" src="/img/conservancy-supporter-header.png"/></h1>
 

	
...
 
@@ -62,3 +62,3 @@
 
  <div class="supporter-type-selector">
 
    <strong>Become a Supporter Now:</strong>
 
    <strong>Become a Sustainer Now:</strong>
 
    <a id="annualSelector" href="#annual">Annual</a>
...
 
@@ -209,3 +209,3 @@ pandemic, but we did plan for the worst.  We&rsquo;re frugal, careful, and we pl
 
dollar you give to Conservancy is used to support critical work.  While companies sell
 
you products this end of year season, we offer you a chance to donate to something much bigger. By becoming a Conservancy Supporter, you can put
 
you products this end of year season, we offer you a chance to donate to something much bigger. By becoming a Conservancy Sustainer, you can put
 
your money to work fighting for the freedom and rights of all software
...
 
@@ -215,3 +215,3 @@ users.</p>
 
  <img src="/img/scaled-LLW-2015-Conservancy-Supporters-by-Carlo-Piana-CC-0.jpg" alt="Zack, Karen, John and Jim pose, mostly wearing the vintage t-shirt!" />
 
  <p>Vintage-shirt-wearing Supporters pose with Karen! <br/>From left: Stefano &ldquo;Zack&rdquo; Zacchiroli, Karen M. Sandler, John Sullivan, and Jim Wright</p>
 
  <p>Vintage-shirt-wearing Sustainers pose with Karen! <br/>From left: Stefano &ldquo;Zack&rdquo; Zacchiroli, Karen M. Sandler, John Sullivan, and Jim Wright</p>
 
</div>
...
 
@@ -221,6 +221,6 @@ users.</p>
 

	
 
<p>If you're a Supporter, you've already received or will soon receive a
 
<p>If you're a Sustainer, you've already received or will soon receive a
 
  t-shirt in our 2018 design shown here.   But,
 
would you like to take advantage of a last chance to get our vintage design &mdash; seen sported so often
 
by <a href="https://twitter.com/bensturmfels/status/599118574641262592">our earliest Supporters</a> at <a href="https://twitter.com/conservancy/status/786480068512002048">conferences and events</a>?  If so, read on!</p>
 
by <a href="https://twitter.com/bensturmfels/status/599118574641262592">our earliest Sustainers</a> at <a href="https://twitter.com/conservancy/status/786480068512002048">conferences and events</a>?  If so, read on!</p>
 

	
...
 
@@ -234,3 +234,3 @@ by <a href="https://twitter.com/bensturmfels/status/599118574641262592">our earl
 

	
 
<p>But first, as a note to how difficult this year has been, we know that many of our 2019 Supporters are still
 
<p>But first, as a note to how difficult this year has been, we know that many of our 2019 Sustainers are still
 
awaiting their t-shirts, which have the wonderful 2018 design.   We've had difficulty working through
...
 
@@ -238,3 +238,3 @@ keeping our staff safe during the pandemic lock downs and making trips to the po
 
we on staff all shared the post office trips, but we all have different COVID-19 risk factors and thus it's all moving
 
slowly.  We appreciate the patience of our Supporters waiting for t-shirts, and we do have plan to safely send out
 
slowly.  We appreciate the patience of our Sustainers waiting for t-shirts, and we do have plan to safely send out
 
the backlog by years' end.</p>
...
 
@@ -242,4 +242,4 @@ the backlog by years' end.</p>
 
<p>As part of those preparations, we found a treasure trove and now have an exciting promotion for renewing
 
Supporters.  We found an old stash of <strong>vintage t-shirts</strong>, in the old style!  Supplies are limited,
 
but for those few supporters who would like to receive one, we have a special offer.  Supporters who give
 
Sustainers.  We found an old stash of <strong>vintage t-shirts</strong>, in the old style!  Supplies are limited,
 
but for those few sustainers who would like to receive one, we have a special offer.  Sustainers who give
 
$256 or more between 2020-01-15 and 2021-01-15 can receive one of these vintage t-shirts!  To claim your vintage t-shirt, do the following:
...
 
@@ -252,3 +252,3 @@ $256 or more between 2020-01-15 and 2021-01-15 can receive one of these vintage
 
    <ul>
 
    <li>Renew as a <a href="/supporter/#annual">an annual supporter</a> for $256 or more. (Alternatively, if
 
    <li>Renew as a <a href="/sustainer/#annual">an annual sustainer</a> for $256 or more. (Alternatively, if
 
      you already gave this year, make a <a href="/donate/">separate donation</a> so that your 2020 total is $256.)</li>
www/conservancy/urls.py
Show inline comments
...
 
@@ -54,3 +54,3 @@ urlpatterns = [
 
    url(r'^privacy-policy', static_views.index),
 
    url(r'^supporter', include('conservancy.apps.supporter.urls')),
 
    url(r'^sustainer', include('conservancy.apps.supporter.urls')),
 
    url(r'^fundraiser_data', fundgoal_views.view),
0 comments (0 inline, 0 general)