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

Rename "supporter" to "sustainer" in templates and URLs.

Browse source 
Does not rename the models.
This commit is contained in:
Ben Sturmfels 2021-10-15 11:23:42 +11:00 committed by Bradley M. Kuhn
parent 81bc61fdf8
commit bde54db0c4
20 changed files with 91 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/conservancy/static/copyleft-compliance/about.html
View file

@ -4,7 +4,7 @@
{% block content %}
<h1 id="ourwork">Conservancy's Copyleft Compliance Projects</h1>
<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
helps people take control of their computing by growing the software
freedom movement, supporting community-driven alternatives to proprietary
@ -37,7 +37,7 @@ compliance actions.</p>
and "the scripts used to control compilation and installation of the
executable".</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
strategic plan for GPL enforcement</a> and its companion
project, <a href="/copyleft-compliance/firmware-liberation.html">our
@ -149,7 +149,7 @@ Conservancy should contact <a href="mailto:debian-services@sfconservancy.org">&l
<p>Finally, Conservancy welcomes <a href="#donate-box"
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>
</div>
{% endblock %}

2
www/conservancy/static/copyleft-compliance/enforcement-strategy.html
View file

@ -5,7 +5,7 @@
<h1 id="strategic-gpl-enforcement-initiative">The Strategic GPL Enforcement Initiative</h1>
<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
helps people take control of their computing by growing the software
freedom movement, supporting community-driven alternatives to proprietary

8
www/conservancy/static/copyleft-compliance/vmware-lawsuit-appeal.html
View file

@ -15,8 +15,8 @@
we <a href="/news/2016/aug/09/vmware-appeal/">announced that Christoph
would appeal the lower court's ruling</a>.</p>
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>
@ -85,7 +85,7 @@ software communities alike.</p>
Please <a href="#donate-box" class="donate-now">donate</a> to our campaign to enforce the GPL. Help Conservancy
increase its number of individual donors, so we have clear evidence to show
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>
@ -101,7 +101,7 @@ information</a>.)</p>
to announce that we already reached an anonymous match for this campaign, where every dollar donated
was matched up to $50,000. However, that $100,000 is just an initial step
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>
<h3>Want To Know More?</h3>

2
www/conservancy/static/copyleft-compliance/vmware-lawsuit-faq.html
View file

@ -656,7 +656,7 @@ enforce the GPL regarding the primary issue in this case.</dd>
support to proceed with this litigation</a>. Litigation costs are
unpredictable, and this lawsuit may take years to resolve. Conservancy is
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
donate now. And, if you make a public statement of support, please email the
URL

6
www/conservancy/static/donate/index.html
View file

@ -9,11 +9,11 @@
public to continue its work. Please give generously to support
Conservancy’s work.</p>
<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>
<p>But, there are many other great ways to donate to Conservancy as

4
www/conservancy/static/npoacct/index.html
View file

@ -29,8 +29,8 @@
</form>
<!-- PayPal end -->
<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>
</td></tr></table>
</div>

8
www/conservancy/static/privacy-policy/index.html
View file

@ -11,7 +11,7 @@
<p>This Privacy Statement applies to all information collected by or submitted to Conservancy, including personal data. &ldquo;Personal data&rdquo; is data that can be used to identify an individual.</p>
<p>Conservancy collects personal data when:</p>
<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>
<li>you use one of Conservancy&rsquo;s Mailman sites or lists, hosted at lists.sfconservancy.org or lists.copyleft.org;</li>
<li>you use one of Conservancy&rsquo;s Kallithea sites or repositories, hosted at k.sfconservancy.org or k.copyleft.org;</li>
@ -21,7 +21,7 @@
<li>you participate in surveys and evaluations;</li>
<li>you submit questions or comments to us.</li>
</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>
<p>When you subscribe or post to a Mailman mailing list, Mailman will collect your email address and (optionally) name. When you post to a list, Mailman will additionally archive all the information in your email, including all headers, which typically include your IP address.</p>
<p>When you create an account on a Kallithea site, it collects your email address for authentication. In may also collect your name (to identify your contributions to others) and your SSH public key (optional - to authenticate you when you push changes to source repositories).</p>
@ -58,12 +58,12 @@
<ul>
<li>To attribute your contributions to mailing lists, source repositories, Etherpads, wikis, and IRC channels.</li>
<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>
<li>For research activities, including the production of statistical reports (such aggregated information is used to describe our services and is not used to contact the subjects of the report).</li>
</ul>
<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>
<p>Conservancy may send you e-mail to authorize accounts you create on our sites, to inform you of important upcoming Conservancy events, to send occasional solicitations in connection with our donor programs as described above or in response to your questions. For your protection, Conservancy may contact you in the event that we find an issue that requires your immediate attention. Conservancy processes your personal data in these cases to fulfill and comply with its contractual obligations to you, to provide the services you have requested, and to ensure the security of your account.</p>
<h2>Cookies and Other Browser Information</h2>

