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

[donate-static/master] Fixed some links on donor-faq page
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 75160a644f00dde7312c84b1f25f5480e7a96697 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Oct 19 10:44:49 2020 -0700 Fixed some links on donor-faq page I don't think this is quite right because it might not work on staging, but it will work on production. --- content/donor-faq/contents.lr | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index 9e0070df..3f04c9a2 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -23,14 +23,14 @@ body: <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p> <p class="answer">The Tor Project also offers the following alternative donation methods:</p> <ul class="answer"> - <li><a class="hyperlinks links" href="//cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> - <li><a class="hyperlinks links" href="//cryptocurrency" target="_blank">BTCPayServer</a></li> + <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> + <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">BTCPayServer</a></li> <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li> <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li> <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li> - <li><a class="hyperlinks links" href="//donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> - <li><a class="hyperlinks links" href="//donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="//donor-faq#donate-anonymous">Money Orders</a></a></li> - <li><a class="hyperlinks links" href="//donor-faq#donate-stock">Stock Donation</a></li> + <li><a class="hyperlinks links" href="/donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> + <li><a class="hyperlinks links" href="/donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="/donor-faq#donate-anonymous">Money Orders</a></a></li> + <li><a class="hyperlinks links" href="/donor-faq#donate-stock">Stock Donation</a></li> </ul> <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p> </li> @@ -183,7 +183,7 @@ body: </li> <li> <h2 class="question">What is your donor privacy policy?</h2> - <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="//privacy-policy">donor privacy policy</a>.</p> + <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="/privacy-policy">donor privacy policy</a>.</p> </li> <li> <h2 class="question">What is your refund policy?</h2> @@ -240,7 +240,7 @@ body: </ol> <hr/> <div class="button-line"> - <a class="purple button" href="//state-disclosures">State Registration Disclosures</a> + <a class="purple button" href="/state-disclosures">State Registration Disclosures</a> </div> <div class="button-line"> <a class="purple button" href="/">Back to Donate Page</a> @@ -259,14 +259,14 @@ peterh@whylian$ cat ~/temp/foo.html <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p> <p class="answer">The Tor Project also offers the following alternative donation methods:</p> <ul class="answer"> - <li><a class="hyperlinks links" href="//cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> - <li><a class="hyperlinks links" href="//cryptocurrency" target="_blank">BTCPayServer</a></li> + <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> + <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">BTCPayServer</a></li> <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li> <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li> <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li> - <li><a class="hyperlinks links" href="//donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> - <li><a class="hyperlinks links" href="//donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="//donor-faq#donate-anonymous">Money Orders</a></a></li> - <li><a class="hyperlinks links" href="//donor-faq#donate-stock">Stock Donation</a></li> + <li><a class="hyperlinks links" href="/donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> + <li><a class="hyperlinks links" href="/donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="/donor-faq#donate-anonymous">Money Orders</a></a></li> + <li><a class="hyperlinks links" href="/donor-faq#donate-stock">Stock Donation</a></li> </ul> <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p> </li> @@ -419,7 +419,7 @@ peterh@whylian$ cat ~/temp/foo.html </li> <li> <h2 class="question">What is your donor privacy policy?</h2> - <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="//privacy-policy">donor privacy policy</a>.</p> + <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="/privacy-policy">donor privacy policy</a>.</p> </li> <li> <h2 class="question">What is your refund policy?</h2>

1 0

[donate-static/master] Pulled in faq number size fix on lego
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit d9160be562bd86d99466060dad1cce5de6dc245d Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Oct 19 11:08:05 2020 -0700 Pulled in faq number size fix on lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 666de536..96b2d951 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 666de536f013d0ea90dc954b732ea1e1b0b618cf +Subproject commit 96b2d9518869f95e3dbcc9c9af1f05c5d7f769b4

1 0

[donate-static/master] Added champions-of-privacy and monthly-giving pages
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 485edf55e5fa246f824b77b9794161abd8ee9f57 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Oct 19 10:56:08 2020 -0700 Added champions-of-privacy and monthly-giving pages --- content/champions-of-privacy/contents.lr | 68 ++++++++++++++++++ content/monthly-giving/contents.lr | 110 +++++++++++++++++++++++++++++ content/state-disclosures/.contents.lr.swp | Bin 20480 -> 0 bytes 3 files changed, 178 insertions(+) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr new file mode 100644 index 00000000..ad6a5961 --- /dev/null +++ b/content/champions-of-privacy/contents.lr @@ -0,0 +1,68 @@ +_model: donate-form +--- +frequency: single +--- +_template: layout.html +--- +body: +--- +html: donate-form.html +--- +title: Champions of Privacy +--- +intro: + +<div class="fixed-width"> + <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> +--- +single_one: 50000 +--- +single_two: 100000 +--- +single_three: 250000 +--- +single_four: 500000 +--- +single_five: 1000000 +--- +sticker_perk_single_image: /static/images/donate/stickerpack-1.png +--- +sticker_perk_single_label: Sticker Pack +--- +sticker_perk_single_description: A collection of our favorite logo stickers for decorating your stuff and covering your cams. +--- +shirt_perk_single_image: /static/images/donate/t-shirt-take-back-internet.png +--- +tshirt_perk_single_label: T-Shirt +--- +tshirt_perk_single_description: Get our limited edition Take Back the Internet With Tor shirt, plus Champions of Privacy perks. +--- +tshirt_pack_perk_single_description: Get this year's Take Back the Internet With Tor t-shirt and the Tor: Strength in Numbers t-shirt, plus Champions of Privacy perks. +--- +tshirt_pack_perk_single_label: T-Shirt Pack +--- +tshirt_pack_perk_single_image: /static/images/donate/t-shirt-pack-take-back-internet.png +--- +tshirt_pack_second_shirt_options_label: Take back the Internet with Tor +--- +tshirt_perk_options_label: Tor: Strength in Numbers +--- +sweatshirt_perk_single_image: /static/images/donate/hoodie-take-back-internet.png +--- +sweatshirt_perk_single_label: Sweatshirt +--- +sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie, plus Champions of Privacy perks. +--- +tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png +--- +tshirt_perk_single_image: /static/images/donate/t-shirt-take-back-internet.png +--- +sticker_perk_monthly_image: /static/images/donate/stickerpack-1.png +--- +sweatshirt_perk_monthly_image: /static/images/donate/hoodie-take-back-internet.png +--- +tshirt_pack_perk_monthly_image: /static/images/donate/t-shirt-pack-take-back-internet.png diff --git a/content/monthly-giving/contents.lr b/content/monthly-giving/contents.lr new file mode 100644 index 00000000..e8d20a2a --- /dev/null +++ b/content/monthly-giving/contents.lr @@ -0,0 +1,110 @@ +_model: donate-form +--- +frequency: monthly +--- +default_frequency_for_both: +--- +section: +--- +section_id: donate +--- +title: Defenders of Privacy +--- +_template: layout.html +--- +html: donate-form.html +--- +intro: + +<div class="fixed-width"> + <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> +--- +monthly_five: 10000 +--- +monthly_four: 5000 +--- +monthly_one: 500 +--- +monthly_three: 2500 +--- +monthly_two: 1000 +--- +single_five: 50000 +--- +single_four: 25000 +--- +single_one: 2500 +--- +single_three: 12500 +--- +single_two: 7500 +--- +sticker_perk_single_description: A collection of our favorite logo stickers for decorating your stuff and covering your cams. +--- +sticker_perk_single_image: /static/images/donate/stickerpack-1.png +--- +sticker_perk_single_label: Sticker Pack +--- +sticker_perk_monthly_description: A collection of our favorite logo stickers for decorating your stuff and covering your cams (Monthly). +--- +sticker_perk_monthly_image: /static/images/donate/stickerpack-1.png +--- +sticker_perk_monthly_label: Sticker Pack +--- +sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie. +--- +sweatshirt_perk_single_label: Sweatshirt +--- +sweatshirt_perk_monthly_description: Your generous support of Tor gets you this high-quality zip hoodie. +--- +sweatshirt_perk_monthly_label: Sweatshirt +--- +sweatshirt_perk_single_image: /static/images/donate/hoodie-take-back-internet.png +--- +sweatshirt_perk_monthly_image: /static/images/donate/hoodie-take-back-internet.png +--- +tshirt_pack_perk_single_description: Get this year's Take Back the Internet With Tor t-shirt and the Tor: Strength in Numbers t-shirt. +--- +tshirt_pack_perk_single_label: T-Shirt Pack +--- +tshirt_perk_single_description: Get our limited edition Take Back the Internet With Tor shirt. +--- +tshirt_pack_perk_monthly_description: Get this year's Take Back the Internet With Tor t-shirt and the Tor: Strength in Numbers t-shirt. +--- +tshirt_pack_perk_monthly_label: T-Shirt Pack +--- +tshirt_perk_monthly_description: Get our limited edition Take Back the Internet With Tor shirt. +--- +tshirt_perk_single_label: T-Shirt +--- +tshirt_pack_perk_single_image: /static/images/donate/t-shirt-pack-take-back-internet.png +--- +tshirt_pack_perk_monthly_image: /static/images/donate/t-shirt-pack-take-back-internet.png +--- +tshirt_perk_single_image: /static/images/donate/t-shirt-take-back-internet.png +--- +tshirt_perk_monthly_label: T-Shirt +--- +tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png +--- +header_image: +--- +success_redirect_url: +--- +counter: no +--- +tshirt_pack_second_shirt_options_label: Take back the Internet with Tor +--- +tshirt_perk_options_label: Tor: Strength in Numbers +--- +number_of_donations_counter_label: Number of Donations +--- +total_donated_counter_label: Total Donated +--- +total_matched_counter_label: Total Raised with Mozilla's Match diff --git a/content/state-disclosures/.contents.lr.swp b/content/state-disclosures/.contents.lr.swp deleted file mode 100644 index 4c7e3e3e..00000000 Binary files a/content/state-disclosures/.contents.lr.swp and /dev/null differ

