Add Google Checkout and prefer it due to lower fees.

Also remove "anonymous" info as donors are no longer published anyway.

diff --git a/donations.html b/donations.html
index bdeb9dd0ef0d2b26b57760c338fe5fed9c89a86a..703bbd5bb57456d0014fbcb9fe7a132155a51b3c 100755 (executable)
--- a/donations.html
+++ b/donations.html
@@ -11,22 +11,56 @@ developing Samba.</p>
 
 <h3>How to donate</h3>
 
-<p>The preferred method of donating is via PayPal. To make a donation
-click on the 'Make a Donation' button below. If you want your donation
-to be anonymous then please put the word 'anonymous' somewhere in the
-notes with your donation. We will use that keyword to disable
-publishing of your name.</p>
+<h4>Google Checkout</h4>
+
+<p>The preferred method of donating is Google Checkout, using the amount field and "Donate" link below.</p>
+
+<script type="text/javascript">
+function validateAmount(amount){
+       if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){
+               return true;
+       }else{
+               alert('You must enter a valid donation.');
+               amount.focus();
+               return false;
+       }
+}
+</script>
+<form action="https://checkout.google.com/cws/v2/Donations/622836985124940/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top">
+   <input name="item_name_1" type="hidden" value="Samba Donation via Software Freedom Conservancy, Inc."/>
+   <input name="item_description_1" type="hidden" value="This donation to the Software Freedom Conservancy, Inc. will be earmarked for the Samba Project."/>
+   <input name="item_quantity_1" type="hidden" value="1"/>
+   <input name="item_currency_1" type="hidden" value="USD"/>
+   <input name="item_is_modifiable_1" type="hidden" value="true"/>
+   <input name="item_min_price_1" type="hidden" value="5.0"/>
+   <input name="item_max_price_1" type="hidden" value="25000.0"/>
+   <input name="_charset_" type="hidden" value="utf-8"/>
+   <table cellpadding="5" cellspacing="0" width="1%">
+       <tr>
+           <td align="right" nowrap="nowrap" width="1%">&#x24; <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/>
+           </td>
+           <td align="left" width="1%">
+               <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&amp;w=115&amp;h=50&amp;style=white&amp;variant=text&amp;loc=en_US" type="image"/>
+           </td>
+       </tr>
+   </table>
+</form>
+
+<h4>PayPal</h4>
+
+<p>Donations can also be made through PayPal, but the fees are higher.
+To use PayPal, click on the 'PayPal Donate' button below.</p>
 
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="image"
-src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="Make donation with PayPal">
+src="https://www.paypal.com/en_US/i/btn/x-click-but7.gif" border="0" name="submit" alt="Make donation with PayPal">
 <img alt="" border="0" src="https://www.paypal.com/en_AU/i/scr/pixel.gif" width="1" height="1">
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
 ">
 </form>
 
-
+<h4>Check</h4>
 <p>You can also make donations by check. Please make checks payable to the
 'Samba Team' and send them to:</p>