2
www/conservancy/static/projects/apply/index.html
View file

@ -268,7 +268,7 @@ form their own independent tax-exempt 501(c)(3) non-profit.</p>
have more income and therefore need more attention from staff. Even now,
the 10% we receive from our project does not fully fund our fiscal
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>
<p>We do understand that, particularly for small projects that only receive a

0
www/conservancy/static/supporter/event.html → www/conservancy/static/sustainer/event.html
View file

4
www/conservancy/static/supporter/original-supporter-appeal.html → www/conservancy/static/sustainer/original-supporter-appeal.html
View file

@ -131,7 +131,7 @@ internal policies</a> are published and available for scrutiny.</p>
<a id="annual"></a>
<form id="annual" class="supporter-form" action="https://www.paypal.com/cgi-bin/webscr" method="post" name="supporter">
<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" />
<input type="hidden" name="business" value="supporter@sfconservancy.org" />
<input type="hidden" name="item_name" value="Conservancy Supporter, Annual" />
@ -190,7 +190,7 @@ internal policies</a> are published and available for scrutiny.</p>
<div class="supporter-form-inputs">
<input type="hidden" name="business" value="supporter@sfconservancy.org" />
<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">
<input id="no_shipping" type="hidden" name="no_shipping" value="0" />
<input type="hidden" name="lc" value="US">

0
www/conservancy/static/supporter/thank-you-event.html → www/conservancy/static/sustainer/thank-you-event.html
View file

18
www/conservancy/static/supporter/thank-you.html → www/conservancy/static/sustainer/thank-you.html
View file

@ -1,6 +1,6 @@
{% extends "base_conservancy.html" %}
{% block subtitle %}Thanks for Your Support - {% endblock %}
{% block category %}supporter{% endblock %}
{% block category %}sustainer{% endblock %}
{% block head %}
<link href="/jquery-ui.css" rel="stylesheet" type="text/css"/>
@ -8,10 +8,10 @@
{% block content %}
<h1>Thanks!</h1>
<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
by <a href="mailto:rsvp-lfnw@sfconservancy.org">email to
&lt;rsvp-lfnw@sfconservancy.org&gt;</a>. Let us know any dietary
@ -19,23 +19,23 @@
event is.</p>
-->
<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>
<p><strong>Copy and paste this HTML for the image above:</strong></p>
<p><textarea rows="2"
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
styles: <a href="/img/supporter-card-1.svg">Style 1
(SVG)</a>, <a href="/img/supporter-card-2.svg">Style 2

4
www/conservancy/templates/base_compliance.html
View file

@ -18,8 +18,8 @@
<p>
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>
</td></tr></table>
</div>

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