1 0

[donate-static/master] Update contents.lr with use-tor campaign
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 9e1c4d7cd3456e08d93b0bd1a5f60c8c58fa4692 Author: Antonela <antonela(a)torproject.org> Date: Mon Oct 19 18:25:19 2020 +0000 Update contents.lr with use-tor campaign --- content/contents.lr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index f4cc42db..25217308 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -50,15 +50,15 @@ sticker_perk_monthly_label: Sticker Pack --- sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_single_label: Sweatshirt +sweatshirt_perk_single_label: Hoddie --- sweatshirt_perk_monthly_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_monthly_label: Sweatshirt +sweatshirt_perk_monthly_label: Hoddie --- -sweatshirt_perk_single_image: /static/images/donate/hoodie-take-back-internet.png +sweatshirt_perk_single_image: /static/images/donate/hoodie-use-tor.png --- -sweatshirt_perk_monthly_image: /static/images/donate/hoodie-take-back-internet.png +sweatshirt_perk_monthly_image: /static/images/donate/hoodie-use-tor.png --- tshirt_pack_perk_single_description: Get this year's Take Back the Internet With Tor t-shirt and the Tor: Strength in Numbers t-shirt. --- @@ -70,7 +70,7 @@ tshirt_pack_perk_monthly_description: Get this year's Take Back the Internet Wit --- tshirt_pack_perk_monthly_label: T-Shirt Pack --- -tshirt_perk_monthly_description: Get our limited edition Take Back the Internet With Tor shirt. +tshirt_perk_monthly_description: Get our limited edition Use Tor shirt. --- tshirt_perk_single_label: T-Shirt --- @@ -78,11 +78,11 @@ tshirt_pack_perk_single_image: /static/images/donate/t-shirt-pack-take-back-inte --- tshirt_pack_perk_monthly_image: /static/images/donate/t-shirt-pack-take-back-internet.png --- -tshirt_perk_single_image: /static/images/donate/t-shirt-take-back-internet.png +tshirt_perk_single_image: /static/images/donate/t-shirt-use-tor.png --- tshirt_perk_monthly_label: T-Shirt --- -tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png +tshirt_perk_monthly_image: /static/images/donate/t-shirt-use-tor.png --- header_image: /static/css/images/donate-banner.png ---

1 0

