commit 86e6088dfddb7c7ef6c41ee79c5c124603e88869 Author: toya toya@muamba.muamba Date: Mon Nov 23 22:35:18 2015 -0800

Adding swag page, update tshirt page and small changes to the other pages. --- donate/en/campaign-swag.wml | 84 ++++++++++++++++++++++++++++++++++++ donate/en/donate.wml | 8 ++-- donate/en/donor-faq.wml | 13 ++++-- donate/en/donor-privacy-policy.wml | 4 +- getinvolved/en/tshirt.wml | 3 +- images/campaign-hoody.jpg | Bin 0 -> 55689 bytes images/campaign-t-shirt-1.jpg | Bin 0 -> 44107 bytes images/campaign-t-shirt-2.jpg | Bin 0 -> 50638 bytes images/sticker-pack.jpg | Bin 0 -> 42540 bytes 9 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/donate/en/campaign-swag.wml b/donate/en/campaign-swag.wml new file mode 100644 index 0000000..43969e9 --- /dev/null +++ b/donate/en/campaign-swag.wml @@ -0,0 +1,84 @@ +## 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="container text-justify"> + <div class="col-md-12 col-md-offset-0"> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + </div> + <div class="col-md-12"> + <h1>Thank you for your donation!</h1> + <div class="table-responsive"> + <table class="table"> + <tr> + <td><h3>$23+ donation is eligible for a sticker pack.</h3></td> + <td><a href="$(IMGROOT)/sticker-pack.jpg"><img src="$(IMGROOT)/sticker-pack.jpg"></a><p>You will receive an assortment of Tor stickers plus our exclusive "Tor Supporter" sticker. Display with pride! :)</p></td> + </tr> + <tr> + <td colspan="2" class="active"> + <h3>$100+ donation is eligible for 1 t-shirt. Select your style and size.</h4> + <p>Both T-shirts are:<br /> + <ul> + <li>100% pre-shrunk organic cotton</li> + <li>Water-based silk screen print</li> + <li>Made fairly</li> + <li>Certification: GOTS</li> + </ul> + </p> + </td> + </tr> + <tr> + <td> + <a href="$(IMGROOT)/campaign-t-shirt-1.jpg"><img src="$(IMGROOT)/campaign-t-shirt-1.jpg"></a> + <p><strong>T-Shirt Design Option #1</strong></p> + <p>(Limited Edition and exclusive to this campaign!)<br /> + <strong>THIS IS WHAT A TOR SUPPORTER LOOKS LIKE</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + <td> + <a href="$(IMGROOT)/campaign-t-shirt-2.jpg"><img src="$(IMGROOT)/campaign-t-shirt-2.jpg"></a> + <p><strong>T-Shirt Design Option #2</strong></p> + <strong>ROOTS</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + </tr> + <tr class="active"> + <td><h3>$500+ donation is eligible for 1 hooded sweatshirt.</h3> + <p>Hooded sweatshirts are: + <ul> + <li>100% pre-shrunk organic cotton</li> + <li>Water-based silk screen print</li> + <li>Made fairly</li> + <li>Certification: GOTS</li> + </ul> + </p> + </td> + <td><a href="$(IMGROOT)/campaign-hoody.jpg"><img src="$(IMGROOT)/campaign-hoody.jpg"></a> + <h4>Select your size.</h4> + <p><strong>Hoodie Design #1 (Limited Edition!)</strong><br /> + <strong>ROOTS</strong></p> + <p>Color: Black <br /> + Sizes available: <br /> + Men S, M, L, XL, XXL <br /> + Women S, M, L</p> + </td> + </tr> + </table> + </div> + <div class="col-md-12 col-md-offset-0"> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + </div> + </div> + </div> +</div> + +#include <donatefoot.wmi> diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 54d39e3..e3381b6 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -29,10 +29,10 @@

