- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug12538_merged'
by nickm＠torproject.org 21 Dec '15

21 Dec '15

1 0

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

21 Dec '15

commit 1a89e5aa3b10a8310ac56c51832f10556bcd6f4e 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] make get-in-touch section responsive
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 7cecf080a12b5a9c42f5afb5112caf115b97a7b3 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 07:27:13 2015 +0800 make get-in-touch section responsive --- css/donate-style.css | 10 ++++++++++ donate/en/donate.wml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 741d3c5..1bd0eea 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -339,6 +339,16 @@ footer.footer{ .dsmall{ padding: 0 5%; } + .title { + min-height: auto; + margin: 20px 8% 0; + border-right: none; + border-bottom: 2px solid #3D855B; + padding: 0 0 10px; + } + .detail { + margin: 10px 0 20px; + } } @media (max-width: 659px) { diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 68b3e36..4d00b5c 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -271,10 +271,10 @@ <div class="get-in-touch"> <div class="container"> <div class="row"> - <div class="col-xs-4"> + <div class="col-sm-4"> <h3 class="title"><strong>Get in touch.</strong></h3> </div> - <div class="col-xs-8"> + <div class="col-sm-8"> <p class="detail">Contact us at donations(a)torproject.org for more donation details.</p> </div> </div>

1 0

[webwml/staging] make perks section responsive
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 6564f9a0c74c26f94e82e34fd450327d4904ee32 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 08:19:52 2015 +0800 make perks section responsive --- css/donate-style.css | 4 ++++ donate/en/donate.wml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/css/donate-style.css b/css/donate-style.css index 1bd0eea..7eb4ff0 100644 --- a/css/donate-style.css +++ b/css/donate-style.css @@ -147,6 +147,7 @@ html { } .no-padding{ padding: 0; + margin-bottom: 20px; } .half-opacity{ opacity: 0.5; @@ -336,6 +337,9 @@ footer.footer{ blockquote::before { display: none; } + #bitpayDonation > .well { + margin-bottom: 30px; + } .dsmall{ padding: 0 5%; } diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 4d00b5c..ae70b18 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -41,9 +41,9 @@ </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 class="col-xs-4 no-padding"><img id="stickers" class="img-responsive half-opacity" src="$(IMGROOT)/swag-stickers-lg.png" alt="stickers"></div> + <div class="col-xs-4 no-padding"><img id="tshirt" class="img-responsive half-opacity" src="$(IMGROOT)/swag-tees-lg.png" alt="tshirt"></div> + <div class="col-xs-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">

1 0

[webwml/staging] fix other ways to donate link functionality
by nima＠torproject.org 21 Dec '15

21 Dec '15

commit 22088868a03ae9e9b55f7ce6e2993f787888ffa6 Author: MehrabKamrani <mk.zizou(a)gmail.com> Date: Sun Dec 20 13:21:35 2015 +0800 fix other ways to donate link functionality scroll down the page to other ways donate section if click on other ways to donate link --- donate/en/donate.wml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index 06d8289..490f1a3 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -91,7 +91,7 @@ <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> + <h4><a id="link" href="#other-ways-section">Other Ways to Donate</a></h4> </div>  @@ -370,6 +370,14 @@ $(".left").removeClass('active'); }); + + $("#link").on('click',function(event){ + event.preventDefault(); + $('html, body').animate({ + scrollTop: $("#other-ways-section").offset().top + }, 200); + }); + });

1 0

[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