[or-cvs] r23297: {website} changes to text, needs more, and attempt to get the paypal a (website/branches/web20/donate/en)

[Andrew Lewman]

Author: phobos
Date: 2010-09-24 16:07:36 +0000 (Fri, 24 Sep 2010)
New Revision: 23297

Modified:
   website/branches/web20/donate/en/donate.wml
   website/branches/web20/donate/en/info.wmi
Log:
changes to text, needs more, and attempt to get the paypal and amazon
forms actually working with the new style.


Modified: website/branches/web20/donate/en/donate.wml
===================================================================
--- website/branches/web20/donate/en/donate.wml	2010-09-24 15:42:26 UTC (rev 23296)
+++ website/branches/web20/donate/en/donate.wml	2010-09-24 16:07:36 UTC (rev 23297)
@@ -78,24 +78,40 @@
     <!-- BEGIN AMAZON -->
     <div class="title topforty">Donate via Amazon Payments</div>
     	<div class="hundred left">
-    <div style="width:20em;padding-left:10px;padding-top:10px;padding-right:10px;padding-bottom:10px;">
-	<table class="table" border="0" cellpadding="0" cellspacing="0" width="100%">
-	<tr>
+      <div class="paypal focus">
+      	<h4>Make a one-time donation</h4>
+        <form>
+        	<table>
+          	<tr>
+        	  <td><input type="radio" value="10" /> $10</td>
+              <td><input type="radio" value="20" /> $20</td>
+              <td><input type="radio" value="50" /> $50</td>
+              <td><input type="radio" value="100" /> $100</td>
+            </tr>
+            <tr>
+              <td><input type="radio" value="250" /> $250</td>
+              <td><input type="radio" value="500" /> $500</td>
+              <td><input type="radio" value="1000" /> $1000</td>
+              <td><input type="radio" value="other" /> Other</td>
+            </tr>
+          </table>
+          <br />
+        </form>
 	<form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post">
 	  <input type="hidden" name="immediateReturn" value="1" />
 	  <input type="hidden" name="collectShippingAddress" value="0" />
 	  <input type="hidden" name="signatureVersion" value="2" />
 	  <input type="hidden" name="signatureMethod" value="HmacSHA256" />
-	  <input type="hidden" name="minimumDonationAmount" value="USD 10" />
+	  <input type="hidden" name="minimumDonationAmount" value="USD 20" />
 	  <input type="hidden" name="accessKey" value="11SEM03K88SD016FS1G2" />
 	  <input type="hidden" name="signature" value="Q+R9ErF8Kcz7GFQ/CYw8aSEYlWa/otVLgxVACPvHcJM=" />
 	  <input type="hidden" name="isDonationWidget" value="1" />
 	  <input type="hidden" name="description" value="Supporting Online Anonymity &amp; Privacy" />
 	  <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1" />
-	  <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate.html.en#outcome" />
+	  <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate" />
 	  <input type="hidden" name="processImmediate" value="1" />
 	  <input type="hidden" name="cobrandingStyle" value="logo" />
-	  <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate.html.en#outcome" />
+	  <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate" />
 	  <td>&nbsp;</td>
 	  <td><input type="text" name="amount" size="8" value="10" /></td>
 	  <td>&nbsp;</td>

Modified: website/branches/web20/donate/en/info.wmi
===================================================================
--- website/branches/web20/donate/en/info.wmi	2010-09-24 15:42:26 UTC (rev 23296)
+++ website/branches/web20/donate/en/info.wmi	2010-09-24 16:07:36 UTC (rev 23297)
@@ -6,7 +6,9 @@
   <div class="important-infoblock">
     <h2>What Happens to my Donation?</h2>
     <img src="$(IMGROOT)/donationchart.jpg" alt="Donations Breakdown" />
-    <p>If you've just donated, thank you for your donation. Your funds are deposited into our general fund. You join our many sponsors in funding the future of Tor and online anonymity. In 2008, the Tor Project spent and received its funds as the above chart depicts.</p>
+    <p>If you've just donated, thank you for your donation. Your funds
+are deposited into our general fund. You join thousands of other
+individual <a href="<page about/sponsors>">sponsors</a> in funding the future of Tor and online anonymity. In 2008, the Tor Project spent and received its funds as the above chart depicts.</p>
   </div>
 </div>
 <!-- END INFOBLOCK -->