October 2021 - tor-commits - lists.torproject.org

[donate-static/master] Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 3fc3ea26a065792644e8a443ce617e19817757fc Merge: 14ccb84a e11a0007 Author: gus <gus(a)torproject.org> Date: Mon Jun 28 17:07:57 2021 -0300 Merge remote-tracking branch 'gitlab/kez-donate-form-pages' into staging content/champions-of-privacy/contents.lr | 4 +-- content/contents.lr | 4 +-- content/cryptocurrency/contents.lr | 5 +--- content/donate-thank-you/contents.lr | 4 +-- content/donor-faq/contents.lr | 4 +-- content/monthly-giving/contents.lr | 4 +-- content/privacy-policy/contents.lr | 4 +-- content/state-disclosures/contents.lr | 4 +-- models/donate-form.ini | 6 +---- models/donate-page.ini | 4 --- templates/donate-empty.html | 3 ++- templates/donate-form.html | 3 +++ templates/homepage.html | 1 + templates/layout.html | 10 +++----- templates/meta.html | 43 ++++++++++++++++---------------- templates/page.html | 2 +- 16 files changed, 41 insertions(+), 64 deletions(-) diff --cc templates/donate-form.html index 7c95ab30,e2f8bd67..cfacc90d --- a/templates/donate-form.html +++ b/templates/donate-form.html @@@ -196,9 -197,6 +198,10 @@@ } ); } -</script> + + if ((window.location.protocol == "https:") || (`{{ envvars('ENV') }}` == 'dev')) { + window.reactComponents[0].props.paymentMethods.push('credit-card'); + } + </script> <script type="text/javascript" src="{{ '/static/gen/donate.js' | asseturl }}"></script> + {% endblock %}

1 0