[donate-static/master] Fixed extra copy of faq questions
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 4843c974128dee663f789578231b4558deb8d378 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Oct 19 11:23:53 2020 -0700 Fixed extra copy of faq questions I had a copy-paste mistake. --- content/donor-faq/contents.lr | 236 ------------------------------------------ 1 file changed, 236 deletions(-) diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index 3f04c9a2..437ce1b7 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -247,241 +247,5 @@ body: </div> </div> </div> -peterh@whylian$ cat ~/temp/foo.html -<div class="fixed-width"> - <div class="donor-faq"> - <div class="preface"> - If your question isn’t answered below, email <span class="email">frontdesk(at)rt.torproject.org</span> with general Tor inquiries, or <span class="email">giving(at)torproject.org</span> with donor-specific questions. - </div> - <ol class="questions"> - <li> - <h2 class="question">How else can I donate to the Tor Project?</h2> - <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p> - <p class="answer">The Tor Project also offers the following alternative donation methods:</p> - <ul class="answer"> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">BTCPayServer</a></li> - <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li> - <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li> - <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li> - <li><a class="hyperlinks links" href="/donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="/donor-faq#donate-anonymous">Money Orders</a></a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-stock">Stock Donation</a></li> - </ul> - <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p> - </li> - <li> - <h2 class="question">What is the Tor Project and what does it do?</h2> - <p class="answer">The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. The main product of the Tor Project is <a href="https://www.torproject.org/download/download-easy.html.en" target="_blank">Tor Browser</a>, which enables people to browse the internet anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization. It was founded in 2006.</p> - </li> - <li> - <h2 class="question">Who works for the Tor Project, and what do they do?</h2> - <p class="answer">Thousands of people around the world actively support the work of the Tor Project, including developers, designers, relay operators, researchers, cryptographers, computer scientists, and privacy advocates, and most are not paid by the Tor Project. The paid staff of the Tor Project is very small: about 47 people in total. You can read about the core contributors to the Tor Project on our <a class="hyperlinks" target="_blank" href="https://www.torproject.org/about/corepeople.html.en"><span class="links">Core People page</span></a>.</p> </li> - <li> - <h2 class="question">Who uses Tor?</h2> - <p class="answer">The vast majority of Tor users are ordinary people who want control of their privacy online or people whose internet use is censored. Other Tor users are journalists, human rights defenders, domestic violence survivors, policymakers, diplomats, and academic and research institutions.</p> - </li> - <li> - <h2 class="question">Can anyone use Tor?</h2> - <p class="answer">Yes! Tor is free, and anyone can use it. To get started, you will need to <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en"><span class="links">download Tor Browser</span></a>. We offer instructions on how to download for <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#windows">Windows</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#macosx">Mac OS X</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#linux">Linux</a>, and <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/download/#android">Android</a>.</p> - </li> - <li> - <h2 class="question">What kinds of people support Tor?</h2> - <p class="answer">All kinds of people. Thousands of individuals have donated to support the Tor Project, and we have also received funding from <a class="hyperlinks links" href="https://www.torproject.org/about/sponsors/" target="_blank">a wide range of organizations</a> including Google, the Ford Foundation, the Knight Foundation, Reddit, the U.S. National Science Foundation, the Electronic Frontier Foundation, Human Rights Watch, the Swedish International Development Cooperation Agency, the Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, Omidyar Network, SRI International, and Open Technology Fund. People also support Tor in non-financial ways, for example by <a class="hyperlinks links" href="https://community.torproject.org/relay/" target="_blank">running Tor relays</a> to help carry traffic for other users. In addition, everybody who uses Tor is helping to keep other users safe and anonymous, because the more people using Tor, the harder it is to i dentify any single individual.</p> - </li> - <li> - <h2 class="question">How does the Tor software work to protect people's anonymity?</h2> - <p class="answer">Tor protects you by bouncing your communications around the Tor network, which is a distributed network of relays run by volunteers all around the world. If someone is watching your internet connection, Tor prevents them from finding out what sites you are visiting. It also prevents sites you visit from finding out where you're located. <a class="hyperlinks links" href="https://youtu.be/JWII85UlzKw" target="_blank">Watch this video</a> to learn more about how Tor works.</a> - </p> - </li> - <li> - <h2 class="question">I would like to know more about how Tor works, what onion services are, or how to run a relay.</h2> - <p class="answer"><a class="hyperlinks links" target="_blank" href="https://support.torproject.org/faq/">This Tor Project FAQ</a> has answers to all those questions, and more.</p> - </li> - <li> - <h2 class="question">Does the Tor software work?</h2> - <p class="answer">We believe Tor is the best solution available today, and we know that it does a better job of keeping you safely anonymous than other options such as VPNs, proxychains, or browser "private browsing" modes. We know that both the Russian government and the NSA have tried in the past to crack Tor, and failed. The Electronic Frontier Foundation says that Tor offers <a class="hyperlinks links" target="_blank" href="https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-tor">some of the strongest anonymity software that exists</a>, and in his book Data and Goliath, security expert Bruce Schneier wrote, "the current best tool to protect your anonymity when browsing the web is Tor."</p> - </li> - <li> - <h2 class="question">Is what Tor does legal? Can I get in trouble for using it?</h2> - <p class="answer">Downloading Tor Browser or using the Tor network is legal in nearly every country. A few web sites occasionally block Tor, but that doesn't mean you're doing anything wrong. Usually it means that site has had difficulties with visitors who've been using Tor in the past, or that they misunderstand what Tor is and how it works (we’re working to change this). But it is not illegal to use Tor, and you shouldn't get in trouble for doing it. You can find more information about Tor's legal status on the <a class="hyperlinks links" target="_blank" href="https://www.eff.org/torchallenge/faq.html">EFF site</a>.</p> - </li> - <li> - <h2 class="question">Where can I find out more about the Tor Project, especially financial information?</h2> - <p class="answer">Here are the Tor Project's <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/about/financials.html.en">financial statements and its Form 990</a>.</p> - </li> - <li> - <h2 class="question">Where does the Tor Project's money come from?</h2> - <p class="answer">Tor is supported by United States government funding agencies, NGOs, private foundations, research institutions, private companies, and over 20,000 personal donations from people like you. (See our <a class="hyperlinks links single-link" target="_blank" href="https://www.torproject.org/about/sponsors">Sponsors Page</a> for more.) While we are grateful for this funding, we don't want the Tor Project to become too dependent on any single source. Crowdfunding allows us to diversify our donor base and is unrestricted -- it allows us to spend the money on the projects we think are most important and respond quickly to changing events. And so, we are asking you to help financially support us, to increase the Tor Project's independence and ensure the sustainability of the products and services we provide.</p> - </li> - <li> - <h2 class="question">How much money does the Tor Project spend annually, and what is it used for?</h2> - <p class="answer">The Tor Project spends about $5 million annually. About 80% of the Tor Project's spending goes to staffing, mostly software engineers. About 10% goes towards administrative costs such as accounting and legal costs and bank fees. The remaining 10% is spent on travel, meetings and conferences, which are important for Tor because the Tor community is global.</p> - </li> - <li> - <h2 class="question">Is my donation tax-deductible?</h2> - <p class="answer">If you pay taxes in the United States, your donation to Tor is tax deductible to the full extent required by law. Following is information you may need for reporting purposes:</p> - <p class="answer" style="margin: 1em;"> - <b>Tor Project Tax ID Number (EIN #):</b> 20-8096820<br> - <b>Address:</b><br> - The Tor Project, Inc.<br> - 217 First Avenue South #4903<br> - Seattle, WA 98194<br> - <b>Phone number:</b> 206-420-3136<br> - <b>Contact person:</b> Isabela Bagueros, Executive Director<br></p> - <p id="eu-bank-transfer" class="answer" style="margin: 1em;"">For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide tax-deductible donations for Europeans. They will issue a donation receipt <a href="https://renewablefreedom.org/contact/" target="_blank" class="hyperlinks links">upon request</a>. The account information is as follows:</p> - <p class="answer" style="margin: 1em;"><b>Renewable Freedom Foundation</b><br> - IBAN: DE17721500000053693701<br> - BIC: BYLADEM1ING<br> - Sparkasse Ingolstadt<br> - Rathausplatz 6<br> - 85049 Ingolstadt</p> - </li> - <li> - <h2 class="question">If I am not in the United States, can I still donate?</h2> - <p class="answer">Yes, definitely. Your donation probably isn't tax-deductible (unless you pay taxes on U.S. income) but we would very much appreciate your support.</p> - </li> - <li> - <h2 class="question">It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States.</h2> - <p class="answer">Right now, we can only offer tax-deductibility to donors who pay taxes in the United States. If it's important to you that your donations be tax-deductible in a different country, let us know and we will try to offer tax-deductibility in your country in the future. Or, if you are in Germany, France, or Sweden, these organizations support the Tor network and may be able to offer you tax-deductibility for your donation.</p> - <p class="answer"><a href="https://www.torservers.net/" target="_blank" class="hyperlinks links">torservers.net</a> is a German charitable non-profit that runs a wide variety of exit relays worldwide. They also like donations of bandwidth from ISPs.</p> - <p class="answer"><a href="https://www.noisebridge.net/wiki/Noisebridge_Tor" target="_blank" class="hyperlinks links">Noisebridge</a> is a US-based 501(c)(3) non-profit that collects donations and turns them into more US-based exit relay capacity.</p> - <p class="answer"><a href="https://nos-oignons.net/" target="_blank" class="hyperlinks links">Nos Oignons</a> is a French charitable non-profit that runs fast exit relays in France.</p> - <p class="answer"><a href="https://www.dfri.se/donera/?lang=en" target="_blank" class="hyperlinks links">DFRI</a> is a Swedish non-profit running exit relays.</p> - <p class="answer">These organizations are not the same as <a href="/" target="_blank" class="hyperlinks links">The Tor Project, Inc</a>, but we consider that a good thing. They're run by nice people who are part of the Tor community.</p> - </li> - <li> - <h2 class="question">Can I donate to a specific project, or restrict my donation to a particular purpose?</h2> - <p class="answer">No, sorry. If we accept a donation from someone who has specified how they want it used, we're required by the IRS to track and report separately on that money. That would be a big administrative burden for a small organization, and we don't think it's a good idea for us. However, we would be very happy to hear your ideas and feedback about our work. If you're donating using a mechanism that allows for comments, feel free to send your thoughts that way.</p> - </li> - <li> - <h2 class="question">Can I donate while using Tor Browser?</h2> - <p class="answer">Yes! In our testing, donation works via Tor Browser. If you run into problems, please contact <span class="email">giving(at)torproject.org</span>.</p> - <p class="answer">For users logging in to Paypal: some people had no problem donating via PayPal while using Tor Browser. Some users experience issues because PayPal limits the number of times an IP address can be used in a certain period of time. This is to prevent fraud from card testers. If you run into an issue, please try again. Unfortunately, when we are receiving a high volume of donations, you might need to use a different browser.</p> - </li> - <li> - <h2 class="question">How can I donate via debit or credit card?</h2> - <p class="answer">To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our <a class="hyperlinks links" href="/">donate page</a>.</p> - </li> - <li> - <h2 class="question">Why do you ask for my address and similar information?</h2> - <p class="answer">If you donate by credit card, you will be asked for some information that's required to process your credit card payment, including your billing address. This allows our payment processor to verify your identity, process your payment, and prevent fraudulent charges to your credit card. We don't ask for information beyond what's required by the payment processor.</p> - </li> - <li> - <h2 class="question">Why is there a minimum donation?</h2> - <p class="answer">People who have stolen credit card information often donate to nonprofits as a way of testing whether the card works. These people typically use a very small amount for their testing, and we've found that setting a $2 minimum donation seems to deter them.</p> - </li> - <li> - <h2 class="question">Is there a maximum donation?</h2> - <p class="answer">Nope. More funding from you means we can do more things we are excited to do, like hire a person to monitor the Tor network full time, or research, test, and implement ideas we have for making the Tor network even stronger.</p> - </li> - <li id="donate-anonymous"> - <h2 class="question">If I want my donation to be anonymous, what is the best way for me to donate?</h2> - <p class="answer">You can donate by sending us a postal money order. You can donate via bitcoin or another cryptocurrency if you have it set up in a way that preserves your anonymity. You can buy cash gift cards and mail them to us. There are probably other ways to donate anonymously that we haven't thought of -- maybe you will.</p> - </li> - <li id="donate-by-mail"> - <h2 class="question">Can I donate by mail?</h2> - <p class="answer">Yes. Our mailing address is <b>The Tor Project, 217 First Avenue South #4903, Seattle WA 98194, USA</b>.</p> - </li> - <li> - <h2 class="question">Do you accept cash donations?</h2> - <p class="answer">Yes.</p> - </li> - <li> - <h2 class="question">Can I donate via AmazonSmile?</h2> - <p class="answer">Amazon Smile is a website operated by Amazon with the same products, prices, and shopping features as Amazon.com. The difference is that when you shop on Amazon Smile, the Amazon Smile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> - <p class="answer"><a href="https://smile.amazon.com/ch/20-8096820" target="_blank" class="hyperlinks links">Set up the Tor Project on Amazon Smile</a></p> - </li> - <li> - <h2 class="question">Can I donate via Giving Assistant?</h2> - <p class="answer">Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</p> - <p class="answer"><a href="https://givingassistant.org/np#tor-project-inc" target="_blank" class="hyperlinks links">Use Giving Assistant to save money and support the Tor Project</a></p> - </li> - <li id="donate-stock"> - <h2 class="question">Can I make a stock donation?</h2> - <p class="answer">You can donate stock to the Tor Project. Please let us know in advance if you are transmitting securities via DTC by contacting us at <span class="email">giving(at)torproject.org</span>.</p> - <p class="answer" style="margin: 1em;">Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc.<br> - Account Name: The Tor Project<br> - Contact: Jeffrey K. Miller: 206.464.3564<br> - E-mail: <span class="email">jeffrey.k.miller(at)ml.com</span><br> - FAX: 206.388.4456<br> - The Tor Project Account #: ***-*3016<br> - DTC #: 8862<br> - Tax ID #: 20-8096820</p> - </li> - <li> - <h2 class="question">Is the Tor Project required to identify me as a donor to the United States government, or to any other authority?</h2> - <p class="answer">If you donate $20,000 or more to the Tor Project in a single year, we are required to report the donation amount and your name and address (if we have it) to the IRS, on Schedule B of the Form 990, which is filed annually. However, it's normal for nonprofits to redact individual donor information from the copy of the 990 that's made publicly-available, and that's what we do. We are not required to identify donors to any other organization or authority, and we do not.</p> - </li> - <li> - <h2 class="question">In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean?</h2> - <p class="answer">Yes, that's right. If you donate to the Tor Project, there will be some people at the Tor Project who know about your donation. However, we will never publicly identify you as a donor, unless you have given us permission to do so. That means we won't post your name on our website, thank you on Twitter, or do anything else that would publicly identify you as someone who has donated. If we decide we would like to publicly name you as a donor, we will ask you first, and will not do it until and unless you say it's okay. If you talk about your donation on social media (and we appreciate you doing so!), we will take that to mean it's okay for us to engage with or amplify your post.</p> - </li> - <li> - <h2 class="question">What is your donor privacy policy?</h2> - <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="/privacy-policy">donor privacy policy</a>.</p> - </li> - <li> - <h2 class="question">What is your refund policy?</h2> - <p class="answer">If you want your donation refunded, please tell us by emailing <span class="email">giving(at)torproject.org</span>. To process your refund we'll need to know the date of your donation, the amount you donated, your full name, the payment method you used and your country of origin. Please also tell us why you're asking for a refund. Please note that some payment methods won't support refunds, or require them to be made in a specific way, so we may need additional information from you in order to process yours.</p> - </li> - <li> - <h2 class="question">Does Tor Project accept matching donations?</h2> - <p class="answer">Yes! Many companies --such as Google, Microsoft, eBay, PayPal, Apple, Verizon, Red Hat, many universities, and others-- will match donations made by their employees. The fastest way to find out if your company matches donations is usually by checking with your HR department. If you want help figuring out the process, write us at <span class="email">giving(at)torproject.org</a>.</p> - </li> - <li> - <h2 class="question">Can I become a Tor Project member?</h2> - <p class="answer">Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, <a class="hyperlinks links" target="_blank" href="https://community.torproject.org">this is a good place to start</a>. We do have two giving programs - Champions of Privacy and Defenders of Privacy. Champions of Privacy donate $1,000 or more per year and enjoy special perks and access. Defenders of Privacy sign up to donate monthly and receive an exclusive patch.</p> - </li> - <li> - <h2 class="question">How can I get a Tor t-shirt or stickers?</h2> - <p class="answer">A variety of thank-you gifts for donors, including t-shirts, hoodies and stickers, are presented on our main <a class="hyperlinks links" href="/">donation page</a>.</p> - </li> - <li> - <h2 class="question">If I want to stay in touch with the Tor Project, what's the best way for me to do that?</h2> - <p class="answer">You can sign up to receive <a class="hyperlinks links" target="_blank" href="https://newsletter.torproject.org/">Tor News</a>, read the <a class="hyperlinks links" target="_blank" href="https://blog.torproject.org/">Tor Blog</a>, or <a class="hyperlinks links" target="_blank" href="https://twitter.com/torproject">follow us on Twitter</a>.</p> - </li> - <li> - <h2 class="question">Does the Tor Project participate in the Combined Federal Campaign program?</h2> - <p class="answer">Tor is set up to participate in the <a href="https://www.kingcounty.gov/audience/employees/giving.aspx" target="_blank" class="hyperlinks links">King County Employee Giving Program</a>. Tor doesn't currently participate in the Federal CFC program. If you'd like to get Tor added to the CFC program in your location, that would be great: please let us know if you need any help.</p> - </li> - <li> - <h2 class="question">Can I donate my airline miles, flight vouchers, or hotel points?</h2> - <p class="answer">No, sorry. We would like to accept your miles, vouchers and hotel points, and in the future we may be able to.</p> - </li> - <li> - <h2 class="question">Can I donate hardware?</h2> - <p class="answer">Typically no, we don't encourage people to donate hardware. But if you want to make a hardware donation that you think might be especially useful for us, please mail <span class="email">giving(at)torproject.org</span>.</p> - </li> - <li> - <h2 class="question">Can I donate my time?</h2> - <p class="answer">Yes. Here's a <a class="hyperlinks links" target="_blank" href="https://community.torproject.org">list of areas where we would love your help</a>.</p> - </li> - <li> - <h2 class="question">I would like my company to support Tor. What can we do to help?</h2> - <p class="answer">Your company could match donations made by its employees to the Tor Project--that would be wonderful. Your company may operate a corporate foundation that gives out grants, and if so, you should encourage it to fund us. Maybe your company would be willing to <a class="hyperlinks links" target="_blank" href="https://community.torproject.org/relay/">operate a Tor relay</a>. If your company sells cloud services, perhaps it could donate these to Tor: We use them in some anti-censorship projects.</p> - </li> - <li> - <h2 class="question">You don't support my preferred way to donate. Can I recommend a new donation method to you?</h2> - <p class="answer">Sure. Just mail us at <span class="email">giving(at)torproject.org</span></a>.</p> - </li> - <li> - <h2 class="question">Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?</h2> - <p class="answer">We do reserve the right to reject a donation. To date though, we haven't exercised that right. We are happy that a broad range of people use and support Tor.</p> - </li> - <li> - <h2 class="question">I have more questions. How can I get answers?</h2> - <p class="answer">Feel free to send questions to <span class="email">frontdesk(at)rt.torproject.org</span>. We will try to answer you, and we'll also post your question (and the answer) here.</p> - </li> - </ol> - <hr/> - <div class="button-line"> - <a class="purple button" href="/state-disclosures">State Registration Disclosures</a> - </div> - <div class="button-line"> - <a class="purple button" href="/">Back to Donate Page</a> - </div> - </div> -</div> --- html: donate-empty.html

