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

[webwml/staging] reduce margins of donate section on smaller devices
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 3072e259d2fa94bd0b8d333589997314e9b495d0 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 08:34:44 2015 +0800 reduce margins of donate section on smaller devices --- css/donate-style.css | 9 +++++++++ donate/en/donate.wml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/css/donate-style.css b/css/donate-style.css index 7eb4ff0..8e1532f 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -195,6 +195,9 @@ input[type=number] { color: red; display: none; } +#donate > .btn-group { + margin-bottom: 30px; +} .quote-section{ background-color:#67467D; padding: 20px 0; @@ -337,6 +340,12 @@ footer.footer{ blockquote::before { display: none; } + .combined-input { + margin: 0 15px 15px 15px; + } + #donate > .btn-group { + margin-bottom: 15px; + } #bitpayDonation > .well { margin-bottom: 30px; } diff --git a/donate/en/donate.wml b/donate/en/donate.wml index ae70b18..06d8289 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -63,7 +63,7 @@ </div> </div> - <div class="btn-group btn-group-lg" role="group" style="margin-bottom: 30px;"> + <div class="btn-group btn-group-lg" role="group"> <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>

1 0

[webwml/staging] Bug #17880: Donation banner on home page
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 8b7fb8a46588da4dc8c991be396fa3b1f4a66ef4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 18 16:17:23 2015 -0500 Bug #17880: Donation banner on home page --- css/layout.css | 33 +++++++++++++++++++++++++++++++++ en/index.wml | 24 ++++++++++++++++++++++++ images/homepage-banner-cd.jpg | Bin 0 -> 84779 bytes images/homepage-banner-lp.jpg | Bin 0 -> 101171 bytes images/homepage-banner-rd.jpg | Bin 0 -> 86882 bytes images/homepage-banner-rr.jpg | Bin 0 -> 98192 bytes images/homepage-banner-ss.jpg | Bin 0 -> 92697 bytes 7 files changed, 57 insertions(+) diff --git a/css/layout.css b/css/layout.css index 4908ee0..e0cd4a1 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1310,3 +1310,36 @@ p.blogDate { } /* End hide from IE-mac */ +#donation-banner { + display: block; + height: 200px; + margin: auto; + margin-bottom: 5px; + position: relative; + width: 700px; +} + +#donation-banner > a { + display: block; +} + +#donation-banner > img { + display: block; +} + +#donate-button { + background-color: green; + border-radius: 5px; + bottom: 15px; + color: white; + font-family: sans-serif; + font-size: 20px; + padding: 14px 14px; + position: absolute; + right: 15px; + text-align: center; +} + +#donate-button:hover { + filter: brightness(1.2); +} diff --git a/en/index.wml b/en/index.wml index fededd4..09ed2c8 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,6 +2,30 @@ # Revision: $Revision$ # Translation-Priority: 1-high + +<div id="donation-banner"> + <a href="donate/donate-hpbanner.html.en"> + <noscript> +  + <img id="donation-banner-image-noscript" src="images/homepage-banner-ss.jpg" /> + </noscript> +  + <img id="donation-banner-image"" /> + </a> + <a href="donate/donate-hpbanner.html.en"> + <div id="donate-button">Please Donate!</div> + </a> +</div> + +<script> +  + var alternates = ["cd", "lp", "rd", "rr", "ss"]; + var alternate = alternates[Math.floor(Math.random() * alternates.length)]; + var image = document.getElementById("donation-banner-image"); + image.src = "images/homepage-banner-" + alternate + ".jpg"; +</script> + #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" <div id="home"> diff --git a/images/homepage-banner-cd.jpg b/images/homepage-banner-cd.jpg new file mode 100755 index 0000000..4c0e4b3 Binary files /dev/null and b/images/homepage-banner-cd.jpg differ diff --git a/images/homepage-banner-lp.jpg b/images/homepage-banner-lp.jpg new file mode 100755 index 0000000..f5fa76a Binary files /dev/null and b/images/homepage-banner-lp.jpg differ diff --git a/images/homepage-banner-rd.jpg b/images/homepage-banner-rd.jpg new file mode 100755 index 0000000..646f59e Binary files /dev/null and b/images/homepage-banner-rd.jpg differ diff --git a/images/homepage-banner-rr.jpg b/images/homepage-banner-rr.jpg new file mode 100755 index 0000000..4a2a512 Binary files /dev/null and b/images/homepage-banner-rr.jpg differ diff --git a/images/homepage-banner-ss.jpg b/images/homepage-banner-ss.jpg new file mode 100755 index 0000000..c4a0fa7 Binary files /dev/null and b/images/homepage-banner-ss.jpg differ

1 0