[donate-static/master] Move the /state-disclosures page to markdown
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 26e67a631d5f7528bb999ac36934c6515cff04cc Author: kez <kez(a)torproject.org> Date: Wed Jun 30 00:43:34 2021 -0400 Move the /state-disclosures page to markdown See: tpo/web/donate-static#34 --- content/state-disclosures/contents.lr | 61 ++++++++++++++++++----------------- models/state-disclosures.ini | 9 ++++++ templates/state-disclosures.html | 18 +++++++++++ 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr index 4085d0b3..c7ba8fdb 100644 --- a/content/state-disclosures/contents.lr +++ b/content/state-disclosures/contents.lr @@ -1,6 +1,6 @@ -_model: donate-page +_model: state-disclosures --- -_template: donate-empty.html +_template: state-disclosures.html --- section_id: donate --- @@ -8,33 +8,34 @@ section: Donate --- title: State Disclosures --- +preamble: Certain states require written disclosures for nonprofit organizations soliciting contributions. Individual state disclosures are below. +--- body: -<div class="fixed-width"> - <div class="state-disclosures"> - <div class="preamble"> - <p>Certain states require written disclosures for nonprofit organizations soliciting contributions. Individual state disclosures are below.</p> - </div> - <p><b>Florida</b>: a copy of the official registration and financial information may be obtained from the division of consumer services by calling toll-free, within the state, 1-800-435-7352 (800-HELP-FLA), or visiting www.FloridaConsumerHelp.com. Registration does not imply endorsement, approval, or recommendation by the state. Florida Registration #CH58356</p> - <p><b>Georgia</b>: A full and fair description of our programs and our financial statement summary is available upon request at The Tor Project, Inc.; 217 First Avenue South #4903; Seattle, WA 98194 and phone number 206-420-3136.</p> - <p><b>Maryland</b>: For the cost of copies and postage, from the Office of the Secretary of State, State House, Annapolis, MD 21401.</p> - <p><b>Nevada</b>: Contributions may be tax deductible pursuant to the provisions of sec. 170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c).</p> - <p><b>New Jersey</b>: Information filed with the attorney general concerning this charitable solicitation and the percentage of contributions received by the charity during the last reporting period that were dedicated to the charitable purpose may be obtained from the attorney general of the state of New Jersey by calling (973) 504-6215 and is available on the internet at <a href="https://www.state.nj.us/lps/ca/charfrm.htm" target="_blank" class="hyperlinks links">www.state.nj.us/lps/ca/charfrm.htm</a>. Registration with the attorney general does not imply endorsement.</p> - <p><b>New York</b>: Upon request, from the Attorney General's Charities Bureau, 28 Liberty Street, New York, NY 10005, 1-212-416-8686 or <a href="https://www.charitiesnys.com" target="_blank" class="hyperlinks links">www.charitiesnys.com</a>.</p> - <p><b>North Carolina</b>: Financial information about this organization and a copy of its license are available from the State Solicitation Licensing Branch at 1-919-814-5400. The license is not an endorsement by the state.</p> - <p><b>Pennsylvania</b>: The official registration and financial information of The Tor Project, Inc. may be obtained from the Pennsylvania Department of State by calling toll-free, within Pennsylvania, 1-800-732-0999.</p> - <p><b>Virginia</b>: From the State Office of Consumer Affairs in the Department of Agriculture and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218.</p> - <p><b>Washington</b>: From the Secretary of State at 1-800-332-4483 or <a href="http://www.sos.wa.gov/charities" target="_blank" class="hyperlinks links">http://www.sos.wa.gov/charities/</a></p> - <p><b>West Virginia</b>: West Virginia residents may obtain a summary of the registration and financial documents from the Secretary of State, State Capitol, Charleston, WV 25305.</p> - <p><b>Wisconsin</b>: A financial statement of the charitable organization disclosing assets, liabilities, fund balances, revenue and expenses for the preceding fiscal year will be provided to any person upon request.</p> - <h4>Registration with a state agency does not constitute or imply endorsement, approval or recommendation by that state.</h4> - <p>More information about <a href="http://www.labyrinthinc.com/charity-resources/nonprofit-regulations/fundrai…" target="_blank" class="hyperlinks links">state disclosure verbiage</a> and <a href="http://www.labyrinthinc.com/charity-resources/annual-charitable-state-regis…" target="_blank" class="hyperlinks links">charitable state registrations</a>.</p> - <hr/> - <div class="button-line"> - <a class="purple button" href="../donor-faq">Back to Donate FAQ</a> - </div> - <div class="button-line"> - <a class="purple button" href="../">Back to Donate Page</a> - </div> - </div> -</div> +**Florida**: a copy of the official registration and financial information may be obtained from the division of consumer services by calling toll-free, within the state, 1-800-435-7352 (800-HELP-FLA), or visiting [www.FloridaConsumerHelp.com](www.FloridaConsumerHelp.com "" target="_blank" rel="noopener"). Registration does not imply endorsement, approval, or recommendation by the state. Florida Registration #CH58356 + +**Georgia**: A full and fair description of our programs and our financial statement summary is available upon request at The Tor Project, Inc.; 217 First Avenue South #4903; Seattle, WA 98194 and phone number 206-420-3136. + +**Maryland**: For the cost of copies and postage, from the Office of the Secretary of State, State House, Annapolis, MD 21401. + +**Nevada**: Contributions may be tax deductible pursuant to the provisions of sec. 170(c) of the Internal Revenue Code of 1986, 26 U.S.C. ¤170(c). + +**New Jersey**: Information filed with the attorney general concerning this charitable solicitation and the percentage of contributions received by the charity during the last reporting period that were dedicated to the charitable purpose may be obtained from the attorney general of the state of New Jersey by calling (973) 504-6215 and is available on the internet at [https://www.state.nj.us/lps/ca/charfrm.htm](https://www.state.nj.us/lps/ca/… "" target="_blank" rel="noopener" class="hyperlinks links"). Registration with the attorney general does not imply endorsement. + +**New York**: Upon request, from the Attorney General's Charities Bureau, 28 Liberty Street, New York, NY 10005, 1-212-416-8686 or [www.charitiesnys.com](https://www.charitiesnys.com "" target="_blank" class="hyperlinks links"). + +**North Carolina**: Financial information about this organization and a copy of its license are available from the State Solicitation Licensing Branch at 1-919-814-5400. The license is not an endorsement by the state. + +**Pennsylvania**: The official registration and financial information of The Tor Project, Inc. may be obtained from the Pennsylvania Department of State by calling toll-free, within Pennsylvania, 1-800-732-0999. + +**Virginia**: From the State Office of Consumer Affairs in the Department of Agriculture and Consumer Affairs, P.O. Box 1163, Richmond, VA 23218. + +**Washington**: From the Secretary of State at 1-800-332-4483 or [http://www.sos.wa.gov/charities/](http://www.sos.wa.gov/charities "" target="_blank" class="hyperlinks links") + +**West Virginia**: West Virginia residents may obtain a summary of the registration and financial documents from the Secretary of State, State Capitol, Charleston, WV 25305. + +**Wisconsin**: A financial statement of the charitable organization disclosing assets, liabilities, fund balances, revenue and expenses for the preceding fiscal year will be provided to any person upon request. + +#### Registration with a state agency does not constitute or imply endorsement, approval or recommendation by that state. + +More information about [state disclosure verbiage](http://www.labyrinthinc.com/charity-resources/nonprofit-regulatio… "" class="hyperlinks links" target="_blank" rel="noopener") and [charitable state registrations](http://www.labyrinthinc.com/charity-resources/annual-charita… "" class="hyperlinks links" target="_blank" rel="noopener"). diff --git a/models/state-disclosures.ini b/models/state-disclosures.ini new file mode 100644 index 00000000..e4f9516d --- /dev/null +++ b/models/state-disclosures.ini @@ -0,0 +1,9 @@ +[model] +name = Donate Page +label = {{ this.title }} +inherits = donate-page + +[fields.preamble] +label = Preamble +type = markdown +translate = True \ No newline at end of file diff --git a/templates/state-disclosures.html b/templates/state-disclosures.html new file mode 100644 index 00000000..ac8fc4ee --- /dev/null +++ b/templates/state-disclosures.html @@ -0,0 +1,18 @@ +{% extends "donate-empty.html" %} +{% block donate_content %} +<div class="fixed-width"> + <div class="state-disclosures"> + <div class="preamble"> + {{ this.preamble }} + </div> + {{ this.body }} + <hr/> + <div class="button-line"> + <a class="purple button" href="../donor-faq">Back to Donate FAQ</a> + </div> + <div class="button-line"> + <a class="purple button" href="../">Back to Donate Page</a> + </div> + </div> +</div> +{% endblock %}