1 0

[donate-static/master] Change header add color remove full navbar
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 987d3c6f4ed0e3aaac13ae8a56754735303ecf79 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 19 20:22:55 2020 +0200 Change header add color remove full navbar --- content/contents.lr | 4 +++- lego | 2 +- models/donate-form.ini | 4 ++++ templates/meta.html | 6 +----- templates/navbar-min.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 4e429406..f4cc42db 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -84,7 +84,9 @@ tshirt_perk_monthly_label: T-Shirt --- tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png --- -header_image: /static/css/images/home/png/use-tor.png +header_image: /static/css/images/donate-banner.png +--- +header_color: black --- success_redirect_url: --- diff --git a/lego b/lego index 96b2d951..a1bf61f3 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 96b2d9518869f95e3dbcc9c9af1f05c5d7f769b4 +Subproject commit a1bf61f36ccf730df140f684e3ea6970b6d6a9d8 diff --git a/models/donate-form.ini b/models/donate-form.ini index 943f775d..db053c7a 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -40,6 +40,10 @@ type = markdown label = Header Image (centered) type = string +[fields.header_color] +label = Header Color +type = string + [fields.success_redirect_url] label = URL to redirect to after donation completed successfully type = url diff --git a/templates/meta.html b/templates/meta.html index 9e9c26b0..17a9652f 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,9 +20,5 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% if this.path == '/download' %} - {% include 'navbar-min.html' %} - {% else %} - {% include 'navbar.html' %} - {% endif %} + {% include 'navbar-min.html' %} </header> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 00000000..51e0bc3b --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,49 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2 d-flex justify-content-between"> +{% endif %} + <div> + <div class="row"> + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <h4 class="pl-2 pr-2 pt-3"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% else %} + <h4 class="pl-2 pr-2 pt-3"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% endif %} + </div> + </div> + {% set alts = bag('alternatives').items() %} + {% if alts|length > 1 %} + <div class="btn-group dropdown float-right"> + {% if not this.color %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% elif this.color == 'primary' %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% else %} + <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% endif %} + {{ bag('alternatives', this.alt, 'language') }} + </button> + <div class="dropdown-menu"> + {% for id, item in bag('alternatives').items() %} + {% if this.alt != id %} + <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> + {% endif %} + {% endfor %} + </div> + </div> + {% endif %} + + </nav> +</div>

