Jeremy Newman : update address for wine development fund, change pay pal form, add google checkout as payment option

[Jeremy Newman]

Module: website
Branch: master
Commit: 8ee2466d9e254fce62d3736f1be695156dbdd7a4
URL:    http://source.winehq.org/git/website.git/?a=commit;h=8ee2466d9e254fce62d3736...

Author: Jeremy Newman <jnewman(a)codeweavers.com>
Date:   Mon Mar  5 11:46:31 2012 -0600

update address for wine development fund, change pay pal form, add google checkout as payment option

---

 templates/en/contributing.template |   62 ++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/templates/en/contributing.template b/templates/en/contributing.template
index 027712a..5325db3 100644
--- a/templates/en/contributing.template
+++ b/templates/en/contributing.template
@@ -317,19 +317,55 @@ of further assistance please visit the SFC site.</p>
 <p>The Software Freedom Conservancy is a 501(c)(3) organization, and
 donations made through it are fully tax-deductible to the extent
 permitted by law.</p>
+
 <p><strong>Ways to contribute:</strong></p>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<div>
-  <input type="hidden" name="cmd" value="_xclick">
-  <input type="hidden" name="business" value="donate(a)winehq.org">
-  <input type="hidden" name="item_name" value="Wine donation">
-  <input type="image" src="{$root}/images/ppdonate.png" name="submit"
-    align="absmiddle" alt="Donate to Wine with PayPal!"> Our PayPal Account
-</div>
-</form>
+
+<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF">
+<tr bgcolor="#ffffff">
+    <td align="center">
+        <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="Directed Donation to the Wine Project via Software Freedom Conservancy"/>
+            <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/>
+            <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="10.0"/>
+            <input name="item_max_price_1" type="hidden" value="25000.0"/>
+            <input name="_charset_" type="hidden" value="utf-8"/>
+            $ <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"/><br />
+            <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=622836985124940&w=115&h=50&style=white&variant=text&loc=en_US" type="image"/>
+        </form>
+    </td>
+    <td>via Google Checkout</td>
+</tr>
+<tr bgcolor="#ffffff">
+    <td align="center">
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="PPdonateForm">
+        <input type="hidden" name="cmd" value="_s-xclick">
+        <input type="hidden" name="hosted_button_id" value="G9BDG2ABR7PYA">
+        <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
+        <img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
+        </form>
+    </td>
+    <td>via PayPal</td>
+</tr>
+</table>
 
 <p>You can also send cash, cheque or international money order in US funds to:</p>
-<address>Wine Project
-Software Freedom Conservancy
-1995 Broadway FL 17
-New York, NY 10023-5882</address>
+
+<address>Wine Project<br>
+Software Freedom Conservancy, Inc.<br>
+137 MONTAGUE ST  STE 380<br>
+Brooklyn, NY  11201-3548<br>
+USA</address>