1 0

[donate-static/master] Fix crypto page template not displaying crypto addresses
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 2a45990cc2bdf5e12f6ee780e29829729045f669 Author: kez <kez(a)torproject.org> Date: Tue Jun 29 15:24:51 2021 -0400 Fix crypto page template not displaying crypto addresses --- content/cryptocurrency/contents.lr | 4 ++-- models/crypto-page.ini | 9 +++++++++ templates/cryptocurrency.html | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr index c49fd436..8b2d10e7 100644 --- a/content/cryptocurrency/contents.lr +++ b/content/cryptocurrency/contents.lr @@ -1,6 +1,6 @@ -_model: donate-page +_model: crypto-page --- -_template: donate-empty.html +_template: cryptocurrency.html --- title: Cryptocurrency --- diff --git a/models/crypto-page.ini b/models/crypto-page.ini new file mode 100644 index 00000000..4e4d7c84 --- /dev/null +++ b/models/crypto-page.ini @@ -0,0 +1,9 @@ +[model] +name = Donate Page +label = {{ this.title }} +inherits = donate-page + +[fields.body] +label = Body +type = html +translate = False \ No newline at end of file diff --git a/templates/cryptocurrency.html b/templates/cryptocurrency.html index d0715784..c7a13d03 100644 --- a/templates/cryptocurrency.html +++ b/templates/cryptocurrency.html @@ -1,3 +1,4 @@ +{% extends "layout.html" %} {% block content %} <div class="cryptocurrency"> <div class="payment-other-div container">

1 0

