November 2016 - tor-commits - lists.torproject.org

[webwml/master] Revert "Remove amazon donation option"
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 0f9c15e73bf8df7984c54b4f2d3b7bcc32bd436e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 03:06:25 2016 +0100 Revert "Remove amazon donation option" This reverts commit 47f274b685f710b12606c333c31c563cc1b67fad. --- donate/en/donate-options.wml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 7aeb1c3..144cff9 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -17,7 +17,7 @@ form#makeDonation { <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving(a)torproject.org.)</p> <ul class="hlist"> <li><a href="#bitcoin">Bitcoin</a></li> -# <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> + <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li> <li><a href="#eubanks">EU Bank Transfer</a></li> <li class="last"><a href="#cash">Checks or Money Orders</a></li> @@ -94,22 +94,22 @@ form#makeDonation { </div> </div>  -# -# <div class="hundred toptwenty"> -# <div class="dbox dsmall dwolla"> -# <h3>Donate via Amazon</h3> -# <p>You can donate to Tor through your Amazon account.</p> -# <p style="text-align:center;"><strong><a -#href="<page donate/donate-amazon>">Donate via Amazon Payments -#»</a></strong></p> -# </div> -# <div class="dbox dsmall dwolla"> -# <h3>Donate via Amazon Smile</h3> -# <p>AmazonSmile 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 AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> -# <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile -#»</a></strong></p> -# </div> -# + + <div class="hundred toptwenty"> + <div class="dbox dsmall dwolla"> + <h3>Donate via Amazon</h3> + <p>You can donate to Tor through your Amazon account.</p> + <p style="text-align:center;"><strong><a +href="<page donate/donate-amazon>">Donate via Amazon Payments +»</a></strong></p> + </div> + <div class="dbox dsmall dwolla"> + <h3>Donate via Amazon Smile</h3> + <p>AmazonSmile 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 AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> + <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile +»</a></strong></p> + </div> +  <a id="eubanks"></a> <div class="">

1 0

[webwml/master] Remove amazon donation option
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 47f274b685f710b12606c333c31c563cc1b67fad Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 03:03:47 2016 +0100 Remove amazon donation option --- donate/en/donate-options.wml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 144cff9..7aeb1c3 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -17,7 +17,7 @@ form#makeDonation { <p>The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving(a)torproject.org.)</p> <ul class="hlist"> <li><a href="#bitcoin">Bitcoin</a></li> - <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> +# <li><a href="<page donate/donate-amazon>">Amazon Payments</a></li> <li><a href="https://smile.amazon.com/ch/20-8096820">Amazon Smile</a></li> <li><a href="#eubanks">EU Bank Transfer</a></li> <li class="last"><a href="#cash">Checks or Money Orders</a></li> @@ -94,22 +94,22 @@ form#makeDonation { </div> </div>  - - <div class="hundred toptwenty"> - <div class="dbox dsmall dwolla"> - <h3>Donate via Amazon</h3> - <p>You can donate to Tor through your Amazon account.</p> - <p style="text-align:center;"><strong><a -href="<page donate/donate-amazon>">Donate via Amazon Payments -»</a></strong></p> - </div> - <div class="dbox dsmall dwolla"> - <h3>Donate via Amazon Smile</h3> - <p>AmazonSmile 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 AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> - <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile -»</a></strong></p> - </div> - +# +# <div class="hundred toptwenty"> +# <div class="dbox dsmall dwolla"> +# <h3>Donate via Amazon</h3> +# <p>You can donate to Tor through your Amazon account.</p> +# <p style="text-align:center;"><strong><a +#href="<page donate/donate-amazon>">Donate via Amazon Payments +#»</a></strong></p> +# </div> +# <div class="dbox dsmall dwolla"> +# <h3>Donate via Amazon Smile</h3> +# <p>AmazonSmile 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 AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the purchase price of eligible products to the charitable organization of your choice.</p> +# <p style="text-align:center;"><strong><a href="https://smile.amazon.com/ch/20-8096820">Set up the Tor Project on Amazon Smile +#»</a></strong></p> +# </div> +#  <a id="eubanks"></a> <div class="">

1 0

