- tor-commits - lists.torproject.org

[webwml/staging] landing page for alison
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit aad289abd330e4d24367a81b4b8b5be0bb5700b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 28 13:00:14 2015 -0500 landing page for alison --- .htaccess | 1 + donate/en/donate-blog-alison.wml | 0 2 files changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 135805b..930e802 100644 --- a/.htaccess +++ b/.htaccess @@ -66,6 +66,7 @@ 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] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-alison(.*) /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-alison.wml b/donate/en/donate-blog-alison.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] that was silly
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit f28a4d059d9c365cf1b57ce5130c8ed157eb6707 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Dec 28 10:22:29 2015 +0100 that was silly --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 13e7c83..7f0bfe7 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -53,7 +53,7 @@ docs/documentation>#MailingLists">mailing lists</a>, you must subscribe before you can post.</li> <li><i>donations(a)torproject.org</i> is for questions and comments about <a - href="<page donate/donate-1>">getting money to the developers</a>. More + href="<page donate/donate>">getting money to the developers</a>. More donations means <a href="<page docs/faq>#Funding">more Tor</a>. We're happy to help think about creative ways for you to contribute.</li>

1 0

[webwml/staging] CCC Donations link.
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit ff3ad8e4e6096b51c5ec8c38e8c765e07b98f7aa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 29 03:30:50 2015 -0800 CCC Donations link. --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 930e802..fb59b90 100644 --- a/.htaccess +++ b/.htaccess @@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] #keep prefixes of other entries down here... RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]

1 0

[webwml/staging] Do we actually need these empty files?
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 34df5fc9c92821b77ba8421e7fc375be60b44bea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 29 03:34:27 2015 -0800 Do we actually need these empty files? --- donate/en/donate-chaos.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/donate/en/donate-chaos.wml b/donate/en/donate-chaos.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Add donate link for ES.
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 89eb452185839c491072d8d3010a5ec40cdad8c8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 30 07:40:54 2015 -0800 Add donate link for ES. --- .htaccess | 1 + donate/en/donate-blog-snowden.wml | 0 2 files changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index fb59b90..6081367 100644 --- a/.htaccess +++ b/.htaccess @@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /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-snowden.wml b/donate/en/donate-blog-snowden.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Actually, I hope that ES is mentioned just a couple more places than our blog.
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 193905fab3ea55df61f29cdb350a5d808c93eab8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Dec 30 07:42:02 2015 -0800 Actually, I hope that ES is mentioned just a couple more places than our blog. --- .htaccess | 2 +- donate/en/donate-blog-snowden.wml | 0 donate/en/donate-snowden.wml | 0 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 6081367..38ff2d5 100644 --- a/.htaccess +++ b/.htaccess @@ -67,7 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] -RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /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-snowden.wml b/donate/en/donate-blog-snowden.wml deleted file mode 100644 index e69de29..0000000 diff --git a/donate/en/donate-snowden.wml b/donate/en/donate-snowden.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] another champion
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit b9eeb6788381d60c02f3570f14ed98132caf3881 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 1 18:20:47 2016 -0500 another champion --- .htaccess | 1 + donate/en/donate-blog-nanni.wml | 0 2 files changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 38ff2d5..fdeb8a0 100644 --- a/.htaccess +++ b/.htaccess @@ -69,6 +69,7 @@ RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-nanni(.*) /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-nanni.wml b/donate/en/donate-blog-nanni.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Add donate-blog-landau
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 7e11ecd6904cec147ea47543724c302ee380b236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 2 20:56:08 2016 -0500 Add donate-blog-landau --- .htaccess | 1 + donate/en/donate-blog-landau.wml | 0 2 files changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index fdeb8a0..582b07c 100644 --- a/.htaccess +++ b/.htaccess @@ -70,6 +70,7 @@ RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L] +RewriteRule ^donate/donate-blog-landau(.*) /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-landau.wml b/donate/en/donate-blog-landau.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/staging] Revert "Bug #17880: Add ALT text to donation banner."
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit f62bd1724a7c12a92b5b3535e2a6270265b2e34c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 5 11:16:09 2016 -0500 Revert "Bug #17880: Add ALT text to donation banner." This reverts commit ae3e28d207204cd16426542ecf321d3b6892e56d. --- en/index.wml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/en/index.wml b/en/index.wml index 6fdc5a3..09ed2c8 100644 --- a/en/index.wml +++ b/en/index.wml @@ -18,25 +18,16 @@ </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] Revert "Bug #17880: Donation banner on home page"
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 546d19f42b92122ab812614dc0d97ec4db0d9572 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 5 11:17:10 2016 -0500 Revert "Bug #17880: Donation banner on home page" This reverts commit 8b7fb8a46588da4dc8c991be396fa3b1f4a66ef4. --- css/layout.css | 33 --------------------------------- en/index.wml | 24 ------------------------ images/homepage-banner-cd.jpg | Bin 84779 -> 0 bytes images/homepage-banner-lp.jpg | Bin 101171 -> 0 bytes images/homepage-banner-rd.jpg | Bin 86882 -> 0 bytes images/homepage-banner-rr.jpg | Bin 98192 -> 0 bytes images/homepage-banner-ss.jpg | Bin 92697 -> 0 bytes 7 files changed, 57 deletions(-) diff --git a/css/layout.css b/css/layout.css index e0cd4a1..4908ee0 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1310,36 +1310,3 @@ 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 09ed2c8..fededd4 100644 --- a/en/index.wml +++ b/en/index.wml @@ -2,30 +2,6 @@ # 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 deleted file mode 100755 index 4c0e4b3..0000000 Binary files a/images/homepage-banner-cd.jpg and /dev/null differ diff --git a/images/homepage-banner-lp.jpg b/images/homepage-banner-lp.jpg deleted file mode 100755 index f5fa76a..0000000 Binary files a/images/homepage-banner-lp.jpg and /dev/null differ diff --git a/images/homepage-banner-rd.jpg b/images/homepage-banner-rd.jpg deleted file mode 100755 index 646f59e..0000000 Binary files a/images/homepage-banner-rd.jpg and /dev/null differ diff --git a/images/homepage-banner-rr.jpg b/images/homepage-banner-rr.jpg deleted file mode 100755 index 4a2a512..0000000 Binary files a/images/homepage-banner-rr.jpg and /dev/null differ diff --git a/images/homepage-banner-ss.jpg b/images/homepage-banner-ss.jpg deleted file mode 100755 index c4a0fa7..0000000 Binary files a/images/homepage-banner-ss.jpg and /dev/null differ

1 0