[donate-static/master] Move the /privacy-policy page to markdown
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit b74dea7597f56de8ba7f487287ab44876fc802f5 Author: kez <kez(a)torproject.org> Date: Wed Jun 30 00:57:29 2021 -0400 Move the /privacy-policy page to markdown See: tpo/web/donate-static#34 --- content/privacy-policy/contents.lr | 25 ++++++++++++------------- templates/privacy-policy.html | 10 ++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index ce626881..b55ef355 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -1,6 +1,6 @@ _model: donate-page --- -_template: donate-empty.html +_template: privacy-policy.html --- title: Donor Privacy Policy --- @@ -12,15 +12,14 @@ color: primary --- body: -<div class="privacy-policy"> - <p>The Tor Project respects donor privacy and welcomes anonymous donations. If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information.</p> - <p>If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. We recommend you familiarize yourself with their <a href="https://www.paypal.com/webapps/mpp/ua/privacy-full">policies</a>, especially if you have privacy concerns.</p> - <p>When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. We may also learn incidental data such as the date and time of your donation. The Tor Project will never have access to your financial data, such as your credit card information. We aim to be careful with your information.</p> - <p>If you have provided your email address, we will email you once to thank you and give you a receipt. If you opt in during the donation process, we may email you again in future. If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in <a href="https://www.irs.gov/pub/irs-pdf/f990ezb.pdf">Schedule B of the Form 990</a>. But, that information is redacted from the publicly-available version of our Form 990. We will never publicly identify you as a donor without your permission.</p> - <p>We do not publish, sell, trade, or rent any information about you. For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt.</p> - <p><strong>The Tor Project very much appreciates all its donors. Thank you for supporting Tor.</strong></p> -</div> -<hr> -<div class="button-line"> - <a class="purple button" href="../">Back to Donate Page</a> -</div> +The Tor Project respects donor privacy and welcomes anonymous donations. If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information. + +If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. We recommend you familiarize yourself with their [policies](https://www.paypal.com/webapps/mpp/ua/privacy-full "" target="_blank" rel="noopener"), especially if you have privacy concerns. + +When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. We may also learn incidental data such as the date and time of your donation. The Tor Project will never have access to your financial data, such as your credit card information. We aim to be careful with your information. + +If you have provided your email address, we will email you once to thank you and give you a receipt. If you opt in during the donation process, we may email you again in future. If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in [Schedule B of the Form 990](https://www.irs.gov/pub/irs-pdf/f990ezb.pdf "" target="_blank" rel="noopener"). But, that information is redacted from the publicly-available version of our Form 990. We will never publicly identify you as a donor without your permission. + +We do not publish, sell, trade, or rent any information about you. For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt. + +**The Tor Project very much appreciates all its donors. Thank you for supporting Tor.** diff --git a/templates/privacy-policy.html b/templates/privacy-policy.html new file mode 100644 index 00000000..ac851092 --- /dev/null +++ b/templates/privacy-policy.html @@ -0,0 +1,10 @@ +{% extends "donate-empty.html" %} +{% block donate_content %} +<div class="privacy-policy"> + {{ this.body }} +</div> +<hr> +<div class="button-line"> + <a class="purple button" href="../">Back to Donate Page</a> +</div> +{% endblock %}

1 0