[webwml/master] Also deprecate donating hardware
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit b66a34293fd5b5aeaf1f779619f80f7a849086cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:53:39 2016 +0100 Also deprecate donating hardware --- donate/en/sidenav.wmi | 3 --- 1 file changed, 3 deletions(-) diff --git a/donate/en/sidenav.wmi b/donate/en/sidenav.wmi index 85876da..f085f78 100644 --- a/donate/en/sidenav.wmi +++ b/donate/en/sidenav.wmi @@ -22,9 +22,6 @@ {'url' => 'donate/donate', 'txt' => 'Monetary Donations', }, - {'url' => 'donate/donate-hardware', - 'txt' => 'Hardware Donations', - }, {'url' => 'donate/matching-program', 'txt' => 'Matching Program', },

1 0

[webwml/master] Deprecate donating services
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 0d12cd15b99dc7ee23a5ec848728f1b9ce2763f3 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:50:47 2016 +0100 Deprecate donating services --- donate/en/sidenav.wmi | 3 --- 1 file changed, 3 deletions(-) diff --git a/donate/en/sidenav.wmi b/donate/en/sidenav.wmi index 71c2e4b..85876da 100644 --- a/donate/en/sidenav.wmi +++ b/donate/en/sidenav.wmi @@ -25,9 +25,6 @@ {'url' => 'donate/donate-hardware', 'txt' => 'Hardware Donations', }, - {'url' => 'donate/donate-service', - 'txt' => 'Service Donations', - }, {'url' => 'donate/matching-program', 'txt' => 'Matching Program', },

1 0

[webwml/staging] Reinstance donate-download.wml
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 0efb8353e2a88887dcb5cd0531c95eaad59bd354 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:45:01 2016 +0100 Reinstance donate-download.wml --- donate/en/donate-download.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Merge branch 'master' into staging
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit f537f67403f8aa8a50e31c24f4036b4fb7974bb0 Merge: b26b4d3 0efb835 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:45:20 2016 +0100 Merge branch 'master' into staging donate/en/donate-download.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[webwml/master] Reinstance donate-download.wml
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 0efb8353e2a88887dcb5cd0531c95eaad59bd354 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:45:01 2016 +0100 Reinstance donate-download.wml --- donate/en/donate-download.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/master] Redirect /PT as well as /PT/
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 40a25260bb811f36611ac47cdacbdf36182a0e5b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:34:19 2016 +0100 Redirect /PT as well as /PT/ Implements #20730, thanks dcf --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3e351c3..5d0277a 100644 --- a/.htaccess +++ b/.htaccess @@ -31,7 +31,7 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L] RewriteRule ^projects/$ /projects/projects [R=301,L] #Pluggable Transports -RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L] +RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L] RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L] RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L] RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]

1 0

[webwml/staging] Couple of rewrite rule tweaks
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit ff26816eed7e4968e320684d481a383c77b47466 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:12:41 2016 +0100 Couple of rewrite rule tweaks --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 61f5152..3e351c3 100644 --- a/.htaccess +++ b/.htaccess @@ -46,7 +46,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] # other (feel free to categorize) RewriteRule ^people(.*) /about/corepeople$1 [R=301,L] -RewriteRule ^donate/$ /donate/donate [R=301,L] +RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^contact(.*) /about/contact$1 [R=301,L] # Download websites @@ -74,6 +74,6 @@ RewriteRule ^js/$ / [R=301,L] RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L] -RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L] +RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]

1 0

[webwml/staging] Clean up unused donate pages
by sebastian＠torproject.org 23 Nov '16

23 Nov '16