1 0

[donate-static/master] Git merge changes from staging
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 078afab02ee51138c3d845aa0cc205b8a33dbced Merge: a11333fe 9e1c4d7c Author: hiro <hiro(a)torproject.org> Date: Mon Oct 19 20:31:05 2020 +0200 Git merge changes from staging content/champions-of-privacy/contents.lr | 68 +++++++++ content/contents.lr | 14 +- content/donor-faq/contents.lr | 251 +++++++++++++++++++++++++++++++ content/monthly-giving/contents.lr | 110 ++++++++++++++ content/state-disclosures/contents.lr | 42 ++++++ templates/layout.html | 2 +- 6 files changed, 479 insertions(+), 8 deletions(-)

1 0

[donate-static/staging] Update contents.lr with use-tor campaign
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 9e1c4d7cd3456e08d93b0bd1a5f60c8c58fa4692 Author: Antonela <antonela(a)torproject.org> Date: Mon Oct 19 18:25:19 2020 +0000 Update contents.lr with use-tor campaign --- content/contents.lr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index f4cc42db..25217308 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -50,15 +50,15 @@ sticker_perk_monthly_label: Sticker Pack --- sweatshirt_perk_single_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_single_label: Sweatshirt +sweatshirt_perk_single_label: Hoddie --- sweatshirt_perk_monthly_description: Your generous support of Tor gets you this high-quality zip hoodie. --- -sweatshirt_perk_monthly_label: Sweatshirt +sweatshirt_perk_monthly_label: Hoddie --- -sweatshirt_perk_single_image: /static/images/donate/hoodie-take-back-internet.png +sweatshirt_perk_single_image: /static/images/donate/hoodie-use-tor.png --- -sweatshirt_perk_monthly_image: /static/images/donate/hoodie-take-back-internet.png +sweatshirt_perk_monthly_image: /static/images/donate/hoodie-use-tor.png --- tshirt_pack_perk_single_description: Get this year's Take Back the Internet With Tor t-shirt and the Tor: Strength in Numbers t-shirt. --- @@ -70,7 +70,7 @@ tshirt_pack_perk_monthly_description: Get this year's Take Back the Internet Wit --- tshirt_pack_perk_monthly_label: T-Shirt Pack --- -tshirt_perk_monthly_description: Get our limited edition Take Back the Internet With Tor shirt. +tshirt_perk_monthly_description: Get our limited edition Use Tor shirt. --- tshirt_perk_single_label: T-Shirt --- @@ -78,11 +78,11 @@ tshirt_pack_perk_single_image: /static/images/donate/t-shirt-pack-take-back-inte --- tshirt_pack_perk_monthly_image: /static/images/donate/t-shirt-pack-take-back-internet.png --- -tshirt_perk_single_image: /static/images/donate/t-shirt-take-back-internet.png +tshirt_perk_single_image: /static/images/donate/t-shirt-use-tor.png --- tshirt_perk_monthly_label: T-Shirt --- -tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png +tshirt_perk_monthly_image: /static/images/donate/t-shirt-use-tor.png --- header_image: /static/css/images/donate-banner.png ---

1 0

[donate-static/staging] Fixed extra copy of faq questions
by peterh＠torproject.org 19 Oct '20

19 Oct '20

