December 2015 - tor-commits - lists.torproject.org

[webwml/staging] put border between bitcoin and check / eu transfer section
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 5d91aad56ca87bd3f95c2eb0ecf1c19f5e992626 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:23:08 2015 +0800 put border between bitcoin and check / eu transfer section --- css/donate-style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 901eaa6..d4fd12b 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -280,6 +280,7 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; + border-left: 1px dashed #e3e3e3; } .minor-other-ways{ background-color: #FAFAFA; @@ -353,6 +354,10 @@ footer.footer{ #donate > .btn-group { margin-bottom: 15px; } + .check-eutransfer{ + border-left: none; + border-top: 1px dashed #e3e3e3; + } #bitpayDonation > .well { margin-bottom: 30px; }

1 0

[webwml/staging] reduce top margin of check or money order header
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit ce3340a290bd2b99d59633b108710e322a35765f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:00:36 2015 +0800 reduce top margin of check or money order header --- css/donate-style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/donate-style.css b/css/donate-style.css index 8db9989..6111d03 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -275,7 +275,7 @@ blockquote footer{ margin-bottom: 0; } .check-eutransfer{ - padding-top: 20px; + padding-top: 10px; padding-left: 30px; padding-right: 30px; background-color: #F0F0F0;

1 0

[webwml/staging] change background color of other ways section
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 938e125b2c7307ff4fe0da31e6323a256b0debf6 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 00:12:02 2015 +0800 change background color of other ways section --- css/donate-style.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 6111d03..901eaa6 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -247,6 +247,9 @@ blockquote footer{ #other-ways-section > .container-fluid{ padding: 0; } +.main-other-ways{ + background-color: #f5f5f5; +} .hundred.toptwenty{ text-align: justify; margin-top: 0; @@ -263,7 +266,6 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; - background-color: #F5F5F5; } #bitpayDonation > .well > .form-group { margin-right: 0; @@ -278,7 +280,9 @@ blockquote footer{ padding-top: 10px; padding-left: 30px; padding-right: 30px; - background-color: #F0F0F0; +} +.minor-other-ways{ + background-color: #FAFAFA; } .even-more{ padding: 25px 0;

1 0

[webwml/staging] fix dwolla's link
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 172f95bd7b8379fae139560871f05bcaae8502a6 Author: Nima Fatemi <nima(a)torproject.org> Date: Mon Dec 21 00:43:50 2015 +0000 fix dwolla's link --- donate/en/donate.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 490f1a3..4781579 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -256,7 +256,7 @@ <div class="dsmall col-xs-4"> <a id="dwolla"></a> - <a href="https://smile.amazon.com/ch/20-8096820"> + <a href="https://www.dwolla.com/hub/thetorproject"> <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/dwolla.jpg"> </a> </div>

1 0

[webwml/staging] fix other ways section's width
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 06ada809ef5065126152e4f48fe34507a7763f71 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 25 23:55:18 2015 +0800 fix other ways section's width --- donate/en/donate.wml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 9b31aef..044764f 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -114,9 +114,10 @@ </div> </div> - <div id="other-ways-section"> - <div class="container-fluid"> - <div id="maincol"> + <div id="other-ways-section"> + <div class="main-other-ways"> + <div class="container"> + <div id="maincol"> <div class="hundred toptwenty"> <div class="row-eqheight"> @@ -238,8 +239,13 @@ </div> </div> - - + </div>  + </div>  + </div>  + </div>  + + <div class="minor-other-ways"> + <div class="container"> <div class="col-xs-12 even-more"> <div class="dsmall col-xs-4"> @@ -262,9 +268,8 @@ </div> </div> - </div>  - </div>  - </div>  + </div>  + </div>  </div>

1 0

[webwml/staging] add icon to titles of other ways section
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 0b71608bdc194dfaa2084558e32e75b18d80f0bc Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 26 02:46:08 2015 +0800 add icon to titles of other ways section --- css/donate-style.css | 11 +++++++++++ donate/en/donate.wml | 15 ++++++++++++--- images/bank48.png | Bin 0 -> 1719 bytes images/bitcoin.png | Bin 0 -> 2000 bytes images/pantheon1.png | Bin 0 -> 1464 bytes 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 0f5fdfd..cb6908e 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -262,6 +262,17 @@ blockquote footer{ margin-bottom: -99999px; padding-bottom: 99999px; } +.other-ways-title{ + margin: 10px 0; +} +.other-ways-title > h3{ + display: inline; +} +.other-ways-icon{ + background: transparent; + margin-top: -10px; + margin-right: 5px; +} .bitcoin{ padding-top: 10px; padding-left: 30px; diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 044764f..dc6081b 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -125,7 +125,10 @@  <div class="col-sm-6 bitcoin"> <a id="bitcoin"></a> - <h4><strong>Bitcoins</strong></h4> + <div class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/bitcoin.png" width="40" height="40"> + <h3><strong>Bitcoins</strong></h3> + </div> <p>In order to comply with US 501(c)(3) non-profit regulations, our Bitcoin transaction limit is currently $10,000 USD per day. If you wish to avoid transaction limits, please consider a direct Bitcoin donation to <a href="https://www.torservers.net/donate.html#cryptocurrencies">Torservers.net</a>, @@ -207,7 +210,10 @@  <a id="cash"></a> - <h4><strong>Check or Money Order</strong></h4> + <div class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/bank48.png" width="40" height="40"> + <h3><strong>Check or Money Order</strong></h3> + </div> <p>You can send checks or money orders to:</p> <p>The Tor Project, Inc<br> 7 Temple Street, Suite A<br> @@ -217,7 +223,10 @@  <a id="eubanks"></a> - <h4 style="margin-top:20px;"><strong>European Bank Transfer</strong></h4> + <div style="margin-top:30px;" class="other-ways-title"> + <img class="img-thumbnail other-ways-icon" src="../images/pantheon1.png" width="40" height="40"> + <h3><strong>European Bank Transfer</strong></h3> + </div> <p>For European bank transfers, we have an arrangement with the Renewable Freedom Foundation to provide <a href="http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreig…">tax-deductible</a> diff --git a/images/bank48.png b/images/bank48.png new file mode 100644 index 0000000..b488403 Binary files /dev/null and b/images/bank48.png differ diff --git a/images/bitcoin.png b/images/bitcoin.png new file mode 100644 index 0000000..497e514 Binary files /dev/null and b/images/bitcoin.png differ diff --git a/images/pantheon1.png b/images/pantheon1.png new file mode 100644 index 0000000..361a233 Binary files /dev/null and b/images/pantheon1.png differ

1 0

[webwml/staging] Make donate-blog-benw page
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 3e38f7440e3fe8679d47c7315efc06d771bb7689 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Dec 22 18:14:07 2015 +0100 Make donate-blog-benw page --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b5523e3..15c6cc0 100644 --- a/.htaccess +++ b/.htaccess @@ -64,6 +64,7 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-blog-benw.wml b/donate/en/donate-blog-benw.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] add comments
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit 226c14bbc9e4a10ac7a1fe52c7de6eacea47e8fc Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:06:36 2015 +0800 add comments add a div with paypal-donate class in order to wrap up the paypal donate section --- donate/en/donate.wml | 157 +++++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 73 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 3407f14..791f4cd 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -9,6 +9,7 @@ <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> @@ -20,78 +21,80 @@ </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"> + </div> + </div> + </div> + + <div class="paypal-donate"> + <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> - <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 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> - <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 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> - <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> - + <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"> @@ -105,15 +108,16 @@ <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> + </form> + </div> + </div> + </div> + </div> - </div> + </div> + -  <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { @@ -140,6 +144,8 @@ $(".error-msg").css("display","none"); }); + + // Perks functionality if (23 <= parseInt($("#amount").val()) && parseInt($("#amount").val()) < 100) { $("#stickers").css("opacity","1"); $("#tshirt").css("opacity","0.5"); @@ -164,7 +170,9 @@ $("#exampleInputAmount").click(displayVals); $("#exampleInputAmount").change(displayVals); displayVals(); + + // Paypal donate validation when changing other amount input $("#exampleInputAmount").change(function(){ if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { $(".error-msg").css("display","block"); @@ -173,6 +181,7 @@ } }); + // Paypal donate validation when clicking on donate button $("#donate-btn").click(function(event){ if ($("#amount").val() == "" || parseInt($("#amount").val()) < 5) { event.preventDefault(); @@ -182,6 +191,8 @@ } }); + + // monthly or one-time donate functionality $(".left").click(function(){ $(".left").addClass('active'); $(".right").removeClass('active');

1 0

[webwml/staging] code clean up
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit e86338a17bd65f9ec0a7eb1a5099fd53ec1f328b Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 08:29:57 2015 +0800 code clean up --- donate/en/donate.wml | 88 ++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 46 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index feccc11..3407f14 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -4,35 +4,33 @@ #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="donation"> - <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 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> @@ -44,23 +42,23 @@ Tor is an essential part of the Internet freedom infrastructure, and I'm looking <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 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;"> @@ -93,27 +91,25 @@ Tor is an essential part of the Internet freedom infrastructure, and I'm looking <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"> - + + <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>

1 0

[webwml/staging] add a redirect for the george torwell donations drive
by nima＠torproject.org 26 Dec '15

26 Dec '15

commit aeffd059b8082e8318d16f7c64b0b8eeb05def68 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Dec 22 00:49:09 2015 -0500 add a redirect for the george torwell donations drive --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index b3992a7..b5523e3 100644 --- a/.htaccess +++ b/.htaccess @@ -59,6 +59,7 @@ RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L] diff --git a/donate/en/donate-george-torwell.wml b/donate/en/donate-george-torwell.wml new file mode 100644 index 0000000..e69de29

1 0