commit 973ede2fb7949b812074bbe9f9ade47493684e31 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 23 02:29:29 2016 +0100 Clean up unused donate pages --- about/en/contact.wml | 2 +- donate/en/donate-amazon.wml | 42 -------- donate/en/donate-appelbaum.wml | 0 donate/en/donate-banner.wml | 0 donate/en/donate-blog-alison.wml | 0 donate/en/donate-blog-benw.wml | 0 donate/en/donate-blog-cory.wml | 0 donate/en/donate-blog-ellsberg.wml | 0 donate/en/donate-blog-landau.wml | 0 donate/en/donate-blog-molly.wml | 0 donate/en/donate-blog-nanni.wml | 0 donate/en/donate-blog-rabbirob.wml | 0 donate/en/donate-chaos.wml | 0 donate/en/donate-download.wml | 0 donate/en/donate-george-torwell.wml | 0 donate/en/donate-hardware.wml | 35 ------- donate/en/donate-hp.wml | 0 donate/en/donate-hpbanner.wml | 0 donate/en/donate-roger.wml | 0 donate/en/donate-service.wml | 45 -------- donate/en/donate-snowden.wml | 0 donate/en/donate-tbb.wml | 0 donate/en/donate-twitter.wml | 0 donate/en/donate.wml | 203 ------------------------------------ 24 files changed, 1 insertion(+), 326 deletions(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 1668cbd..055e001 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -94,7 +94,7 @@ <ul> <li><i>donations(a)torproject.org</i> is for questions and comments about <a - href="<page donate/donate>">getting money to the developers</a>. More + href="https://donate.torproject.org">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li> diff --git a/donate/en/donate-amazon.wml b/donate/en/donate-amazon.wml deleted file mode 100644 index 591b97b..0000000 --- a/donate/en/donate-amazon.wml +++ /dev/null @@ -1,42 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate>">Donate</a> - </div> -<div id="maincol"> - -<script async src="https://static-na.payments-amazon.com/OffAmazonPayments/us/js/Widgets.js"></script> -<div - data-ap-widget-type="expressDonationWidget" - data-ap-widget-theme="ap-light" - data-ap-widget-amount-presets="5,25,50,100" - data-ap-widget-default-amount="1" - data-ap-signature="%2B6UiARhqtXOPGLHP%2F6DrD3zH68ZHxmA9tBLjfjJ3jYU%3D" - data-ap-seller-id="A3KD3XX49657E7" - data-ap-access-key="AKIAISELZYVMUQ7F5M7Q" - data-ap-lwa-client-id="amzn1.application-oa2-client.b0b3efe8eb6841ed800ff2cc45b12dba" - data-ap-return-url="https://www.torproject.org/donate/thankyou" - data-ap-currency-code="USD" - data-ap-amount="0" - data-ap-note="Thank you for your donation to The Tor Project. The Tor Project is a 501c3 organization, and our federal tax ID number is 20-8096820. Your gift is tax deductible in the United States as allowed by law. The Tor Project respects the confidentiality of its supporters, and we do not lend, rent, or sell our lists of donors at any time. Your donation enables Tor developers to focus on making Tor better, including scalability, user support and better documentation, usability and incentives, and research into better privacy approaches. If you would like to keep in touch or get more involved, please visit us at www.torproject.org. Our 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. " - data-ap-shipping-address-required="false" - data-ap-payment-action="AuthorizeAndCapture" -> -</div> - - - -</div> - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  - -</div> -#include <foot.wmi> diff --git a/donate/en/donate-appelbaum.wml b/donate/en/donate-appelbaum.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-banner.wml b/donate/en/donate-banner.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-alison.wml b/donate/en/donate-blog-alison.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-benw.wml b/donate/en/donate-blog-benw.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-cory.wml b/donate/en/donate-blog-cory.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-ellsberg.wml b/donate/en/donate-blog-ellsberg.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-landau.wml b/donate/en/donate-blog-landau.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-molly.wml b/donate/en/donate-blog-molly.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-nanni.wml b/donate/en/donate-blog-nanni.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-blog-rabbirob.wml b/donate/en/donate-blog-rabbirob.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-chaos.wml b/donate/en/donate-chaos.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-download.wml b/donate/en/donate-download.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-george-torwell.wml b/donate/en/donate-george-torwell.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-hardware.wml b/donate/en/donate-hardware.wml deleted file mode 100644 index 6dbe35d..0000000 --- a/donate/en/donate-hardware.wml +++ /dev/null @@ -1,35 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate Hardware to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate-hardware>">Donate Hardware</a> - </div> - <div id="maincol"> - <h1>Hardware Donations</h1> - <p>We're generally looking for donated hardware and support services - that could be used to provide the infrastructure that supports - Tor's operations, including website mirrors, database servers, build - systems and legacy hardware for supporting packages on older Operating - Systems; Windows 7, Redhat, CentOS, Fedora, Debian, etc. A number of - service providers have an abundance of bandwidth capacity, but need - hardware in order to donate it to us.</p> - - <p>By donating hardware, you're joining our many <a href="<page - about/sponsors>">sponsors</a> in providing online privacy and anonymity. If - you want Tor to work on your architecture or hardware, a fine way to - do this is to donate the hardware and operating system to us. Contact - us at donations(a)torproject.org for more details.</p> - </div> -  - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> diff --git a/donate/en/donate-hp.wml b/donate/en/donate-hp.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-hpbanner.wml b/donate/en/donate-hpbanner.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-roger.wml b/donate/en/donate-roger.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-service.wml b/donate/en/donate-service.wml deleted file mode 100644 index 19f7f7a..0000000 --- a/donate/en/donate-service.wml +++ /dev/null @@ -1,45 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: Donate Services to Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page donate/donate-service>">Donate Services</a> - </div> - <div id="maincol"> - <h1>Service Donations</h1> - <p>The Tor Project is always looking for services relating to - technical needs, like bandwidth, colocation, hosted services, legal - representation, or consulting. By donating services, you join our many - sponsors in providing online privacy and anonymity. We're currently - looking for scalable hosting services for reporting needs from large - data sets and reliable high-bandwidth hosting. We may have hardware - we can provide you for your service donation.</p> - - <p>Can you write code? We're always looking for smart, motivated coders - to either port Tor to new or old operating systems, or solve difficult - online anonymity problems. Take a look at our coding projects.</p> - - <p>Are you a creative person? Do you have a fantastic idea for a - campaign? Are you someone who can come up with awesome artwork? We're - always looking for new ways to promote Tor and get the word out that - everyone needs their privacy and anonymity online.</p> - - <p>Is your legal firm willing to defend Tor and its volunteers? Are - you waiting for an interesting case to defend online privacy and - anonymity?</p> - - <p>If any of the service ideas struck a nerve, contact us at - donations(a)torproject.org for more details.</p> - </div> -  - <div id = "sidecol"> -#include "side-donate.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> diff --git a/donate/en/donate-snowden.wml b/donate/en/donate-snowden.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-tbb.wml b/donate/en/donate-tbb.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-twitter.wml b/donate/en/donate-twitter.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate.wml b/donate/en/donate.wml index df5a331..e69de29 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -1,203 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "donatehead.wmi" TITLE="Donate to keep Tor alive!" CHARSET="UTF-8" - -<div class="donation"> - - <div class="quote-section"> - <div class="container"> - <div class="row"> - <div class="col-sm-3 img-section"> - <img src="$(IMGROOT)/shari.png" class="img-thumbnail img-responsive champion" alt="Shari Steele"> - </div> - - <div class="col-sm-9 col-xs-offset-0"> - <blockquote> -Tor is an essential part of the Internet freedom infrastructure, and I'm looking forward to working with the Tor Project to continue to grow the movement. - <footer class="pull-right source-quote"><cite title="Source Title">Shari Steele</cite></footer> - </blockquote> - </div> - - </div> - </div> - </div> - - - <div class="container"> - - <div class="row"> - <div class="col-sm-7"> - <h2 class="main-text">Your support is critical to our success</h2> - <hr> - <p style="text-align:left;">Donate $23 or more, get swag, take a picture and share it with us via <code><a href="https://twitter.com/search?q=%23SupportTor" target="_blank">#supportTor</a></code> hashtag.</p> - - <noscript class="perks"> - <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> - <p style="text-align:left;">Donate $23+ to get a <b>pack of stickers</b></p> - <p style="text-align:left;">Donate $100+ to get a <b>Tor supporter tshirt</b></p> - <p style="text-align:left;">Donate $500+ to get a <b>hoodie</b></p> - </noscript> - - <h4 style="text-align:left; padding-top:10px;"><b>Perks</b></h4> - <div class="col-sm-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> - <div class="col-sm-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> - <div class="col-sm-4 no-padding"><img id="hoody" class="img-responsive half-opacity" src="$(IMGROOT)/swag-hoody-lg.png" alt="hoody"></div> - - </div> - <div class="donate-section col-sm-5"> - <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <div class="row col-md-offset-0 combined-input"> - <div class="left col-xs-6 btn btn-default btn-lg active"> - <label class="choiceLabel"> - <input class="sr-only" name="cmd" id="blankRadio1" type="radio" value="_donations" aria-label="one_time"checked > - <span>One-time</span> - </label> - </div> - <div class="right col-xs-6 btn btn-default btn-lg "> - <label class="choiceLabel"> - <input class="sr-only" name="cmd" id="blankRadio2" type="radio" value="_xclick-subscriptions" aria-label="monthly"> - <span>Monthly</span> - </label> - </div> - </div> - - <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;"> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="10" id="amount10" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn">$10</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="23" id="amount23" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a sticker!">$23</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="100" id="amount100" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$100</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="256" id="amount256" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a tshirt!">$256</button> - </div> - <div style="padding-bottom:5px;" class="col-xs-6"> - <button value="500" id="amount500" name="amnt" type="button" class="btn btn-default btn-lg btn-block amnt-btn" title="You get a hoody!">$500</button> - </div> - <div class="col-xs-6 form-group-lg"> - <label class="sr-only" for="exampleInputAmount">1</label> - <div class="input-group"> - <div class="input-group-addon">$</div> - <input type="number" min="5" step="1" name="custom_amnt" class="form-control" id="exampleInputAmount" placeholder="other amount"> - </div> - </div> - </div> - <div style="padding: 0 15px;"> - <h5 class="error-msg">The minimum donation amount is $5</h5> - <button id="donate-btn" class="btn btn-primary btn-lg btn-block donate-button" style="padding:10px;">Donate</button> - <h5>via PayPal (doesn't require an account)</h5> - <h4><a href="<page donate/donate-options>">Other Ways to Donate</a></h4> - </div> - <input type="hidden" id="amount" name="amount" value=""> - <input type="hidden" id="a3" name="a3" value="0"> - <input type="hidden" id="p3" name="p3" value="1"> - <input type="hidden" id="t3" name="t3" value="M"> - <input type="hidden" name="sra" value="1"> - <input type="hidden" name="src" value="1"> - <input type="hidden" name="no_shipping" value="1"> - <input type="hidden" name="no_note" value="1"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/getinvolved/volunteer"> - - - </form> - </div> - </div> - </div> - - - - </div> - - -  - <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> - <script type="text/javascript"> - function displayVals() { - var amount = $( this ).filter(".amnt-btn").val(); - if (amount == null) { - amount = $("#exampleInputAmount").val(); - if ($('#amount').val() == "" && !($("#exampleInputAmount").hasClass("active")) ) { - amount = 23 - $( "#amount23" ).addClass('active'); - } else if (this.id == "exampleInputAmount") { - $( "button" ).removeClass('active'); - $( this ).addClass('active'); - } - } else { - $( ".amnt-btn" ).removeClass('active'); - $( this ).addClass('active'); - $('#amount').val(amount); - } - $('#amount').val(amount); - $('#a3').val(amount); - - $("button[name='amnt']").click(function () { - $(".form-control").val(null); - $(".error-msg").css("display","none"); - }); - - if (23 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 100) { - $("#stickers").css("opacity","1"); - $("#tshirt").css("opacity","0.5"); - $("#hoody").css("opacity","0.5"); - }else if (100 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 500) { - $("#tshirt").css("opacity","1"); - $("#stickers").css("opacity","0.5"); - $("#hoody").css("opacity","0.5"); - }else if (500 <= parseInt($("#amount").val())) { - $("#hoody").css("opacity","1"); - $("#stickers").css("opacity","0.5"); - $("#tshirt").css("opacity","0.5"); - }else{ - $("#hoody").css("opacity","0.5"); - $("#stickers").css("opacity","0.5"); - $("#tshirt").css("opacity","0.5"); - } - - } - $( document ).ready(function() { - $("button[name='amnt']").click(displayVals); - $("#exampleInputAmount").click(displayVals); - $("#exampleInputAmount").change(displayVals); - displayVals(); - - $("#exampleInputAmount").change(function(){ - if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { - $(".error-msg").css("display","block"); - } else{ - $(".error-msg").css("display","none"); - } - }); - - $("#donate-btn").click(function(event){ - if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { - event.preventDefault(); - $(".error-msg").css("display","block"); - } else{ - $(".error-msg").css("display","none"); - } - }); - - $(".left").click(function(){ - $(".left").addClass('active'); - $(".right").removeClass('active'); - }); - $(".right").click(function(){ - $(".right").addClass('active'); - $(".left").removeClass('active'); - }); - - }); - - - </script> - -#include <donatefoot.wmi>

1 0