Bug 20734: Fix links and redirects for new donation site (ec139b4de)

Bug 20734: Fix links and redirects for new donation site

Arthur Edelstein commited on 2016-11-22 07:02:06
Zeige 10 geänderte Dateien mit 13 Einfügungen und 127 Löschungen.

.htaccess 8f54d2deb..3608c300c
css/layout.css 8a79d9ded..45b4513af
donate/en/donate-foot.wml 000000000..e69de29bb
donate/en/donate-options.wml 6596d8761..144cff933
download/en/download-easy.wml 6fd6e7146..98de49fcb
download/en/download-unix.wml be152ba2d..1993b47f9
download/en/download.wml c111ee203..482850a65
include/foot.wmi 5e6cb4e52..c7e97aac1
include/navigation.wmi 3cfec53d2..36b985b11
projects/en/torbrowser.wml c94a29876..19f12e2c6

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

css/layout.css

Zeige Datei @ ec139b4de

...	...	@@ -276,6 +276,7 @@ body {
276	276	float: right;
277	277	width: 230px;
278	278	margin-left: 20px;
	279	+ padding-top: 100px;
279	280	}
280	281
281	282	#torusers { margin: 0 0 27px; }

donate/en/donate-foot.wml

Zeige Datei @ ec139b4de

donate/en/donate-options.wml

Zeige Datei @ ec139b4de

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

download/en/download-easy.wml

Zeige Datei @ ec139b4de

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

download/en/download-unix.wml

Zeige Datei @ ec139b4de

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

download/en/download.wml

Zeige Datei @ ec139b4de

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

include/foot.wmi

Zeige Datei @ ec139b4de

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

include/navigation.wmi

Zeige Datei @ ec139b4de

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

projects/en/torbrowser.wml

Zeige Datei @ ec139b4de

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


...	...	@@ -356,71 +356,7 @@ Code</a></li>
356	356	</div>
357	357	</div>
358	358	<!-- START DONATION WIDGET -->
359		- <script async type="text/javascript">
360		- function displayVals() {
361		- var t3 = $("#t3").val();
362		- var amount = $("#amount").val();
363		- if(t3 != 0){
364		- $('#a3').val(amount);
365		- $('#p3').val(1);
366		- $('#cmd').val('_xclick-subscriptions');
367		- $('#item_name').val('Tor Project Membership');
368		- $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
369		- }else{
370		- $('#a3').val(0);
371		- $('#p3').val(0);
372		- $('#cmd').val('_donations');
373		- $('#item_name').val('Donation to the Tor Project');
374		- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
375		- }
376		- if( !t3 ) {
377		- $('#cmd').val('_donations');
378		- $('#item_name').val('Donation to the Tor Project');
379		- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
380		- }
381		- }
382		- $(function(){
383		- $("#amount").change(displayVals);
384		- $("#t3").change(displayVals);
385		- displayVals();
386		- });
387		- </script>
388		-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post" style="float:left; margin-bottom:10px;">
389		- <h2>Donate to Tor</h2>
390		- <p>
391		- <select name="currency_code" class="cur">
392		- <option value="USD" selected="selected">$</option>
393		- <option value="EUR">€</option>
394		- <option value="GBP">£</option>
395		- <option value="YEN">¥</option>
396		- </select>
397		- <input type="text" id="amount" class="amount" name="amount" value="5" size="10">
398		- </p>
399		- <p>
400		- <input type="hidden" id="a3" name="a3" value="0">
401		- <select id="t3" name="t3">
402		- <option value="0">One-time Donation</option>
403		- <option value="M">Monthly Subscription</option>
404		- </select>
405		- </p>
406		- <p>
407		- <input type="hidden" id="p3" name="p3" value="1">
408		- <input type="hidden" name="sra" value="1">
409		- <input type="hidden" name="src" value="1">
410		- <input type="hidden" name="no_shipping" value="1">
411		- <input type="hidden" name="no_note" value="1">
412		- <input type="hidden" id="cmd" name="cmd" value="_donations">
413		- <input type="hidden" name="business" value="donations@torproject.org">
414		- <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
415		- <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html">
416		- <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html">
417		- </p>
418		- <h6 id="ppinfo" style="height:0px;"></h6>
419		- <p>
420		- <input class="donate-btn" type="submit" name="donate" value="Donate">
421		- </p>
422		- <p><a href="<page donate/donate>">Other donation options...</a></p>
423		-</form>
	359	+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
424	360	<!-- END DONATION WIDGET -->
425	361	<!-- START INFO -->
426	362	<div class="img-shadow">

...	...	@@ -88,13 +88,16 @@ RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
88	88	RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
89	89	RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
90	90	RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
	91	+RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L]
	92	+RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L]
	93	+RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L]
	94	+RewriteRule ^donate/donate https://donate.torproject.org [R=302,L]
	95	+RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L]
