[tor-commits] [webwml/staging] Bug 20734: Fix links and redirects for new donation site
sebastian at torproject.org
sebastian at torproject.org
Tue Nov 22 22:37:15 UTC 2016
commit ec139b4def237b41e1176587507aee78f14b379e
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date: Tue Nov 22 01:02:06 2016 -0500
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(-)
diff --git a/.htaccess b/.htaccess
index 8f54d2d..3608c30 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 8a79d9d..45b4513 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 0000000..e69de29
diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index 6596d87..144cff9 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -13,7 +13,7 @@ form#makeDonation {
<div id="content" class="container" style="padding-bottom: 85px">
<div id="maincol">
<h1>More Ways to Donate to Tor</h1>
- <p><b>Note: if you wish to donate to The Tor Project by <a href="donate.html.en">credit card or PayPal, please click here</a>.</b></p>
+ <p><b>Note: if you wish to donate to The Tor Project by <a href="<page donate/donate>">credit card or PayPal, please click here</a>.</b></p>
<p>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 at torproject.org.):</p>
<ul class="hlist">
<li><a href="#bitcoin">Bitcoin</a></li>
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 6fd6e71..98de49f 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -144,61 +144,7 @@
<div id="dow-don-right">
-
-<!-- START DONATION WIDGET -->
- <script async type="text/javascript">
- function displayVals() {
- var t3 = $("#t3").val();
- var amount = $("#amount").val();
- if(t3 != 0){
- $('#a3').val(amount);
- $('#p3').val(1);
- $('#cmd').val('_xclick-subscriptions');
- $('#item_name').val('Tor Project Membership');
- $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
- }else{
- $('#a3').val(0);
- $('#p3').val(0);
- $('#cmd').val('_donations');
- $('#item_name').val('Donation to the Tor Project');
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
- }
- if( !t3 ) {
- $('#cmd').val('_donations');
- $('#item_name').val('Donation to the Tor Project');
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
- }
- }
- $(function(){
- $("#amount").change(displayVals);
- $("#t3").change(displayVals);
- displayVals();
- });
- </script>
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
- <h2><big style="font-weight: bold; font-size: 1.2em;">Help</big><small style="font-size: 0.9em;" > Create more </small><big style="font-weight: bold; font-size: 1.2em;">Tor</big><big style="font-size: 1.2em;">!</big></h2>
- <p>
- <input type="hidden" name="currency_code" class="cur" value="USD">
- <input type="hidden" id="a3" name="a3" value="0">
- <input type="hidden" id="t3" name="t3" value="0">
- <input type="hidden" id="amount" class="amount" name="amount" value="10" size="10">
- <input type="hidden" id="p3" name="p3" value="1">
- <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" id="cmd" name="cmd" value="_donations">
- <input type="hidden" name="business" value="donations at 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/download/download-easy">
- </p>
- <h6 id="ppinfo" style="height:0px;"></h6>
- <p>
- <input class="donate-btn" type="submit" name="donate" value="Donate">
- </p>
- <p><a href="<page donate/donate>">Other donation options...</a></p>
-</form> <!-- END DONATION WIDGET -->
+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
</div> <!-- END dow-don-right -->
diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml
index be152ba..1993b47 100644
--- a/download/en/download-unix.wml
+++ b/download/en/download-unix.wml
@@ -116,7 +116,7 @@ under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.
<p>
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
-<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>.
+<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>.
</p>
</div>
diff --git a/download/en/download.wml b/download/en/download.wml
index c111ee2..482850a 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -356,71 +356,7 @@ Code</a></li>
</div>
</div>
<!-- START DONATION WIDGET -->
- <script async type="text/javascript">
- function displayVals() {
- var t3 = $("#t3").val();
- var amount = $("#amount").val();
- if(t3 != 0){
- $('#a3').val(amount);
- $('#p3').val(1);
- $('#cmd').val('_xclick-subscriptions');
- $('#item_name').val('Tor Project Membership');
- $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
- }else{
- $('#a3').val(0);
- $('#p3').val(0);
- $('#cmd').val('_donations');
- $('#item_name').val('Donation to the Tor Project');
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
- }
- if( !t3 ) {
- $('#cmd').val('_donations');
- $('#item_name').val('Donation to the Tor Project');
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
- }
- }
- $(function(){
- $("#amount").change(displayVals);
- $("#t3").change(displayVals);
- displayVals();
- });
- </script>
-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;">
- <h2>Donate to Tor</h2>
- <p>
- <select name="currency_code" class="cur">
- <option value="USD" selected="selected">$</option>
- <option value="EUR">€</option>
- <option value="GBP">£</option>
- <option value="YEN">¥</option>
- </select>
- <input type="text" id="amount" class="amount" name="amount" value="5" size="10">
- </p>
- <p>
- <input type="hidden" id="a3" name="a3" value="0">
- <select id="t3" name="t3">
- <option value="0">One-time Donation</option>
- <option value="M">Monthly Subscription</option>
- </select>
- </p>
- <p>
- <input type="hidden" id="p3" name="p3" value="1">
- <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" id="cmd" name="cmd" value="_donations">
- <input type="hidden" name="business" value="donations at 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.html">
- <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
- </p>
- <h6 id="ppinfo" style="height:0px;"></h6>
- <p>
- <input class="donate-btn" type="submit" name="donate" value="Donate">
- </p>
- <p><a href="<page donate/donate>">Other donation options...</a></p>
-</form>
+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
<!-- END DONATION WIDGET -->
<!-- START INFO -->
<div class="img-shadow">
diff --git a/include/foot.wmi b/include/foot.wmi
index 5e6cb4e..c7e97aa 100644
--- a/include/foot.wmi
+++ b/include/foot.wmi
@@ -43,7 +43,7 @@
<div class="col">
<h4>Get Involved</h4>
<ul>
- <li><a href="<page donate/donate>">Donate</a></li>
+ <li><a href="<page donate/donate-foot>">Donate</a></li>
<li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
<li><a href="<page docs/hidden-services>">Hidden Services</a></li>
<li><a href="<page getinvolved/translation>">Translations</a></li>
diff --git a/include/navigation.wmi b/include/navigation.wmi
index 3cfec53..36b985b 100644
--- a/include/navigation.wmi
+++ b/include/navigation.wmi
@@ -22,7 +22,7 @@
my @calltoaction = (
'download/download-easy' , 'Download',
'getinvolved/volunteer' , 'Get Involved',
- 'donate/donate' , 'Donate',
+ 'donate/donate-button' , 'Donate',
);
:>
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index c94a298..19f12e2 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -30,7 +30,7 @@
It can run off a USB flash drive, comes with a pre-configured web
browser to protect your anonymity, and is self-contained
(portable).</p>
- <p style="padding-top:10px;"><a href="<page donate/donate>">Do you like what we do? Please consider making a donation »</a></p>
+ <p style="padding-top:10px;"><a href="<page donate/donate-download>">Do you like what we do? Please consider making a donation »</a></p>
</div>
<div class="pjsplash">
<a class="button" href="#downloads">
More information about the tor-commits
mailing list