commit 4843c974128dee663f789578231b4558deb8d378 Author: Peter Haight <peterh(a)giantrabbit.com> Date: Mon Oct 19 11:23:53 2020 -0700 Fixed extra copy of faq questions I had a copy-paste mistake. --- content/donor-faq/contents.lr | 236 ------------------------------------------ 1 file changed, 236 deletions(-) diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index 3f04c9a2..437ce1b7 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -247,241 +247,5 @@ body: </div> </div> </div> -peterh@whylian$ cat ~/temp/foo.html -<div class="fixed-width"> - <div class="donor-faq"> - <div class="preface"> - If your question isn’t answered below, email <span class="email">frontdesk(at)rt.torproject.org</span> with general Tor inquiries, or <span class="email">giving(at)torproject.org</span> with donor-specific questions. - </div> - <ol class="questions"> - <li> - <h2 class="question">How else can I donate to the Tor Project?</h2> - <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p> - <p class="answer">The Tor Project also offers the following alternative donation methods:</p> - <ul class="answer"> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">BTCPayServer</a></li> - <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li> - <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li> - <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li> - <li><a class="hyperlinks links" href="/donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="/donor-faq#donate-anonymous">Money Orders</a></a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-stock">Stock Donation</a></li> - </ul> - <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p> - </li> - <li> - <h2 class="question">What is the Tor Project and what does it do?</h2> - <p class="answer">The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding. The main product of the Tor Project is <a href="https://www.torproject.org/download/download-easy.html.en" target="_blank">Tor Browser</a>, which enables people to browse the internet anonymously. The Tor Project is a 501(c)3 tax-exempt non-profit organization. It was founded in 2006.</p> - </li> - <li> - <h2 class="question">Who works for the Tor Project, and what do they do?</h2> - <p class="answer">Thousands of people around the world actively support the work of the Tor Project, including developers, designers, relay operators, researchers, cryptographers, computer scientists, and privacy advocates, and most are not paid by the Tor Project. The paid staff of the Tor Project is very small: about 47 people in total. You can read about the core contributors to the Tor Project on our <a class="hyperlinks" target="_blank" href="https://www.torproject.org/about/corepeople.html.en"><span class="links">Core People page</span></a>.</p> </li> - <li> - <h2 class="question">Who uses Tor?</h2> - <p class="answer">The vast majority of Tor users are ordinary people who want control of their privacy online or people whose internet use is censored. Other Tor users are journalists, human rights defenders, domestic violence survivors, policymakers, diplomats, and academic and research institutions.</p> - </li> - <li> - <h2 class="question">Can anyone use Tor?</h2> - <p class="answer">Yes! Tor is free, and anyone can use it. To get started, you will need to <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en"><span class="links">download Tor Browser</span></a>. We offer instructions on how to download for <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#windows">Windows</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#macosx">Mac OS X</a>, <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/projects/torbrowser.html.en#linux">Linux</a>, and <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/download/#android">Android</a>.</p> - </li> - <li> - <h2 class="question">What kinds of people support Tor?</h2> - <p class="answer">All kinds of people. Thousands of individuals have donated to support the Tor Project, and we have also received funding from <a class="hyperlinks links" href="https://www.torproject.org/about/sponsors/" target="_blank">a wide range of organizations</a> including Google, the Ford Foundation, the Knight Foundation, Reddit, the U.S. National Science Foundation, the Electronic Frontier Foundation, Human Rights Watch, the Swedish International Development Cooperation Agency, the Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, Omidyar Network, SRI International, and Open Technology Fund. People also support Tor in non-financial ways, for example by <a class="hyperlinks links" href="https://community.torproject.org/relay/" target="_blank">running Tor relays</a> to help carry traffic for other users. In addition, everybody who uses Tor is helping to keep other users safe and anonymous, because the more people using Tor, the harder it is to i dentify any single individual.</p> - </li> - <li> - <h2 class="question">How does the Tor software work to protect people's anonymity?</h2> - <p class="answer">Tor protects you by bouncing your communications around the Tor network, which is a distributed network of relays run by volunteers all around the world. If someone is watching your internet connection, Tor prevents them from finding out what sites you are visiting. It also prevents sites you visit from finding out where you're located. <a class="hyperlinks links" href="https://youtu.be/JWII85UlzKw" target="_blank">Watch this video</a> to learn more about how Tor works.</a> - </p> - </li> - <li> - <h2 class="question">I would like to know more about how Tor works, what onion services are, or how to run a relay.</h2> - <p class="answer"><a class="hyperlinks links" target="_blank" href="https://support.torproject.org/faq/">This Tor Project FAQ</a> has answers to all those questions, and more.</p> - </li> - <li> - <h2 class="question">Does the Tor software work?</h2> - <p class="answer">We believe Tor is the best solution available today, and we know that it does a better job of keeping you safely anonymous than other options such as VPNs, proxychains, or browser "private browsing" modes. We know that both the Russian government and the NSA have tried in the past to crack Tor, and failed. The Electronic Frontier Foundation says that Tor offers <a class="hyperlinks links" target="_blank" href="https://www.eff.org/deeplinks/2014/07/7-things-you-should-know-about-tor">some of the strongest anonymity software that exists</a>, and in his book Data and Goliath, security expert Bruce Schneier wrote, "the current best tool to protect your anonymity when browsing the web is Tor."</p> - </li> - <li> - <h2 class="question">Is what Tor does legal? Can I get in trouble for using it?</h2> - <p class="answer">Downloading Tor Browser or using the Tor network is legal in nearly every country. A few web sites occasionally block Tor, but that doesn't mean you're doing anything wrong. Usually it means that site has had difficulties with visitors who've been using Tor in the past, or that they misunderstand what Tor is and how it works (we’re working to change this). But it is not illegal to use Tor, and you shouldn't get in trouble for doing it. You can find more information about Tor's legal status on the <a class="hyperlinks links" target="_blank" href="https://www.eff.org/torchallenge/faq.html">EFF site</a>.</p> - </li> - <li> - <h2 class="question">Where can I find out more about the Tor Project, especially financial information?</h2> - <p class="answer">Here are the Tor Project's <a class="hyperlinks links" target="_blank" href="https://www.torproject.org/about/financials.html.en">financial statements and its Form 990</a>.</p> - </li> - <li> - <h2 class="question">Where does the Tor Project's money come from?</h2> - <p class="answer">Tor is supported by United States government funding agencies, NGOs, private foundations, research institutions, private companies, and over 20,000 personal donations from people like you. (See our <a class="hyperlinks links single-link" target="_blank" href="https://www.torproject.org/about/sponsors">Sponsors Page</a> for more.) While we are grateful for this funding, we don't want the Tor Project to become too dependent on any single source. Crowdfunding allows us to diversify our donor base and is unrestricted -- it allows us to spend the money on the projects we think are most important and respond quickly to changing events. And so, we are asking you to help financially support us, to increase the Tor Project's independence and ensure the sustainability of the products and services we provide.</p> - </li> - <li> - <h2 class="question">How much money does the Tor Project spend annually, and what is it used for?</h2> - <p class="answer">The Tor Project spends about $5 million annually. About 80% of the Tor Project's spending goes to staffing, mostly software engineers. About 10% goes towards administrative costs such as accounting and legal costs and bank fees. The remaining 10% is spent on travel, meetings and conferences, which are important for Tor because the Tor community is global.</p> - </li> - <li> - <h2 class="question">Is my donation tax-deductible?</h2> - <p class="answer">If you pay taxes in the United States, your donation to Tor is tax deductible to the full extent required by law. Following is information you may need for reporting purposes:</p> - <p class="answer" style="margin: 1em;"> - <b>Tor Project Tax ID Number (EIN #):</b> 20-8096820<br> - <b>Address:</b><br> - The Tor Project, Inc.<br> - 217 First Avenue South #4903<br> - Seattle, WA 98194<br> - <b>Phone number:</b> 206-420-3136<br> - <b>Contact person:</b> Isabela Bagueros, Executive Director<br></p> - <p id="eu-bank-transfer" class="answer" style="margin: 1em;"">For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide tax-deductible donations for Europeans. They will issue a donation receipt <a href="https://renewablefreedom.org/contact/" target="_blank" class="hyperlinks links">upon request</a>. The account information is as follows:</p> - <p class="answer" style="margin: 1em;"><b>Renewable Freedom Foundation</b><br> - IBAN: DE17721500000053693701<br> - BIC: BYLADEM1ING<br> - Sparkasse Ingolstadt<br> - Rathausplatz 6<br> - 85049 Ingolstadt</p> - </li> - <li> - <h2 class="question">If I am not in the United States, can I still donate?</h2> - <p class="answer">Yes, definitely. Your donation probably isn't tax-deductible (unless you pay taxes on U.S. income) but we would very much appreciate your support.</p> - </li> - <li> - <h2 class="question">It's important to me that my donation be tax-deductible, but I don't pay taxes in the United States.</h2> - <p class="answer">Right now, we can only offer tax-deductibility to donors who pay taxes in the United States. If it's important to you that your donations be tax-deductible in a different country, let us know and we will try to offer tax-deductibility in your country in the future. Or, if you are in Germany, France, or Sweden, these organizations support the Tor network and may be able to offer you tax-deductibility for your donation.</p> - <p class="answer"><a href="https://www.torservers.net/" target="_blank" class="hyperlinks links">torservers.net</a> is a German charitable non-profit that runs a wide variety of exit relays worldwide. They also like donations of bandwidth from ISPs.</p> - <p class="answer"><a href="https://www.noisebridge.net/wiki/Noisebridge_Tor" target="_blank" class="hyperlinks links">Noisebridge</a> is a US-based 501(c)(3) non-profit that collects donations and turns them into more US-based exit relay capacity.</p> - <p class="answer"><a href="https://nos-oignons.net/" target="_blank" class="hyperlinks links">Nos Oignons</a> is a French charitable non-profit that runs fast exit relays in France.</p> - <p class="answer"><a href="https://www.dfri.se/donera/?lang=en" target="_blank" class="hyperlinks links">DFRI</a> is a Swedish non-profit running exit relays.</p> - <p class="answer">These organizations are not the same as <a href="/" target="_blank" class="hyperlinks links">The Tor Project, Inc</a>, but we consider that a good thing. They're run by nice people who are part of the Tor community.</p> - </li> - <li> - <h2 class="question">Can I donate to a specific project, or restrict my donation to a particular purpose?</h2> - <p class="answer">No, sorry. If we accept a donation from someone who has specified how they want it used, we're required by the IRS to track and report separately on that money. That would be a big administrative burden for a small organization, and we don't think it's a good idea for us. However, we would be very happy to hear your ideas and feedback about our work. If you're donating using a mechanism that allows for comments, feel free to send your thoughts that way.</p> - </li> - <li> - <h2 class="question">Can I donate while using Tor Browser?</h2> - <p class="answer">Yes! In our testing, donation works via Tor Browser. If you run into problems, please contact <span class="email">giving(at)torproject.org</span>.</p> - <p class="answer">For users logging in to Paypal: some people had no problem donating via PayPal while using Tor Browser. Some users experience issues because PayPal limits the number of times an IP address can be used in a certain period of time. This is to prevent fraud from card testers. If you run into an issue, please try again. Unfortunately, when we are receiving a high volume of donations, you might need to use a different browser.</p> - </li> - <li> - <h2 class="question">How can I donate via debit or credit card?</h2> - <p class="answer">To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our <a class="hyperlinks links" href="/">donate page</a>.</p> - </li> - <li> - <h2 class="question">Why do you ask for my address and similar information?</h2> - <p class="answer">If you donate by credit card, you will be asked for some information that's required to process your credit card payment, including your billing address. This allows our payment processor to verify your identity, process your payment, and prevent fraudulent charges to your credit card. We don't ask for information beyond what's required by the payment processor.</p> - </li> - <li> - <h2 class="question">Why is there a minimum donation?</h2> - <p class="answer">People who have stolen credit card information often donate to nonprofits as a way of testing whether the card works. These people typically use a very small amount for their testing, and we've found that setting a $2 minimum donation seems to deter them.</p> - </li> - <li> - <h2 class="question">Is there a maximum donation?</h2> - <p class="answer">Nope. More funding from you means we can do more things we are excited to do, like hire a person to monitor the Tor network full time, or research, test, and implement ideas we have for making the Tor network even stronger.</p> - </li> - <li id="donate-anonymous"> - <h2 class="question">If I want my donation to be anonymous, what is the best way for me to donate?</h2> - <p class="answer">You can donate by sending us a postal money order. You can donate via bitcoin or another cryptocurrency if you have it set up in a way that preserves your anonymity. You can buy cash gift cards and mail them to us. There are probably other ways to donate anonymously that we haven't thought of -- maybe you will.</p> - </li> - <li id="donate-by-mail"> - <h2 class="question">Can I donate by mail?</h2> - <p class="answer">Yes. Our mailing address is <b>The Tor Project, 217 First Avenue South #4903, Seattle WA 98194, USA</b>.</p> - </li> - <li> - <h2 class="question">Do you accept cash donations?</h2> - <p class="answer">Yes.</p> - </li> - <li> - <h2 class="question">Can I donate via AmazonSmile?</h2> - <p class="answer">Amazon Smile is a website operated by Amazon with the same products, prices, and shopping features as Amazon.com. The difference is that when you shop on Amazon Smile, the Amazon Smile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> - <p class="answer"><a href="https://smile.amazon.com/ch/20-8096820" target="_blank" class="hyperlinks links">Set up the Tor Project on Amazon Smile</a></p> - </li> - <li> - <h2 class="question">Can I donate via Giving Assistant?</h2> - <p class="answer">Giving Assistant helps you donate a percentage of your cash back earnings to us with every purchase you make at 3,000+ popular online retailers.</p> - <p class="answer"><a href="https://givingassistant.org/np#tor-project-inc" target="_blank" class="hyperlinks links">Use Giving Assistant to save money and support the Tor Project</a></p> - </li> - <li id="donate-stock"> - <h2 class="question">Can I make a stock donation?</h2> - <p class="answer">You can donate stock to the Tor Project. Please let us know in advance if you are transmitting securities via DTC by contacting us at <span class="email">giving(at)torproject.org</span>.</p> - <p class="answer" style="margin: 1em;">Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc.<br> - Account Name: The Tor Project<br> - Contact: Jeffrey K. Miller: 206.464.3564<br> - E-mail: <span class="email">jeffrey.k.miller(at)ml.com</span><br> - FAX: 206.388.4456<br> - The Tor Project Account #: ***-*3016<br> - DTC #: 8862<br> - Tax ID #: 20-8096820</p> - </li> - <li> - <h2 class="question">Is the Tor Project required to identify me as a donor to the United States government, or to any other authority?</h2> - <p class="answer">If you donate $20,000 or more to the Tor Project in a single year, we are required to report the donation amount and your name and address (if we have it) to the IRS, on Schedule B of the Form 990, which is filed annually. However, it's normal for nonprofits to redact individual donor information from the copy of the 990 that's made publicly-available, and that's what we do. We are not required to identify donors to any other organization or authority, and we do not.</p> - </li> - <li> - <h2 class="question">In your privacy policy, you say you will never publicly identify me as a donor without my permission. What does that mean?</h2> - <p class="answer">Yes, that's right. If you donate to the Tor Project, there will be some people at the Tor Project who know about your donation. However, we will never publicly identify you as a donor, unless you have given us permission to do so. That means we won't post your name on our website, thank you on Twitter, or do anything else that would publicly identify you as someone who has donated. If we decide we would like to publicly name you as a donor, we will ask you first, and will not do it until and unless you say it's okay. If you talk about your donation on social media (and we appreciate you doing so!), we will take that to mean it's okay for us to engage with or amplify your post.</p> - </li> - <li> - <h2 class="question">What is your donor privacy policy?</h2> - <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="/privacy-policy">donor privacy policy</a>.</p> - </li> - <li> - <h2 class="question">What is your refund policy?</h2> - <p class="answer">If you want your donation refunded, please tell us by emailing <span class="email">giving(at)torproject.org</span>. To process your refund we'll need to know the date of your donation, the amount you donated, your full name, the payment method you used and your country of origin. Please also tell us why you're asking for a refund. Please note that some payment methods won't support refunds, or require them to be made in a specific way, so we may need additional information from you in order to process yours.</p> - </li> - <li> - <h2 class="question">Does Tor Project accept matching donations?</h2> - <p class="answer">Yes! Many companies --such as Google, Microsoft, eBay, PayPal, Apple, Verizon, Red Hat, many universities, and others-- will match donations made by their employees. The fastest way to find out if your company matches donations is usually by checking with your HR department. If you want help figuring out the process, write us at <span class="email">giving(at)torproject.org</a>.</p> - </li> - <li> - <h2 class="question">Can I become a Tor Project member?</h2> - <p class="answer">Right now, we don't have a membership program, but we may set one up in the future. If you want to get involved with the Tor Project, <a class="hyperlinks links" target="_blank" href="https://community.torproject.org">this is a good place to start</a>. We do have two giving programs - Champions of Privacy and Defenders of Privacy. Champions of Privacy donate $1,000 or more per year and enjoy special perks and access. Defenders of Privacy sign up to donate monthly and receive an exclusive patch.</p> - </li> - <li> - <h2 class="question">How can I get a Tor t-shirt or stickers?</h2> - <p class="answer">A variety of thank-you gifts for donors, including t-shirts, hoodies and stickers, are presented on our main <a class="hyperlinks links" href="/">donation page</a>.</p> - </li> - <li> - <h2 class="question">If I want to stay in touch with the Tor Project, what's the best way for me to do that?</h2> - <p class="answer">You can sign up to receive <a class="hyperlinks links" target="_blank" href="https://newsletter.torproject.org/">Tor News</a>, read the <a class="hyperlinks links" target="_blank" href="https://blog.torproject.org/">Tor Blog</a>, or <a class="hyperlinks links" target="_blank" href="https://twitter.com/torproject">follow us on Twitter</a>.</p> - </li> - <li> - <h2 class="question">Does the Tor Project participate in the Combined Federal Campaign program?</h2> - <p class="answer">Tor is set up to participate in the <a href="https://www.kingcounty.gov/audience/employees/giving.aspx" target="_blank" class="hyperlinks links">King County Employee Giving Program</a>. Tor doesn't currently participate in the Federal CFC program. If you'd like to get Tor added to the CFC program in your location, that would be great: please let us know if you need any help.</p> - </li> - <li> - <h2 class="question">Can I donate my airline miles, flight vouchers, or hotel points?</h2> - <p class="answer">No, sorry. We would like to accept your miles, vouchers and hotel points, and in the future we may be able to.</p> - </li> - <li> - <h2 class="question">Can I donate hardware?</h2> - <p class="answer">Typically no, we don't encourage people to donate hardware. But if you want to make a hardware donation that you think might be especially useful for us, please mail <span class="email">giving(at)torproject.org</span>.</p> - </li> - <li> - <h2 class="question">Can I donate my time?</h2> - <p class="answer">Yes. Here's a <a class="hyperlinks links" target="_blank" href="https://community.torproject.org">list of areas where we would love your help</a>.</p> - </li> - <li> - <h2 class="question">I would like my company to support Tor. What can we do to help?</h2> - <p class="answer">Your company could match donations made by its employees to the Tor Project--that would be wonderful. Your company may operate a corporate foundation that gives out grants, and if so, you should encourage it to fund us. Maybe your company would be willing to <a class="hyperlinks links" target="_blank" href="https://community.torproject.org/relay/">operate a Tor relay</a>. If your company sells cloud services, perhaps it could donate these to Tor: We use them in some anti-censorship projects.</p> - </li> - <li> - <h2 class="question">You don't support my preferred way to donate. Can I recommend a new donation method to you?</h2> - <p class="answer">Sure. Just mail us at <span class="email">giving(at)torproject.org</span></a>.</p> - </li> - <li> - <h2 class="question">Will the Tor Project accept donations from anybody, or do you reserve the right to reject support from specific organizations or individuals?</h2> - <p class="answer">We do reserve the right to reject a donation. To date though, we haven't exercised that right. We are happy that a broad range of people use and support Tor.</p> - </li> - <li> - <h2 class="question">I have more questions. How can I get answers?</h2> - <p class="answer">Feel free to send questions to <span class="email">frontdesk(at)rt.torproject.org</span>. We will try to answer you, and we'll also post your question (and the answer) here.</p> - </li> - </ol> - <hr/> - <div class="button-line"> - <a class="purple button" href="/state-disclosures">State Registration Disclosures</a> - </div> - <div class="button-line"> - <a class="purple button" href="/">Back to Donate Page</a> - </div> - </div> -</div> --- html: donate-empty.html