91	96
92	97	# 2015
93	98	RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
94	99	RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
95	100	RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
96		-RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
97		-RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
98	101	RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
99	102	RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
100	103	RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L]

...	...	@@ -13,7 +13,7 @@ form#makeDonation {
13	13	<div id="content" class="container" style="padding-bottom: 85px">
14	14	<div id="maincol">
15	15	<h1>More Ways to Donate to Tor</h1>
16		- <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>
	16	+ <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>
17	17	<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>
18	18	<ul class="hlist">
19	19	<li><a href="#bitcoin">Bitcoin</a></li>

...	...	@@ -144,61 +144,7 @@
144	144
145	145
146	146	<div id="dow-don-right">
147		-
148		-<!-- START DONATION WIDGET -->
149		- <script async type="text/javascript">
150		- function displayVals() {
151		- var t3 = $("#t3").val();
152		- var amount = $("#amount").val();
153		- if(t3 != 0){
154		- $('#a3').val(amount);
155		- $('#p3').val(1);
156		- $('#cmd').val('_xclick-subscriptions');
157		- $('#item_name').val('Tor Project Membership');
158		- $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
159		- }else{
160		- $('#a3').val(0);
161		- $('#p3').val(0);
162		- $('#cmd').val('_donations');
163		- $('#item_name').val('Donation to the Tor Project');
164		- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
165		- }
166		- if( !t3 ) {
167		- $('#cmd').val('_donations');
168		- $('#item_name').val('Donation to the Tor Project');
169		- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
170		- }
171		- }
172		- $(function(){
173		- $("#amount").change(displayVals);
174		- $("#t3").change(displayVals);
175		- displayVals();
176		- });
177		- </script>
178		-<form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post">
179		- <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>
180		- <p>
181		- <input type="hidden" name="currency_code" class="cur" value="USD">
182		- <input type="hidden" id="a3" name="a3" value="0">
183		- <input type="hidden" id="t3" name="t3" value="0">
184		- <input type="hidden" id="amount" class="amount" name="amount" value="10" size="10">
185		- <input type="hidden" id="p3" name="p3" value="1">
186		- <input type="hidden" name="sra" value="1">
187		- <input type="hidden" name="src" value="1">
188		- <input type="hidden" name="no_shipping" value="1">
189		- <input type="hidden" name="no_note" value="1">
190		- <input type="hidden" id="cmd" name="cmd" value="_donations">
191		- <input type="hidden" name="business" value="donations@torproject.org">
192		- <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project">
193		- <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou">
194		- <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download-easy">
195		- </p>
196		- <h6 id="ppinfo" style="height:0px;"></h6>
197		- <p>
198		- <input class="donate-btn" type="submit" name="donate" value="Donate">
199		- </p>
200		- <p><a href="<page donate/donate>">Other donation options...</a></p>
201		-</form> <!-- END DONATION WIDGET -->
	147	+<a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
202	148	</div> <!-- END dow-don-right -->
203	149
204	150

...	...	@@ -116,7 +116,7 @@ under the <a href="<gitblob>LICENSE">3-clause BSD license</a>.
116	116	<p>
117	117	There is no fee for installing Tor, or using the Tor network, but
118	118	if you want Tor to become faster and more usable please consider
119		-<a href="<page donate/donate>">making a tax-deductible donation to The Tor Project</a>.
	119	+<a href="<page donate/donate-download>">making a tax-deductible donation to The Tor Project</a>.
120	120	</p>
121	121	</div>
122	122

...	...	@@ -43,7 +43,7 @@
43	43	<div class="col">
44	44	<h4>Get Involved</h4>
45	45	<ul>
46		- <li><a href="<page donate/donate>">Donate</a></li>
	46	+ <li><a href="<page donate/donate-foot>">Donate</a></li>
47	47	<li><a href="<page docs/documentation>#MailingLists">Mailing Lists</a></li>
48	48	<li><a href="<page docs/hidden-services>">Hidden Services</a></li>
49	49	<li><a href="<page getinvolved/translation>">Translations</a></li>

...	...	@@ -22,7 +22,7 @@
22	22	my @calltoaction = (
23	23	'download/download-easy' , 'Download',
24	24	'getinvolved/volunteer' , 'Get Involved',
25		- 'donate/donate' , 'Donate',
	25	+ 'donate/donate-button' , 'Donate',
26	26	);
27	27
28	28	:>

...	...	@@ -30,7 +30,7 @@
30	30	It can run off a USB flash drive, comes with a pre-configured web
31	31	browser to protect your anonymity, and is self-contained
32	32	(portable).</p>
33		- <p style="padding-top:10px;"><a href="<page donate/donate>">Do you like what we do? Please consider making a donation »</a></p>
	33	+ <p style="padding-top:10px;"><a href="<page donate/donate-download>">Do you like what we do? Please consider making a donation »</a></p>
34	34	</div>
35	35	<div class="pjsplash">
36	36	<a class="button" href="#downloads">
37	37

tor-webwml.git