From ec139b4def237b41e1176587507aee78f14b379e Mon Sep 17 00:00:00 2001 From: Arthur Edelstein Date: Tue, 22 Nov 2016 01:02:06 -0500 Subject: [PATCH] Bug 20734: Fix links and redirects for new donation site --- .htaccess | 7 ++-- css/layout.css | 1 + donate/en/donate-foot.wml | 0 donate/en/donate-options.wml | 2 +- download/en/download-easy.wml | 56 +---------------------------- download/en/download-unix.wml | 2 +- download/en/download.wml | 66 +---------------------------------- include/foot.wmi | 2 +- include/navigation.wmi | 2 +- projects/en/torbrowser.wml | 2 +- 10 files changed, 13 insertions(+), 127 deletions(-) create mode 100644 donate/en/donate-foot.wml diff --git a/.htaccess b/.htaccess index 8f54d2de..3608c300 100644 --- a/.htaccess +++ b/.htaccess @@ -88,13 +88,16 @@ RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate https://donate.torproject.org [R=302,L] +RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L] # 2015 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L] RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L] -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] diff --git a/css/layout.css b/css/layout.css index 8a79d9de..45b4513a 100644 --- a/css/layout.css +++ b/css/layout.css @@ -276,6 +276,7 @@ body { float: right; width: 230px; margin-left: 20px; + padding-top: 100px; } #torusers { margin: 0 0 27px; } diff --git a/donate/en/donate-foot.wml b/donate/en/donate-foot.wml new file mode 100644 index 00000000..e69de29b diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml index 6596d876..144cff93 100644 --- a/donate/en/donate-options.wml +++ b/donate/en/donate-options.wml @@ -13,7 +13,7 @@ form#makeDonation {

More Ways to Donate to Tor

-

Note: if you wish to donate to The Tor Project by credit card or PayPal, please click here.

+

Note: if you wish to donate to The Tor Project by credit card or PayPal, please click here.

The Tor Project also offers the following alternative donation methods (If you would like to receive a Thank-You Gift after making a donation with one of the methods below, please email giving@torproject.org.):

  • Bitcoin
    • diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 6fd6e714..98de49fc 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -144,61 +144,7 @@
    - - - -
    -

    Help Create more Tor!

    -

    - - - - - - - - - - - - - - -

    -
    -

    - -

    -

    Other donation options...

    -
    +
    diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index be152ba2..1993b47f 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -116,7 +116,7 @@ under the 3-clause BSD license.

    There is no fee for installing Tor, or using the Tor network, but if you want Tor to become faster and more usable please consider -making a tax-deductible donation to The Tor Project. +making a tax-deductible donation to The Tor Project.

diff --git a/download/en/download.wml b/download/en/download.wml index c111ee20..482850a6 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -356,71 +356,7 @@ Code
- -
-

Donate to Tor

-

- - -

-

- - -

-

- - - - - - - - - - -

-
-

- -

-

Other donation options...

-
+
diff --git a/include/foot.wmi b/include/foot.wmi index 5e6cb4e5..c7e97aac 100644 --- a/include/foot.wmi +++ b/include/foot.wmi @@ -43,7 +43,7 @@

Get Involved