January 2017 - tor-commits - lists.torproject.org

[webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit e27390e76ca3ffdb6981067fe7ed4ac5f0854943 Merge: 1f0363b fd8c847 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 25 17:17:44 2017 +0100 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml Makefile | 4 +- include/lang.wmi | 2 +- include/versions.wmi | 60 +++++++++++++++--------------- projects/en/torbrowser.wml | 22 +++++------ projects/torbrowser/RecommendedTBBVersions | 12 +++++- 5 files changed, 54 insertions(+), 46 deletions(-)

1 0

[webwml/master] add amazon and dwolla icon to images directory
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit c3880877009745ad9fc9cf995a1a4ab41456a4e8 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 15:44:32 2015 +0800 add amazon and dwolla icon to images directory --- donate/en/donate.wml | 6 +++--- images/amazon-smile.jpg | Bin 0 -> 34854 bytes images/amazon.jpg | Bin 0 -> 36076 bytes images/dwolla.jpg | Bin 0 -> 34497 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 02140ba..e9225dd 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -244,20 +244,20 @@ <div class="dsmall col-sm-4"> <a href="../donate/donate-amazon.html.en"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon.jpg"> </a> </div> <div class="dsmall col-sm-4"> <a href="https://smile.amazon.com/ch/20-8096820"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon-smile.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/amazon-smile.jpg"> </a> </div> <div class="dsmall col-sm-4"> <a id="dwolla"></a> <a href="https://smile.amazon.com/ch/20-8096820"> - <img class="img-responsive img-thumbnail other-ways-img" src="../images/dwolla.jpg"> + <img class="img-responsive img-thumbnail other-ways-img" src="$(IMGROOT)/dwolla.jpg"> </a> </div> </div> diff --git a/images/amazon-smile.jpg b/images/amazon-smile.jpg new file mode 100644 index 0000000..3e188dd Binary files /dev/null and b/images/amazon-smile.jpg differ diff --git a/images/amazon.jpg b/images/amazon.jpg new file mode 100644 index 0000000..d954448 Binary files /dev/null and b/images/amazon.jpg differ diff --git a/images/dwolla.jpg b/images/dwolla.jpg new file mode 100644 index 0000000..b64bbf3 Binary files /dev/null and b/images/dwolla.jpg differ

1 0

[webwml/master] fix footer position
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 574fd11cdbd13939c09d24a688c652f6817dc44c Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 16:10:31 2015 +0800 fix footer position change it from sticky footer to the normal one. remove the margin-bottom of donation section in order to remove the space between get-in-touch and footer. --- css/donate-style.css | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 7ee5509..34d771a 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -132,7 +132,6 @@ html { } .donation{ text-align: center; - margin-bottom: 125px; } .main-text{ margin-top: 50px; @@ -304,9 +303,6 @@ blockquote footer{ margin-top: 50px; } footer.footer{ - margin-top: 20px; - position: absolute; - bottom: 0; width: 100%; /* Set the height of the footer here */ /*height: 65px;*/ @@ -314,18 +310,6 @@ footer.footer{ padding-bottom: 10px; background-color: #f5f5f5; } -.donate-button { - background-color: #4FAB76; - border-color: #47996A; -} -.donate-button:hover, -.donate-button:focus, -.donate-button:active, -.donate-button:active:hover, -.donate-button:active:focus{ - background-color: #47996A; - border-color: #47996A; -} @media (max-width: 991px) { blockquote { margin: 30px 0 0 0; @@ -439,7 +423,6 @@ footer.footer{ width: 35%; } footer.footer { - margin-top: 10px; margin-bottom: 0px; } footer.footer > p {

1 0

[webwml/master] add other ways to danate section to the bottom of the main donate page
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 90803ed6ef6d070c6127680605208f1ad3a00b8f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 15:29:50 2015 +0800 add other ways to danate section to the bottom of the main donate page --- donate/en/donate.wml | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 44d6432..02140ba 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -113,6 +113,174 @@ </div> </div> </div> + + <div id="other-ways-section"> + <div class="container-fluid"> + <div id="maincol"> + <div class="hundred toptwenty"> + + <div class="row-eqheight"> + +  + <div class="col-sm-6 bitcoin"> + <a id="bitcoin"></a> + <h3><strong>Bitcoins</strong></h3> + <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>, + <a href="http://noisetor.net/#bitcoin">NoiseTor</a>, + <a href="https://www.oniontip.com/">OnionTip</a>, + or <a href="https://tails.boum.org/contribute/how/donate/#bitcoin">Tails</a>. + </p> + <p>If this transaction limit is not an issue for you, please complete the form below:</p> + <form id="bitpayDonation" class="form" action="https://bitpay.com/checkout" method="post" onsubmit="return bp.validateMobileCheckoutForm($('#bitpayDonation'));"> + <input name="action" type="hidden" value="checkout"> + <fieldset class="phone-form well form-horizontal" style="margin-top: 5px;"> + <div class="form-group"> + <label for="bitcoinEmail" class="input-group control-label" style="padding:0;">Email address</label> + <input id="bitcoinEmail" name="orderID" type="email" class="form-control" placeholder="Email address (optional)" maxlength="50" autocapitalize="off" autocorrect="off"> + </div> + + <div class="form-group row"> + <label for="bitcoinAmount" class="input-group control-label">Amount</label> + <div class="col-sm-8" style="padding:0;"> + <input name="price" type="number" class="form-control" id="bitcoinAmount" value="43.00" placeholder="Amount" maxlength="10" min="5"> + </div> + + <div class="col-sm-4" style="padding:0;"> + <select name="currency" value="" class="form-control"> + <option value="USD" selected="selected">USD</option> + <option value="BTC">BTC</option> + <option value="EUR">EUR</option> + <option value="GBP">GBP</option> + <option value="AUD">AUD</option> + <option value="BGN">BGN</option> + <option value="BRL">BRL</option> + <option value="CAD">CAD</option> + <option value="CHF">CHF</option> + <option value="CNY">CNY</option> + <option value="CZK">CZK</option> + <option value="DKK">DKK</option> + <option value="HKD">HKD</option> + <option value="HRK">HRK</option> + <option value="HUF">HUF</option> + <option value="IDR">IDR</option> + <option value="ILS">ILS</option> + <option value="INR">INR</option> + <option value="JPY">JPY</option> + <option value="KRW">KRW</option> + <option value="LTL">LTL</option> + <option value="LVL">LVL</option> + <option value="MXN">MXN</option> + <option value="MYR">MYR</option> + <option value="NOK">NOK</option> + <option value="NZD">NZD</option> + <option value="PHP">PHP</option> + <option value="PLN">PLN</option> + <option value="RON">RON</option> + <option value="RUB">RUB</option> + <option value="SEK">SEK</option> + <option value="SGD">SGD</option> + <option value="THB">THB</option> + <option value="TRY">TRY</option> + <option value="ZAR">ZAR</option> + </select> + </div> + + </div> + <br> + <input type="hidden" name="data" value="iH+sCoKQo5J52hkEzWcMi8+PRt78/89lcSU9GnapWfWL6thyubtDCahTUqa2JTlj6RQrQySkZAoFvK05yifMwfx5V87JJuoaDlHUsZR9ppzkklmzHpKJ4TG5M0zNVcKfNBfyopdfTFbzpOXM2FDppqmU7njsRUF1EZPa0K7SIxpv4lNKSPn1PyjVKVxjnpFE0AZ1Qa75VwZnS+rBNNfwxPsgSz+Oa2Twe226FmJJrLtPuBteFfHAIWh6QS5JnpOn4ScMFph0zjixutmunMAjKw=="> + <div style="margin: auto; width: 100%; text-align: center"> + <input name="submit" src="https://www.torproject.org/images/bitpay-donate-md.png" type="image" style="width: auto" alt="BitPay" border="0"> + </div> + </fieldset> + </form> + </div> +  + + + + + + <div class="col-sm-6 check-eutransfer"> + +  + <a id="cash"></a> + <h4><strong>Check or Money Order</strong></h4> + <p>You can send checks or money orders to:</p> + <p>The Tor Project, Inc<br> + 7 Temple Street, Suite A<br> + Cambridge, MA 02139-2403 USA + </p> +  + +  + <a id="eubanks"></a> + <h4 style="margin-top:20px;"><strong>European Bank Transfer</strong></h4> + <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> + donations for Europeans. (They don't actually pass the money + through to us, but rather we trust them to spend it in Tor's + interest.) They will issue a donation receipt <a + href="https://renewablefreedom.org/contact/">upon request</a>. The + account information is as follows: + </p> + <p>Renewable Freedom Foundation<br> + IBAN: DE17721500000053693701<br> + BIC: BYLADEM1ING<br> + Sparkasse Ingolstadt<br> + Rathausplatz 6<br> + 85049 Ingolstadt<br> + </p> +  + + </div> + + </div> + + + <div class="col-sm-12 even-more"> + + <div class="dsmall col-sm-4"> + <a href="../donate/donate-amazon.html.en"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon.jpg"> + </a> + </div> + + <div class="dsmall col-sm-4"> + <a href="https://smile.amazon.com/ch/20-8096820"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/amazon-smile.jpg"> + </a> + </div> + + <div class="dsmall col-sm-4"> + <a id="dwolla"></a> + <a href="https://smile.amazon.com/ch/20-8096820"> + <img class="img-responsive img-thumbnail other-ways-img" src="../images/dwolla.jpg"> + </a> + </div> + </div> + + </div>  + </div>  + </div>  + + </div> + + <div class="get-in-touch"> + <div class="container"> + <div class="row"> + <div class="col-xs-4"> + <h3 class="title"><strong>Get in touch.</strong></h3> + </div> + <div class="col-xs-8"> + <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> + </div> + </div> + </div> + </div> + </div>

1 0

[webwml/master] code clean up
by hiro＠torproject.org 25 Jan '17

25 Jan '17

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/master] fix other amount input
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit c25b5d99b247bb4432ec6f7791a7707e0172822f Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:21:17 2015 +0800 fix other amount input prevent default button to be activated when clicking on other amount input for several times --- 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 791f4cd..44d6432 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -124,7 +124,7 @@ var amount = $( this ).filter(".amnt-btn").val(); if (amount == null) { amount = $("#exampleInputAmount").val(); - if ($('#amount').val() == "") { + if ($('#amount').val() == "" && !($("#exampleInputAmount").hasClass("active")) ) { amount = 23 $( "#amount23" ).addClass('active'); } else if (this.id == "exampleInputAmount") {

1 0

[webwml/master] remove left-border when monthly donation is checked
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit f8882d8916bb0063755ea446b447fef6c98221c7 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:38:36 2015 +0800 remove left-border when monthly donation is checked --- css/donate-style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index 6dad54b..ec40033 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -165,6 +165,9 @@ html { .right{ border-left-width: 0px !important; } +.left{ + border-right-width: 0px !important; +} .choiceLabel{ cursor: pointer !important; margin: 0px !important;

1 0

[webwml/master] fix logo's width
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 17db344b6dce8625090e3a21f2dc05d4a69106b4 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 17:34:14 2015 +0800 fix logo's width --- css/donate-style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/donate-style.css b/css/donate-style.css index b5ccaf5..ce8e43f 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -129,6 +129,7 @@ html { } .logo{ height: 81px; + width: auto; } .donation{ text-align: center;

1 0

[webwml/master] add comments
by hiro＠torproject.org 25 Jan '17

25 Jan '17

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/master] set logo's height exactly same as navbar's height
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 28f552c7974aa79e01c53d5147e4d9092f0767ff Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sat Dec 19 16:50:19 2015 +0800 set logo's height exactly same as navbar's height --- css/donate-style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 40bbf76..b5ccaf5 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -128,7 +128,7 @@ html { margin-top: 28px; } .logo{ - width: 120px; + height: 81px; } .donation{ text-align: center; @@ -377,7 +377,7 @@ footer.footer{ @media (max-width: 399px) { .logo { text-align: center; - width: 25%; + height: 60px; float: none; } .navbar-header{

1 0