torproject/webwml
1
0
Fork 0
mirror of https://github.com/torproject/webwml.git synced 2024-11-23 18:00:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 20734: Fix links and redirects for new donation site

Browse Source
This commit is contained in:
Arthur Edelstein 2016-11-22 01:02:06 -05:00
parent 247d8d6b40
commit ec139b4def
10 changed files with 13 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.htaccess
View File

@ -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]

1
css/layout.css
View File

@ -276,6 +276,7 @@ body {
float: right;
width: 230px;
margin-left: 20px;
padding-top: 100px;
}
#torusers { margin: 0 0 27px; }

0
donate/en/donate-foot.wml Normal file
View File

2
donate/en/donate-options.wml
View File

@ -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@torproject.org.):</p>
<ul class="hlist">
<li><a href="#bitcoin">Bitcoin</a></li>

56
download/en/download-easy.wml
View File

@ -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@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 -->

2
download/en/download-unix.wml
View File

@ -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>

66
download/en/download.wml
View File

@ -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">&euro;</option>
<option value="GBP">&pound;</option>
<option value="YEN">&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@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">

2
include/foot.wmi
View File

@ -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>

2
include/navigation.wmi
View File

@ -22,7 +22,7 @@
my @calltoaction = (
'download/download-easy' , 'Download',
'getinvolved/volunteer' , 'Get Involved',
'donate/donate' , 'Donate',
'donate/donate-button' , 'Donate',
);
:>

2
projects/en/torbrowser.wml
View File

@ -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">