[webwml/staging] Merge remote-tracking branch 'arthuredelstein/17880'
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 787af285dd02dd74f1020114c68df9be0d30440a Merge: 4f9a858 8b7fb8a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 02:09:57 2015 +0100 Merge remote-tracking branch 'arthuredelstein/17880' css/layout.css | 33 +++++++++++++++++++++++++++++++++ en/index.wml | 24 ++++++++++++++++++++++++ images/homepage-banner-cd.jpg | Bin 0 -> 84779 bytes images/homepage-banner-lp.jpg | Bin 0 -> 101171 bytes images/homepage-banner-rd.jpg | Bin 0 -> 86882 bytes images/homepage-banner-rr.jpg | Bin 0 -> 98192 bytes images/homepage-banner-ss.jpg | Bin 0 -> 92697 bytes 7 files changed, 57 insertions(+)

1 0

[webwml/staging] Add redirect for broken url used on twitter...
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 285eabdcefa7cce0ddbde30df90648796dc4d04b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 19 12:28:35 2015 +0100 Add redirect for broken url used on twitter... --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 8870a5a..b3992a7 100644 --- a/.htaccess +++ b/.htaccess @@ -66,3 +66,6 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L] +# yuck, https://twitter.com/torproject/status/677928074630049793 +RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L] +

1 0

[webwml/staging] Deprecate old TBB versions
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 55d3326cea993c3154f91535ce0196f88c009617 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 20 01:21:28 2015 +0000 Deprecate old TBB versions --- projects/torbrowser/RecommendedTBBVersions | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 82c8ee9..b0a53b2 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,22 +1,12 @@ [ -"5.0.5", -"5.0.5-Linux", -"5.0.5-MacOS", -"5.0.5-Windows", "5.0.6", "5.0.6-Linux", "5.0.6-MacOS", "5.0.6-Windows", -"5.5a4", -"5.5a4-Linux", -"5.5a4-MacOS", -"5.5a4-Windows", "5.5a5", "5.5a5-Linux", "5.5a5-MacOS", "5.5a5-Windows", -"5.5a4-hardened", -"5.5a4-hardened-Linux", "5.5a5-hardened", "5.5a5-hardened-Linux" ]

1 0

[webwml/staging] Bug #17880: Add ALT text to donation banner.
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit ae3e28d207204cd16426542ecf321d3b6892e56d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Dec 20 14:07:03 2015 -0500 Bug #17880: Add ALT text to donation banner. --- en/index.wml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index 09ed2c8..6fdc5a3 100644 --- a/en/index.wml +++ b/en/index.wml @@ -18,16 +18,25 @@ </a> </div> +#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" + + <script>  var alternates = ["cd", "lp", "rd", "rr", "ss"]; + var altTexts = { + "cd" : '"Privacy and anonymity matter to all of us." -- Cory Doctorow, Novelist, Technology Activist, Co-Editor of Boing Boing', + "lp" : '"Edward Snowden would not have been able to contact me without Tor and other free software encryption projects. Tor is an essential tool, and it needs our support." -- Laura Poitras, Oscar-winning Documentary Filmmaker, Citizenfour', + "rd" : '"Please help the strongest privacy tool in the world become more sustainable!" -- Roger Dingledine, Founder, The Tor Project', + "rr" : '"The internet cannot heal itself in the face of tyrants. Tor is the salve that heals that wound; Tor is what allows us to route around Tyranny." -- Rabbi Rob Thomas, Director of The Tor Project', + "ss" : '"Tor is an essential part of the internet freedom infrastructure." -- Shari Steele, Executive Director of the Tor Project', + }; var alternate = alternates[Math.floor(Math.random() * alternates.length)]; var image = document.getElementById("donation-banner-image"); image.src = "images/homepage-banner-" + alternate + ".jpg"; + image.alt = altTexts[alternate]; </script> -#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" - <div id="home"> <div id="content" class="clearfix"> <div id="maincol">

1 0

[webwml/staging] fix other amount input
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 35065d494d775b0b95ef8388a9a2205fa2a5ee56 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/staging] code clean up
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit e9ee9abfd3081fbe71143cb7a8d7c3ebb7752910 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 comments
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit a6c329d66ee734e4e8f735b9a1c5590f1edecfb3 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] remove the box-shadow of other amount input
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 71ac1a8fa849d4b98ff822ef4d27e5907269ba60 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Fri Dec 18 09:32:02 2015 +0800 remove the box-shadow of other amount input --- css/donate-style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/donate-style.css b/css/donate-style.css index bc17e98..6dad54b 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -11,6 +11,10 @@ input[type="radio"]:focus, input[type="checkbox"]:focus { outline: none; } +.form-control { + -webkit-box-shadow: none; + box-shadow: none; +} .form-control:focus { border-color: #875ca4; outline: 0;

1 0