1 0

[donate-static/staging] Change header add color remove full navbar
by hiro＠torproject.org 19 Oct '20

19 Oct '20

commit 987d3c6f4ed0e3aaac13ae8a56754735303ecf79 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 19 20:22:55 2020 +0200 Change header add color remove full navbar --- content/contents.lr | 4 +++- lego | 2 +- models/donate-form.ini | 4 ++++ templates/meta.html | 6 +----- templates/navbar-min.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 7 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index 4e429406..f4cc42db 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -84,7 +84,9 @@ tshirt_perk_monthly_label: T-Shirt --- tshirt_perk_monthly_image: /static/images/donate/t-shirt-take-back-internet.png --- -header_image: /static/css/images/home/png/use-tor.png +header_image: /static/css/images/donate-banner.png +--- +header_color: black --- success_redirect_url: --- diff --git a/lego b/lego index 96b2d951..a1bf61f3 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 96b2d9518869f95e3dbcc9c9af1f05c5d7f769b4 +Subproject commit a1bf61f36ccf730df140f684e3ea6970b6d6a9d8 diff --git a/models/donate-form.ini b/models/donate-form.ini index 943f775d..db053c7a 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -40,6 +40,10 @@ type = markdown label = Header Image (centered) type = string +[fields.header_color] +label = Header Color +type = string + [fields.success_redirect_url] label = URL to redirect to after donation completed successfully type = url diff --git a/templates/meta.html b/templates/meta.html index 9e9c26b0..17a9652f 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,9 +20,5 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% if this.path == '/download' %} - {% include 'navbar-min.html' %} - {% else %} - {% include 'navbar.html' %} - {% endif %} + {% include 'navbar-min.html' %} </header> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 00000000..51e0bc3b --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,49 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2 d-flex justify-content-between"> +{% endif %} + <div> + <div class="row"> + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <h4 class="pl-2 pr-2 pt-3"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% else %} + <h4 class="pl-2 pr-2 pt-3"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% endif %} + </div> + </div> + {% set alts = bag('alternatives').items() %} + {% if alts|length > 1 %} + <div class="btn-group dropdown float-right"> + {% if not this.color %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% elif this.color == 'primary' %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% else %} + <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% endif %} + {{ bag('alternatives', this.alt, 'language') }} + </button> + <div class="dropdown-menu"> + {% for id, item in bag('alternatives').items() %} + {% if this.alt != id %} + <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> + {% endif %} + {% endfor %} + </div> + </div> + {% endif %} + + </nav> +</div>

1 0