[donate-static/master] Move the /champions-of-privacy page to markdown
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit b835a137976967a398524f90b1f273f000a59df2 Author: kez <kez(a)torproject.org> Date: Wed Jun 30 02:52:32 2021 -0400 Move the /champions-of-privacy page to markdown See: tpo/web/donate-static#34 --- content/champions-of-privacy/contents.lr | 27 ++++++++++++++------------- models/champions-of-privacy.ini | 13 +++++++++++++ templates/champions-of-privacy.html | 10 ++++++++++ templates/donate-form.html | 2 +- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index 254bc59b..959a1aff 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -1,8 +1,8 @@ -_model: donate-form +_model: champions-of-privacy --- frequency: single --- -_template: donate-form.html +_template: champions-of-privacy.html --- body: --- @@ -12,17 +12,18 @@ title: Champions of Privacy --- intro: -<div class="mx-auto fixed-width col-7"> - <p></p> - <p>Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online.</p> - <p>As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor.</p> - <p>We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all.</p> - <p>We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today.</p> - <div class="text-center"> - <h4><a class="hyperlinks links" href="../monthly-giving">Join with a monthly gift of $84 per month, or more.</a></h4> - <h4><a class="hyperlinks links" href="../cryptocurrency">Join with cryptocurrency.</a></h4> - </div> -</div> +Champions of Privacy make a significant pledge of $1,000 or more—creating a steady, reliable source of funds to help us be agile in our defense against the growing threats to privacy, freedom of expression, and access to information online. + +As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor. + +We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all. + +We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today. +--- +footer: + +#### [Join with a monthly gift of $84 per month, or more.](../monthly-giving "" class="hyperlinks links" target="_blank" rel="noopener") +#### [Join with cryptocurrency.](../cryptocurrency "" class="hyperlinks links" target="_blank" rel="noopener") --- single_one: 100000 --- diff --git a/models/champions-of-privacy.ini b/models/champions-of-privacy.ini new file mode 100644 index 00000000..45df20ef --- /dev/null +++ b/models/champions-of-privacy.ini @@ -0,0 +1,13 @@ +[model] +name = Donate Page +label = {{ this.title }} +inherits = donate-form + +[fields.intro] +label = Intro +type = markdown + +[fields.footer] +label = Footer +type = markdown +translate = True \ No newline at end of file diff --git a/templates/champions-of-privacy.html b/templates/champions-of-privacy.html new file mode 100644 index 00000000..a7b36ad1 --- /dev/null +++ b/templates/champions-of-privacy.html @@ -0,0 +1,10 @@ +{% extends "donate-form.html" %} +{% block donate_form_intro %} +<div class="mx-auto fixed-width col-7"> + <br> + {{ this.intro }} + <div class="text-center"> + {{ this.footer }} + </div> +</div> +{% endblock %} diff --git a/templates/donate-form.html b/templates/donate-form.html index cfacc90d..67fac7cf 100644 --- a/templates/donate-form.html +++ b/templates/donate-form.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %} <div> - {{ this.intro }} + {% block donate_form_intro %}{{ this.intro }}{% endblock %} </div> <div class="donate-form"> <div id="campaign-totals-area"></div>

1 0