<div style="margin-top:20px;" class="btn-group btn-group-lg" role="group"> <div style="padding-bottom:5px;" class="col-md-4"><button id="amount1" name="amnt" type="button" class="btn btn-default btn-lg btn-block">10</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount2" name="amnt" type="button" class="btn btn-default btn-lg btn-block active" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">100</button></div> - <div style="padding-bottom:5px;" class="col-md-4" ><button id="amount3" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">256</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount4" name="amnt" type="button" class="btn btn-default btn-lg btn-block">50</button></div> - <div style="padding-bottom:5px;" class="col-md-4"><button id="amount5" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="For this amount you get a tshirt!">500</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount2" name="amnt" type="button" class="btn btn-default btn-lg btn-block active" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">100</button></div> + <div style="padding-bottom:5px;" class="col-md-4" ><button id="amount3" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a tshirt!">256</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount4" name="amnt" type="button" class="btn btn-default btn-lg btn-block" title="You get a sticker!">23</button></div> + <div style="padding-bottom:5px;" class="col-md-4"><button id="amount5" name="amnt" type="button" class="btn btn-default btn-lg btn-block" data-toggle="tooltip" data-placement="bottom" title="You get a hoody!">500</button></div> <div class="row form-group-lg"> <label class="sr-only" for="exampleInputAmount">1</label> <div class="input-group"> diff --git a/donate/en/donor-faq.wml b/donate/en/donor-faq.wml index 950cd76..2fff4ab 100644 --- a/donate/en/donor-faq.wml +++ b/donate/en/donor-faq.wml @@ -7,7 +7,7 @@ <div class="container"> <div class="row text-justify"> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <div class="col-md-12 col-md-offset-0"> <h2 style="padding:2px; margin-bottom:10px;" class="text-justify">Donor FAQ</h2> @@ -18,7 +18,7 @@ </li> <li> <p><strong>Who works for the Tor Project, and what do they do?</strong></p> - <p>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. Most are not paid by the Tor Project; even our very small staff includes many volunteers. You can read about the core contributors to the Tor Project on our <a href="https://www.torproject.org/about/corepeople.html.en" target="_blank">Core People page</a>.</p> + <p>Thousands 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 20 people in total. You can read about the core contributors to the Tor Project on our <a href="https://www.torproject.org/about/corepeople.html.en" target="_blank">Core People page</a>.</p> </li> <li> <p><strong>Who uses Tor?</strong></p> @@ -78,7 +78,12 @@ </li> <li> <p><strong>Can I donate while using the Tor browser?</strong></p> - <p>Maybe! In our testing, some people had no problem donating via PayPal while using the Tor browser. But, some people couldn't complete the donation process, and one person had their PayPal account temporarily frozen. We recommend not using the Tor browser to donate via PayPal unless you're willing to risk some difficulties with PayPal.</p> + <p>Maybe! In our testing, we saw two scenarios related to Paypal + Tor browser:<br /> + <ol> + <li>Sometimes you get an error after clicking on the 'Donate' button. If this is happening to you, you should change your circuit and try again.</li> + <li>For users logging in to Paypal: some people had no problem donating via PayPal while using the Tor browser. But, some people couldn't complete the donation process, and one person had their PayPal account temporarily frozen. We recommend not using the Tor browser to donate using your PayPal account, unless you're willing to risk some difficulties with PayPal. + </li> + </ol></p> </li> <li> <p><strong>How can I donate via debit or credit card?</strong></p> @@ -187,7 +192,7 @@ </ol> </div> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <!-- Add the extra clearfix for only the required viewport --> <div class="clearfix visible-xs-block"></div> diff --git a/donate/en/donor-privacy-policy.wml b/donate/en/donor-privacy-policy.wml index 0e5cc16..0f1f0bc 100644 --- a/donate/en/donor-privacy-policy.wml +++ b/donate/en/donor-privacy-policy.wml @@ -7,7 +7,7 @@ <div class="container"> <div class="row text-justify"> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <div class="col-md-12 col-md-offset-0"> <h2 style="padding:2px; margin-bottom:10px;">Donor Privacy Policy</h2> @@ -19,7 +19,7 @@ <p><strong>The Tor Project very much appreciates all its donors. Thank you for supporting Tor.</strong></p> </div> <div class="col-md-12 col-md-offset-0"> - <a href="donate.html.en" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> + <a href="<page donate/donate>" class="btn btn-primary btn-md active" role="button">Back to donate page!</a> </div> <!-- Add the extra clearfix for only the required viewport --> <div class="clearfix visible-xs-block"></div> diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 0198d0d..e729d24 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -17,8 +17,7 @@ Tor project. There are three primary ways of contributing:</p>

<ol> - <li>A large enough ($65+) <a href="<page - donate/donate>">donation</a> to the Tor Project.</li> + <li>During our end-of-the-year (2015) fundraising campaign, you can get a special, campaign t-shirt or other <a href="<page donate/campaign-swag>">cool swag</a> by <a href="<page donate/donate>">donating</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're diff --git a/images/campaign-hoody.jpg b/images/campaign-hoody.jpg new file mode 100644 index 0000000..71f4bcf Binary files /dev/null and b/images/campaign-hoody.jpg differ diff --git a/images/campaign-t-shirt-1.jpg b/images/campaign-t-shirt-1.jpg new file mode 100644 index 0000000..406f237 Binary files /dev/null and b/images/campaign-t-shirt-1.jpg differ diff --git a/images/campaign-t-shirt-2.jpg b/images/campaign-t-shirt-2.jpg new file mode 100644 index 0000000..55458b1 Binary files /dev/null and b/images/campaign-t-shirt-2.jpg differ diff --git a/images/sticker-pack.jpg b/images/sticker-pack.jpg new file mode 100644 index 0000000..93f2a02 Binary files /dev/null and b/images/sticker-pack.jpg differ