@ -27,7 +27,7 @@
{% block head %}{% endblock %}
</head>
<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;">
<div class="w-70-ns">
<h1 id="conservancyheader">
@ -47,7 +47,7 @@
<div id="navbar-outer">
<div id="navbar">
<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>
<li class="blog"><a href="/blog/">Blog</a></li>
<li class="Projects"><a href="/projects/">Projects</a></li>
@ -71,7 +71,7 @@
* 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: 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.)
* sitefundgoal_endtime: DateTime when sitefundgoal ends.
@ -90,8 +90,8 @@
<div class="fundraiser-top-text">
<p>
{% 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 %}
{% if sitefundgoal_timeleft.total_seconds <= 0 %}
The
@ -104,14 +104,14 @@
{% else %}
Until January 15, the
{% 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!
{% endif %}
</p>
{% if sitefundgoal.fundraiser_so_far_amount %}
<div id="siteprogressbar">
<a href="/supporter">
<a href="/sustainer">
We've matched
{% if this_match_remaining <= 0 %}
$<span id="site-fundraiser-match-count">{{ this_match_goal|intcomma }}</span>

2
www/conservancy/templates/frontpage.html
View file

@ -105,7 +105,7 @@
<!-- <h2>Support Conservancy</h2>
<p>As a 501(c)(3) non-profit charity, Conservancy relies on
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!
</p>

16
www/conservancy/templates/sponsors.html
View file

@ -7,7 +7,7 @@
{% block content %}
<h1>Conservancy's Sponsors &amp; Supporters</h1>
<h1>Conservancy's Sponsors &amp; Sustainers</h1>
<p>Conservancy relies on donations from the general public to support its
work, and asks everyone <a href="/donate">to donate generously</a>.
@ -47,15 +47,15 @@ any of its sponsors.</p>
<br/>
<hr/>
<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>
{% for ss in supporters %}
<li>{{ ss.display_name|safe }}</li>

16
www/conservancy/templates/supporter/banners.html
View file

@ -1,17 +1,17 @@
{% extends "base_conservancy.html" %}
{% block subtitle %}Supporter Banners - {% endblock %}
{% block category %}supporter{% endblock %}
{% block subtitle %}Sustainer Banners - {% endblock %}
{% block category %}sustainer{% endblock %}
{% block content %}
<div class="singleColumn">
<h2>Conservancy Supporter Banners</h2>
<h2>Conservancy Sustainer Banners</h2>
<p>Help support Conservancy even more by sharing a banner on your own page and encourage other people to join you! We have banners for individuals and member projects below; just copy the code for the version you want into your own site.</p>
<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%;"
src="https://sfconservancy.org/img/banners/2019-individuals-banner.png"
alt="Conservancy is a proponent for community driven free software projects.
@ -21,7 +21,7 @@
</code></pre>
<div style="margin: 0 auto; max-width: 1200px;">
<a href="https://sfconservancy.org/supporter">
<a href="https://sfconservancy.org/sustainer">
<img style="width: 100%;"
src="/img/banners/2019-individuals-banner.png"
alt="Conservancy is a proponent for community driven free software projects.
@ -32,7 +32,7 @@
<h3>Member Project 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%;"
src="https://sfconservancy.org/img/banners/2019-member-projects-banner.png"
alt="Conservancy helps make our work possible.
@ -42,7 +42,7 @@
</code></pre>
<div style="margin: 0 auto; max-width: 1200px;">
<a href="https://sfconservancy.org/supporter">
<a href="https://sfconservancy.org/sustainer">
<img style="width: 100%;"
src="/img/banners/2019-member-projects-banner.png"
alt="Conservancy helps make our work possible.

22
www/conservancy/templates/supporter/form_partial.html
View file

@ -28,23 +28,23 @@ This partial accepts these optional parameters:
{% with supptype=supptype|default:form_id article=article|default:"a" verb=verb|default:"join" default_amt=default_amt|default:min_amt partial_amt=partial_amt|default:0 %}
<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>
<p class="prolog"><span>Note:</span>
{% 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
the shirt) until you've paid at least
{# Six months of payments #}
${{ min_amt|add:min_amt|add:min_amt|add:min_amt|add:min_amt|add:min_amt }}.
{% 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.
{% endif %}
</p>
@ -54,11 +54,11 @@ This partial accepts these optional parameters:
data-upgrade-from-amount="{{ partial_amt }}">
<div class="supporter-form-inputs">
<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">
<input type="hidden" name="no_shipping" value="0">
<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 %}"
>
<div class="supporter-form-input">
@ -81,7 +81,7 @@ This partial accepts these optional parameters:
{% endif %}
</div>
<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>
</div>
@ -132,7 +132,7 @@ This partial accepts these optional parameters:
<div class="supporter-form-input">
<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">
<input type="radio" tabindex="40" checked="checked" name="on1" value="publicAckYes">Yes
<input type="radio" tabindex="40" name="on1" value="publicAckNo">No
@ -153,7 +153,7 @@ This partial accepts these optional parameters:
<input type="image" name="submit" tabindex="60"
src="/img/supporter-payment-button-{{ form_id }}.png"
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
method and finish this process. Please double-check your selections
first.</p>

46
www/conservancy/templates/supporter/index.html
View file

@ -1,11 +1,11 @@
{% extends "base_conservancy.html" %}
{% block subtitle %}Support Conservancy - {% endblock %}
{% block category %}supporter{% endblock %}
{% block category %}sustainer{% endblock %}
{% block head %}
<script type="text/javascript" src="/js/supporter-page.js"></script>
<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' %}
{% endblock %}
@ -16,17 +16,17 @@
<div id="donate-box" class="toggle-unit"><h1 class="toggle-content">Support
Now!</h1></div>
<h3 class="donate-box-highlight">Become a Supporter Now:</h3>
<h3 class="donate-box-highlight">Become a Sustainer Now:</h3>
<p>Support us now!</p>
<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>
<div class="toggle-content">
Contact <a href="mailto:donate@sfconservancy.org">Conservancy
@ -36,15 +36,15 @@
</div><!-- /.toggle.unit -->
<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>
<div class="toggle-content">
Send paper check for $120 to:<br/>
Software Freedom Conservancy, Inc.<br/>
137 MONTAGUE ST STE 380<br/>
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 -->
</div><!-- /.toggle.unit -->
@ -53,14 +53,14 @@
</td></tr></table>
</div>
<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>
{% if partial_amount > 0 %}
{% include "supporter/form_partial.html" with form_id="annual" min_amt=minimum_amount partial_amt=partial_amount article="an" only %}
{% else %}
<div class="supporter-type-selector">
<strong>Become a Supporter Now:</strong>
<strong>Become a Sustainer Now:</strong>
<a id="annualSelector" href="#annual">Annual</a>
| <a id="monthlySelector" href="#monthly">Monthly</a>
| <a id="renewalSelector" href="#renewal">Annual Renew</a>
@ -207,22 +207,22 @@ even have called us scrappy) precisely because we have the most experienced
non-profit management team in FOSS. We couldn&rsquo;t have predicted the
pandemic, but we did plan for the worst. We&rsquo;re frugal, careful, and we plan ahead, so you can know that every
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
users.</p>
<div class="picture-small right">
<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>
<h3 id="VintageT">Vintage T-Shirt Promotion</h3>
<div data-read-more="Would you like a last chance to receive a vintage Conservancy t-shirt? Find out how&hellip;">
<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>
<div class="picture-tiny left">
<img src="/img/brett-in-2018-shirt.jpg" alt="Brett wears the 2018 t-shirt!" />
@ -232,16 +232,16 @@ by <a href="https://twitter.com/bensturmfels/status/599118574641262592">our earl
<p><strong>UPDATE: Just give $256 total for this year's fundraiser and
receive an additional vintage T-shirt!</strong></p>
<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
keeping our staff safe during the pandemic lock downs and making trips to the post office &mdash; historically,
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>
<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:
<div class="picture-tiny right">
@ -250,7 +250,7 @@ $256 or more between 2020-01-15 and 2021-01-15 can receive one of these vintage
</div>
<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>
<li> <a href="mailto:vintaget@sfconservancy.org">Email &lt;vintaget@sfconservancy.org&gt;</a> and include the email
address and date(s) of your donation(s) that total $256 and your

2
www/conservancy/urls.py
View file

@ -52,6 +52,6 @@ urlpatterns = [
url(r'^contractpatch', include('conservancy.apps.contractpatch.urls')),
url(r'^overview', static_views.index),
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),
]