[donate-static/master] Move the index page to markdown
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit cda2b9e4aa2b44a8b95ff6ce8fcb0a72286cfa6f Author: kez <kez(a)torproject.org> Date: Fri Jul 9 16:50:36 2021 -0400 Move the index page to markdown --- content/contents.lr | 6 +++--- templates/index-page.html | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 27fbefc5..609582ad 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -10,13 +10,13 @@ section_id: donate --- title: Donate --- -_template: donate-form.html +_template: index-page.html --- intro: -<p class="text-center mt-3 py-3 border"><a title="Champions of Privacy" href="champions-of-privacy">Donate more than $1000 and become a Champion of Privacy!</a></p> -<p class="text-center mt-3 py-3 border"><a title="Cryptocurrency" href="cryptocurrency">Want to donate cryptocurrency?</a></p> +[Donate more than $1000 and become a Champion of Privacy!](champions-of-privacy "Champions of Privacy") +[Want to donate cryptocurrency?](cryptocurrency "Cryptocurrency") --- monthly_five: 10000 --- diff --git a/templates/index-page.html b/templates/index-page.html new file mode 100644 index 00000000..cdce88ac --- /dev/null +++ b/templates/index-page.html @@ -0,0 +1,12 @@ +{% extends "donate-form.html" %} +{% block donate_form_intro %} +{% for paragraph in this.intro.source.split('\n') %} + {% if paragraph|trim() != "" %} + {# `paragraph|markdown` will render the markdown in an additional set of <p> tags. + we need to trim whitespace, remove the opening and closing tags + (the `[3:-4]` slice drops the first 3 and last 4 characters), + and finally mark it as safe so the html isn't escaped #} + <p class="text-center mt-3 py-3 border">{{ (paragraph|markdown|trim)[3:-4]|safe }}</p> + {% endif %} + {% endfor %} +{% endblock %}

1 0

[donate-static/master] Move the monthly giving page to markdown
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 03b157744905bd8150cd418583c99c95765b3f2c Author: kez <kez(a)torproject.org> Date: Fri Jul 2 14:52:36 2021 -0400 Move the monthly giving page to markdown Change the donate-form model to markdown so that the field renders correctly See: tpo/web/donate-static#37 --- content/monthly-giving/contents.lr | 19 ++++++++++--------- models/donate-form.ini | 2 +- templates/monthly-giving.html | 6 ++++++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/content/monthly-giving/contents.lr b/content/monthly-giving/contents.lr index 93bc3d37..3610e392 100644 --- a/content/monthly-giving/contents.lr +++ b/content/monthly-giving/contents.lr @@ -10,18 +10,19 @@ section_id: donate --- title: Defenders of Privacy --- -_template: donate-form.html +_template: monthly-giving.html --- intro: -<div class="fixed-width col-7 mx-auto"> - <p></p> - <p>Become a Defender of Privacy!</p> - <p>Join the Tor Project - Defenders of Privacy program - a monthly giving circle designed to honor donors that make privacy a priority.</p> - <p>Defenders of Privacy pledge a modest amount each month - creating a steady, reliable source of funds to help us be agile in an ever-changing privacy landscape and we send you exclusive gifts to show our appreciation!</p> - <p>The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. With your help, we will make the Tor network accessible to everyone!</p> - <p>Together, we will stand up for the universal right to privacy. Please make your monthly donation now and stand with the Tor Project at this critical time.</p> -</div> +Become a Defender of Privacy! + +Join the Tor Project - Defenders of Privacy program - a monthly giving circle designed to honor donors that make privacy a priority. + +Defenders of Privacy pledge a modest amount each month - creating a steady, reliable source of funds to help us be agile in an ever-changing privacy landscape and we send you exclusive gifts to show our appreciation! + +The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. With your help, we will make the Tor network accessible to everyone! + +Together, we will stand up for the universal right to privacy. Please make your monthly donation now and stand with the Tor Project at this critical time. --- monthly_five: 10000 --- diff --git a/models/donate-form.ini b/models/donate-form.ini index 66e1beed..6f4fb642 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -16,7 +16,7 @@ choice_labels = Single, Monthly [fields.intro] label = Intro -type = html +type = markdown [fields.title] label = Title diff --git a/templates/monthly-giving.html b/templates/monthly-giving.html new file mode 100644 index 00000000..b5b35efa --- /dev/null +++ b/templates/monthly-giving.html @@ -0,0 +1,6 @@ +{% extends "donate-form.html" %} +{% block donate_form_intro %} +<div class="fixed-width col-7 mx-auto"> + {{ this.intro }} +</div> +{% endblock %}

1 0

[donate-static/master] Update lego submodule to latest revision
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 091bddb885b1f62684645ff52f8b30a6283746e2 Author: kez <kez(a)torproject.org> Date: Fri Jul 9 16:57:15 2021 -0400 Update lego submodule to latest revision --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index fbc24381..a12c0beb 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit fbc24381fd53205b2ae1a1d32044dbd60c7aad69 +Subproject commit a12c0beb9c7ba1a203ca1a7b6bd3dd14197ea4b2

1 0

[donate-static/master] make fields translatable. part of https://gitlab.torproject.org/tpo/web/donate-static/-/issues/31
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit ab487e050834148fae8446abc807fde63356d6bd Author: emma peel <emma.peel(a)riseup.net> Date: Mon Jul 12 21:04:36 2021 +0200 make fields translatable. part of https://gitlab.torproject.org/tpo/web/donate-static/-/issues/31 --- models/donate-form.ini | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/models/donate-form.ini b/models/donate-form.ini index 6f4fb642..c6797192 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -35,6 +35,7 @@ translate = False [fields.body] label = Body type = markdown +translate = True [fields.header_image] label = Header Image (centered) @@ -47,6 +48,7 @@ type = string [fields.header_tag_line] label = Header Tag Line type = string +translate = True [fields.header_tag_link] label = Header Tag Link @@ -112,6 +114,7 @@ type = string [fields.sticker_perk_single_label] label = Sticker Perk Label (Single) type = string +translate = True [fields.sticker_perk_single_image] label = Sticker Perk Image (Single) @@ -120,10 +123,12 @@ type = string [fields.sticker_perk_single_description] label = Sticker Perk Description (Single) type = string +translate = True [fields.sticker_perk_montly_label] label = Sticker Perk Label (Monthly) type = string +translate = True [fields.sticker_perk_monthly_image] label = Sticker Perk Image (Monthly) @@ -132,10 +137,12 @@ type = string [fields.sticker_perk_monthly_description] label = Sticker Perk Description (Monthly) type = string +translate = True [fields.tshirt_perk_single_label] label = T-Shirt Perk Label (Single) type = string +translate = True [fields.tshirt_perk_single_image] label = T-Shirt Perk Image (Single) @@ -144,10 +151,12 @@ type = string [fields.tshirt_perk_single_description] label = T-Shirt Perk Description (Single) type = string +translate = True [fields.tshirt_perk_monthly_label] label = T-Shirt Perk Label (Monthly) type = string +translate = True [fields.tshirt_perk_monthly_image] label = T-Shirt Perk Image (Monthly) @@ -156,10 +165,12 @@ type = string [fields.tshirt_perk_monthly_description] label = T-Shirt Perk Description (Monthly) type = string +translate = True [fields.tshirt_pack_perk_single_label] label = T-Shirt Pack Perk Label (Single) type = string +translate = True [fields.tshirt_pack_perk_single_image] label = T-Shirt Pack Perk Image (Single) @@ -168,10 +179,12 @@ type = string [fields.tshirt_pack_perk_single_description] label = T-Shirt Pack Perk Description (Single) type = string +translate = True [fields.tshirt_pack_perk_monthly_label] label = T-Shirt Pack Perk Label (Monthly) type = string +translate = True [fields.tshirt_pack_perk_monthly_image] label = T-Shirt Pack Perk Image (Monthly) @@ -180,10 +193,12 @@ type = string [fields.tshirt_pack_perk_monthly_description] label = T-Shirt Pack Perk Description (Monthly) type = string +translate = True [fields.sweatshirt_perk_single_label] label = Sweatshirt Perk Label (Single) type = string +translate = True [fields.sweatshirt_perk_single_image] label = Sweatshirt Pack Perk Image (Single) @@ -192,10 +207,12 @@ type = string [fields.sweatshirt_perk_single_description] label = Sweatshirt Perk Description (Single) type = string +translate = True [fields.sweatshirt_perk_monthly_label] label = Sweatshirt Perk Label (Monthly) type = string +translate = True [fields.sweatshirt_perk_monthly_image] label = Sweatshirt Pack Perk Image (Monthly) @@ -204,14 +221,17 @@ type = string [fields.sweatshirt_perk_monthly_description] label = Sweatshirt Perk Description (Monthly) type = string +translate = True [fields.tshirt_perk_options_label] label = T-Shirt Perk Options Label type = string +translate = True [fields.tshirt_pack_second_shirt_options_label] label = T-Shirt Pack Second Shirt Options Label type = string +translate = True [fields.number_of_donations_counter_label] label = Number of Donations Counter Label @@ -223,4 +243,4 @@ type = html [fields.total_matched_counter_label] label = Total Matched Counter Label -type = html \ No newline at end of file +type = html

1 0

[donate-static/master] better strings for l10n
by kez＠torproject.org 25 Oct '21

25 Oct '21

commit 7bf51d68797f208c720a67b4d87442e01396db44 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Jul 12 21:16:09 2021 +0200 better strings for l10n --- content/champions-of-privacy/contents.lr | 7 +++++-- content/monthly-giving/contents.lr | 6 ++++-- content/privacy-policy/contents.lr | 22 +++++++++++++++++----- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index 959a1aff..adf1b5d8 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -16,9 +16,12 @@ Champions of Privacy make a significant pledge of $1,000 or more—creating a st As a Champion of Privacy, you'll receive exclusive gifts and invitations to online events that will give you insider access to what's happening at Tor. -We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all. +We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. +The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. +With your help, we can make the Tor network accessible to all. -We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today. +We're standing up for the universal human right to privacy. +Join us by becoming a Champion of Privacy today. --- footer: diff --git a/content/monthly-giving/contents.lr b/content/monthly-giving/contents.lr index 3610e392..e5cb307f 100644 --- a/content/monthly-giving/contents.lr +++ b/content/monthly-giving/contents.lr @@ -20,9 +20,11 @@ Join the Tor Project - Defenders of Privacy program - a monthly giving circle de Defenders of Privacy pledge a modest amount each month - creating a steady, reliable source of funds to help us be agile in an ever-changing privacy landscape and we send you exclusive gifts to show our appreciation! -The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. With your help, we will make the Tor network accessible to everyone! +The Tor Project counts on the support of our Defenders of Privacy to continue our mission to provide tools that protect people's privacy and identity online. +With your help, we will make the Tor network accessible to everyone! -Together, we will stand up for the universal right to privacy. Please make your monthly donation now and stand with the Tor Project at this critical time. +Together, we will stand up for the universal right to privacy. +Please make your monthly donation now and stand with the Tor Project at this critical time. --- monthly_five: 10000 --- diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index b55ef355..66f0f72b 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -12,14 +12,26 @@ color: primary --- body: -The Tor Project respects donor privacy and welcomes anonymous donations. If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information. +The Tor Project respects donor privacy and welcomes anonymous donations. +If being anonymous is important to you, the best way to preserve your anonymity is by donating using a method that doesn't disclose your personal information. -If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. We recommend you familiarize yourself with their [policies](https://www.paypal.com/webapps/mpp/ua/privacy-full "" target="_blank" rel="noopener"), especially if you have privacy concerns. +If you provide personal information as part of the donation process, it may be collected and retained by third-party service providers and/or the Tor Project, as described below. +The Tor Project has very little influence over how third-party service providers, such as PayPal, may collect and use your information. +We recommend you familiarize yourself with their [policies](https://www.paypal.com/webapps/mpp/ua/privacy-full "" target="_blank" rel="noopener"), especially if you have privacy concerns. -When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. We may also learn incidental data such as the date and time of your donation. The Tor Project will never have access to your financial data, such as your credit card information. We aim to be careful with your information. +When you donate to the Tor Project, depending what mechanism you use, we may learn your name, the amount you donated, your email address, phone number and/or mailing address, as well as any other information you provide. +We may also learn incidental data such as the date and time of your donation. +The Tor Project will never have access to your financial data, such as your credit card information. +We aim to be careful with your information. -If you have provided your email address, we will email you once to thank you and give you a receipt. If you opt in during the donation process, we may email you again in future. If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in [Schedule B of the Form 990](https://www.irs.gov/pub/irs-pdf/f990ezb.pdf "" target="_blank" rel="noopener"). But, that information is redacted from the publicly-available version of our Form 990. We will never publicly identify you as a donor without your permission. +If you have provided your email address, we will email you once to thank you and give you a receipt. +If you opt in during the donation process, we may email you again in future. +If you donate more than $5,000 and we know your name and address, we are required to disclose it to the IRS in [Schedule B of the Form 990](https://www.irs.gov/pub/irs-pdf/f990ezb.pdf "" target="_blank" rel="noopener"). +But, that information is redacted from the publicly-available version of our Form 990. +We will never publicly identify you as a donor without your permission. -We do not publish, sell, trade, or rent any information about you. For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt. +We do not publish, sell, trade, or rent any information about you. +For our records, we retain your name, the amount of your donation, the date of the donation, and your contact information. +Access to that information is restricted inside the Tor Project to people who need it to do their work, for example by thanking you or mailing you a t-shirt. **The Tor Project very much appreciates all its donors. Thank you for supporting Tor.**

1 0